Make notifications about new statuses from muted threads read

This commit is contained in:
Sergey Suprunenko 2020-08-17 00:07:23 +02:00
parent 0865f36965
commit 25c69e271a
No known key found for this signature in database
GPG Key ID: 5DCA7D1BE3914F9C
4 changed files with 10 additions and 3 deletions

View File

@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
contents has been renamed to `hide_notification_contents` contents has been renamed to `hide_notification_contents`
- Mastodon API: Added `pleroma.metadata.post_formats` to /api/v1/instance - Mastodon API: Added `pleroma.metadata.post_formats` to /api/v1/instance
- Mastodon API (legacy): Allow query parameters for `/api/v1/domain_blocks`, e.g. `/api/v1/domain_blocks?domain=badposters.zone` - Mastodon API (legacy): Allow query parameters for `/api/v1/domain_blocks`, e.g. `/api/v1/domain_blocks?domain=badposters.zone`
- Mastodon API: Make notifications about statuses from muted users and threads read automatically
- Pleroma API: `/api/pleroma/captcha` responses now include `seconds_valid` with an integer value. - Pleroma API: `/api/pleroma/captcha` responses now include `seconds_valid` with an integer value.
</details> </details>

View File

@ -15,6 +15,7 @@ defmodule Pleroma.Notification do
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.ThreadMute alias Pleroma.ThreadMute
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.Push alias Pleroma.Web.Push
alias Pleroma.Web.Streamer alias Pleroma.Web.Streamer
@ -637,7 +638,7 @@ def skip?(_, _, _), do: false
def mark_as_read?(activity, target_user) do def mark_as_read?(activity, target_user) do
user = Activity.user_actor(activity) user = Activity.user_actor(activity)
User.mutes_user?(target_user, user) User.mutes_user?(target_user, user) || CommonAPI.thread_muted?(target_user, activity)
end end
def for_user_and_activity(user, activity) do def for_user_and_activity(user, activity) do

View File

@ -465,7 +465,7 @@ def remove_mute(user, activity) do
end end
def thread_muted?(%User{id: user_id}, %{data: %{"context" => context}}) def thread_muted?(%User{id: user_id}, %{data: %{"context" => context}})
when is_binary("context") do when is_binary(context) do
ThreadMute.exists?(user_id, context) ThreadMute.exists?(user_id, context)
end end

View File

@ -246,7 +246,10 @@ test "it creates a notification for an activity from a muted thread" do
in_reply_to_status_id: activity.id in_reply_to_status_id: activity.id
}) })
assert Notification.create_notification(activity, muter) notification = Notification.create_notification(activity, muter)
assert notification.id
assert notification.seen
end end
test "it disables notifications from strangers" do test "it disables notifications from strangers" do
@ -320,6 +323,7 @@ test "it creates notifications if content matches with a not irreversible filter
{:ok, [notification]} = Notification.create_notifications(status) {:ok, [notification]} = Notification.create_notifications(status)
assert notification assert notification
refute notification.seen
end end
test "it creates notifications when someone likes user's status with a filtered word" do test "it creates notifications when someone likes user's status with a filtered word" do
@ -333,6 +337,7 @@ test "it creates notifications when someone likes user's status with a filtered
{:ok, [notification]} = Notification.create_notifications(activity_two) {:ok, [notification]} = Notification.create_notifications(activity_two)
assert notification assert notification
refute notification.seen
end end
end end