X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=397eb6e3f614bafe8140152682b7f422797f94a2;hb=7d68924e4f7233590457aa7e32a21f082dd0584f;hp=b7be7a8007934318bd41d081636feaadc27ff4c6;hpb=cf96c4005743c61d44e17c9d37c6427eaf69c152;p=akkoma
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index b7be7a800..397eb6e3f 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Activity do
@@ -30,7 +30,8 @@ defmodule Pleroma.Activity do
"Follow" => "follow",
"Announce" => "reblog",
"Like" => "favourite",
- "Move" => "move"
+ "Move" => "move",
+ "EmojiReact" => "pleroma:emoji_reaction"
}
@mastodon_to_ap_notification_types for {k, v} <- @mastodon_notification_types,
@@ -309,7 +310,7 @@ defmodule Pleroma.Activity do
def restrict_deactivated_users(query) do
deactivated_users =
- from(u in User.Query.build(deactivated: true), select: u.ap_id)
+ from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
|> Repo.all()
Activity.Queries.exclude_authors(query, deactivated_users)
@@ -329,23 +330,4 @@ defmodule Pleroma.Activity do
_ -> nil
end
end
-
- def replies(activity, opts \\ []) do
- object = Object.normalize(activity)
-
- query =
- Activity
- |> Queries.by_type("Create")
- |> Queries.by_object_in_reply_to_id(object.data["id"], skip_preloading: true)
- |> order_by([activity], asc: activity.id)
-
- if opts[:self_only] do
- where(query, [a], a.actor == ^activity.actor)
- else
- query
- end
- end
-
- def self_replies(activity, opts \\ []),
- do: replies(activity, Keyword.put(opts, :self_only, true))
end