Commit ca2e9ce9 authored by Maxim Filippov's avatar Maxim Filippov 🌚

Revert unneeded changes

parent ab2ee436
......@@ -75,16 +75,11 @@ def get(%{id: user_id} = _user, id) do
end
end
def clear(%User{} = user) do
def clear(user) do
from(n in Notification, where: n.user_id == ^user.id)
|> Repo.delete_all()
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
notification = Repo.get(Notification, id)
......
......@@ -586,8 +586,7 @@ def get_obj_helper(id) do
end
def set_reply_to_uri(%{"inReplyTo" => inReplyTo} = object) do
with false <- is_nil(inReplyTo),
false <- String.starts_with?(inReplyTo, "http"),
with false <- String.starts_with?(inReplyTo, "http"),
{:ok, %{data: replied_to_object}} <- get_obj_helper(inReplyTo) do
Map.put(object, "inReplyTo", replied_to_object["external_url"] || inReplyTo)
else
......
......@@ -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)
if inReplyTo do
to =
[inReplyTo.data["actor"] | mentioned_users]
|> Enum.uniq()
|> Enum.reject(&is_nil/1)
{to, []}
{Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
else
{mentioned_users, []}
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment