From: lain <lain@soykaf.club>
Date: Wed, 23 Jan 2019 12:05:58 +0000 (+0100)
Subject: Merge branch 'develop' into rename/pleroma_activity_consistency
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2de208817c04d9a48aaf0fdaf887dd0e10d15907;p=akkoma

Merge branch 'develop' into rename/pleroma_activity_consistency
---

2de208817c04d9a48aaf0fdaf887dd0e10d15907
diff --cc lib/pleroma/activity.ex
index fe017df3b,8fd0311d2..cd61f6ac8
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@@ -36,7 -36,14 +36,11 @@@ defmodule Pleroma.Activity d
      )
    end
  
+   def get_by_id(id) do
+     Repo.get(Activity, id)
+   end
+ 
 -  # TODO:
 -  # Go through these and fix them everywhere.
 -  # Wrong name, only returns create activities
 -  def all_by_object_ap_id_q(ap_id) do
 +  def by_object_ap_id(ap_id) do
      from(
        activity in Activity,
        where: