summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2018-12-25 03:44:48 +0300
committerMaxim Filippov <colixer@gmail.com>2018-12-25 03:44:48 +0300
commitca2e9ce9cc98f046ea2be0a9051cdf06d253d7f6 (patch)
treeaceac8aa635a59b4a2d7310af6c19ebde53f4fe7
parentab2ee436342c821b7def04a2b9f1f195c0437065 (diff)
downloadpleroma-ca2e9ce9cc98f046ea2be0a9051cdf06d253d7f6.tar.gz
pleroma-ca2e9ce9cc98f046ea2be0a9051cdf06d253d7f6.zip
Revert unneeded changes
-rw-r--r--lib/pleroma/notification.ex7
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex3
-rw-r--r--lib/pleroma/web/common_api/utils.ex7
3 files changed, 3 insertions, 14 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 457cba935..47578d60e 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -75,16 +75,11 @@ defmodule Pleroma.Notification 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)
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 87514870d..e6af4b211 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -586,8 +586,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier 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
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index d25fef6bc..142283684 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -69,12 +69,7 @@ defmodule Pleroma.Web.CommonAPI.Utils 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