Revert unneeded changes

This commit is contained in:
Maxim Filippov 2018-12-25 03:44:48 +03:00
parent ab2ee43634
commit ca2e9ce9cc
3 changed files with 3 additions and 14 deletions

View file

@ -75,16 +75,11 @@ def get(%{id: user_id} = _user, id) do
end end
end end
def clear(%User{} = user) do def clear(user) do
from(n in Notification, where: n.user_id == ^user.id) from(n in Notification, where: n.user_id == ^user.id)
|> Repo.delete_all() |> Repo.delete_all()
end end
def clear(%Activity{} = activity) do
from(n in Notification, where: n.activity_id == ^activity.id)
|> Repo.delete_all()
end
def dismiss(%{id: user_id} = _user, id) do def dismiss(%{id: user_id} = _user, id) do
notification = Repo.get(Notification, id) notification = Repo.get(Notification, id)

View file

@ -586,8 +586,7 @@ def get_obj_helper(id) do
end end
def set_reply_to_uri(%{"inReplyTo" => inReplyTo} = object) do def set_reply_to_uri(%{"inReplyTo" => inReplyTo} = object) do
with false <- is_nil(inReplyTo), with false <- String.starts_with?(inReplyTo, "http"),
false <- String.starts_with?(inReplyTo, "http"),
{:ok, %{data: replied_to_object}} <- get_obj_helper(inReplyTo) do {:ok, %{data: replied_to_object}} <- get_obj_helper(inReplyTo) do
Map.put(object, "inReplyTo", replied_to_object["external_url"] || inReplyTo) Map.put(object, "inReplyTo", replied_to_object["external_url"] || inReplyTo)
else else

View file

@ -69,12 +69,7 @@ def to_for_user_and_mentions(_user, mentions, inReplyTo, "direct") do
mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end) mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
if inReplyTo do if inReplyTo do
to = {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
[inReplyTo.data["actor"] | mentioned_users]
|> Enum.uniq()
|> Enum.reject(&is_nil/1)
{to, []}
else else
{mentioned_users, []} {mentioned_users, []}
end end