projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ActivityPub: restrict_since/restrict_max: ignore empty param
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index 301cfd1346d946f7ea0a370955531ae331f30873..2c8f60f1941178fd9dd489644f3dfb5e82008d45 100644
(file)
--- a/
lib/pleroma/notification.ex
+++ b/
lib/pleroma/notification.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Notification do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Notification do
@@
-9,8
+9,8
@@
defmodule Pleroma.Notification do
schema "notifications" do
field(:seen, :boolean, default: false)
schema "notifications" do
field(:seen, :boolean, default: false)
- belongs_to(:user,
Pleroma.User
)
- belongs_to(:activity,
Pleroma.Activity
)
+ belongs_to(:user,
User, type: Pleroma.FlakeId
)
+ belongs_to(:activity,
Activity, type: Pleroma.FlakeId
)
timestamps()
end
timestamps()
end
@@
-80,9
+80,8
@@
defmodule Pleroma.Notification do
end
def clear(user) do
end
def clear(user) do
- query = from(n in Notification, where: n.user_id == ^user.id)
-
- Repo.delete_all(query)
+ from(n in Notification, where: n.user_id == ^user.id)
+ |> Repo.delete_all()
end
def dismiss(%{id: user_id} = _user, id) do
end
def dismiss(%{id: user_id} = _user, id) do
@@
-97,7
+96,7
@@
defmodule Pleroma.Notification do
end
end
end
end
- def create_notifications(%Activity{
id: _,
data: %{"to" => _, "type" => type}} = activity)
+ def create_notifications(%Activity{data: %{"to" => _, "type" => type}} = activity)
when type in ["Create", "Like", "Announce", "Follow"] do
users = get_notified_from_activity(activity)
when type in ["Create", "Like", "Announce", "Follow"] do
users = get_notified_from_activity(activity)
@@
-110,7
+109,12
@@
defmodule Pleroma.Notification do
# TODO move to sql, too.
def create_notification(%Activity{} = activity, %User{} = user) do
unless User.blocks?(user, %{ap_id: activity.data["actor"]}) or
# TODO move to sql, too.
def create_notification(%Activity{} = activity, %User{} = user) do
unless User.blocks?(user, %{ap_id: activity.data["actor"]}) or
- user.ap_id == activity.data["actor"] do
+ user.ap_id == activity.data["actor"] or
+ (activity.data["type"] == "Follow" and
+ Enum.any?(Notification.for_user(user), fn notif ->
+ notif.activity.data["type"] == "Follow" and
+ notif.activity.data["actor"] == activity.data["actor"]
+ end)) do
notification = %Notification{user_id: user.id, activity: activity}
{:ok, notification} = Repo.insert(notification)
Pleroma.Web.Streamer.stream("user", notification)
notification = %Notification{user_id: user.id, activity: activity}
{:ok, notification} = Repo.insert(notification)
Pleroma.Web.Streamer.stream("user", notification)