projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
return error if connection failed to open
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index 896cbb3c5558d8bdd2b4431bc7cd4636f58ef9a3..397eb6e3f614bafe8140152682b7f422797f94a2 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Activity do
# 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",
"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,
}
@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 =
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)
|> Repo.all()
Activity.Queries.exclude_authors(query, deactivated_users)