Merge branch 'develop' into rename/pleroma_activity_consistency

diff --cc lib/pleroma/activity.ex
index fe017df3b32d456bfe99a79363445cb33fcd5acd,8fd0311d2c25a78fd1259c58e17acbbff64c90bc..cd61f6ac858672e564ab5925fdd17af29c793e99
--- 1/lib/pleroma/activity.ex
--- 2/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@@ -36,7 -36,14 +36,11 @@@ defmodule Pleroma.Activity d
      )
    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 get_by_id(id) do
+     Repo.get(Activity, id)
+   end
+ 
 +  def by_object_ap_id(ap_id) do
      from(
        activity in Activity,
        where:

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge