hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1559] Addressed code review requests.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-04-09 15:13:37 +03:00
commit ac672a9d6b
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/activity.ex
View file

@ -300,6 +300,8 @@ defmodule Pleroma.Activity do
def follow_accepted?(_), do: false
@spec mastodon_notification_type(Activity.t()) :: String.t() | nil
for {ap_type, type} <- @mastodon_notification_types, not is_list(type) do
def mastodon_notification_type(%Activity{data: %{"type" => unquote(ap_type)}}),
do: unquote(type)
@ -315,11 +317,11 @@ defmodule Pleroma.Activity do
def mastodon_notification_type(%Activity{}), do: nil
@spec from_mastodon_notification_type(String.t()) :: String.t() | nil
@doc "Converts Mastodon notification type to AR activity type"
def from_mastodon_notification_type(type) do
with {k, _v} <-
Enum.find(@mastodon_notification_types, fn {_k, v} ->
v == type or (is_list(v) and type in v)
end) do
Enum.find(@mastodon_notification_types, fn {_k, v} -> type in List.wrap(v) end) do
k
end
end