Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2

changelog.d/mark-read.fix

@@ -0,0 +1 @@
+The query for marking notifications as read has been simplified

lib/pleroma/notification.ex

@@ -280,15 +280,10 @@ def set_read_up_to(%{id: user_id} = user, id) do
         select: n.id
       )
 
-    {:ok, %{ids: {_, notification_ids}}} =
     Multi.new()
     |> Multi.update_all(:ids, query, set: [seen: true, updated_at: NaiveDateTime.utc_now()])
     |> Marker.multi_set_last_read_id(user, "notifications")
     |> Repo.transaction()
-
-    for_user_query(user)
-    |> where([n], n.id in ^notification_ids)
-    |> Repo.all()
   end
 
   @spec read_one(User.t(), String.t()) ::
@@ -299,10 +294,6 @@ def read_one(%User{} = user, notification_id) do
       |> Multi.update(:update, changeset(notification, %{seen: true}))
       |> Marker.multi_set_last_read_id(user, "notifications")
       |> Repo.transaction()
-      |> case do
-        {:ok, %{update: notification}} -> {:ok, notification}
-        {:error, :update, changeset, _} -> {:error, changeset}
-      end
     end
   end
 

lib/pleroma/web/api_spec/operations/pleroma_notification_operation.ex

@@ -5,7 +5,6 @@
 defmodule Pleroma.Web.ApiSpec.PleromaNotificationOperation do
   alias OpenApiSpex.Operation
   alias OpenApiSpex.Schema
-  alias Pleroma.Web.ApiSpec.NotificationOperation
   alias Pleroma.Web.ApiSpec.Schemas.ApiError
 
   import Pleroma.Web.ApiSpec.Helpers
@@ -35,12 +34,7 @@ def mark_as_read_operation do
           Operation.response(
             "A Notification or array of Notifications",
             "application/json",
-            %Schema{
+            %Schema{type: :string}
-              anyOf: [
-                %Schema{type: :array, items: NotificationOperation.notification()},
-                NotificationOperation.notification()
-              ]
-            }
           ),
         400 => Operation.response("Bad Request", "application/json", ApiError)
       }

lib/pleroma/web/pleroma_api/controllers/notification_controller.ex

@@ -23,8 +23,9 @@ def mark_as_read(
         } = conn,
         _
       ) do
-    with {:ok, notification} <- Notification.read_one(user, notification_id) do
+    with {:ok, _} <- Notification.read_one(user, notification_id) do
-      render(conn, "show.json", notification: notification, for: user)
+      conn
+      |> json("ok")
     else
       {:error, message} ->
         conn
@@ -38,11 +39,14 @@ def mark_as_read(
           conn,
         _
       ) do
-    notifications =
+    with {:ok, _} <- Notification.set_read_up_to(user, max_id) do
-      user
+      conn
-      |> Notification.set_read_up_to(max_id)
+      |> json("ok")
-      |> Enum.take(80)
+    else
-
+      {:error, message} ->
-    render(conn, "index.json", notifications: notifications, for: user)
+        conn
+        |> put_status(:bad_request)
+        |> json(%{"error" => message})
+    end
   end
 end

test/pleroma/notification_test.exs

@@ -449,9 +449,7 @@ test "it sets all notifications as read up to a specified notification ID" do
           status: "hey yet again @#{other_user.nickname}!"
         })
 
-      [_, read_notification] = Notification.set_read_up_to(other_user, n2.id)
+      Notification.set_read_up_to(other_user, n2.id)
-
-      assert read_notification.activity.object
 
       [n3, n2, n1] = Notification.for_user(other_user)
 

test/pleroma/web/pleroma_api/controllers/notification_controller_test.exs

@@ -21,13 +21,11 @@ test "it marks a single notification as read", %{user: user1, conn: conn} do
       {:ok, [notification1]} = Notification.create_notifications(activity1)
       {:ok, [notification2]} = Notification.create_notifications(activity2)
 
-      response =
       conn
       |> put_req_header("content-type", "application/json")
       |> post("/api/v1/pleroma/notifications/read", %{id: notification1.id})
       |> json_response_and_validate_schema(:ok)
 
-      assert %{"pleroma" => %{"is_seen" => true}} = response
       assert Repo.get(Notification, notification1.id).seen
       refute Repo.get(Notification, notification2.id).seen
     end
@@ -40,14 +38,17 @@ test "it marks multiple notifications as read", %{user: user1, conn: conn} do
 
       [notification3, notification2, notification1] = Notification.for_user(user1, %{limit: 3})
 
-      [response1, response2] =
+      refute Repo.get(Notification, notification1.id).seen
+      refute Repo.get(Notification, notification2.id).seen
+      refute Repo.get(Notification, notification3.id).seen
+
       conn
       |> put_req_header("content-type", "application/json")
       |> post("/api/v1/pleroma/notifications/read", %{max_id: notification2.id})
       |> json_response_and_validate_schema(:ok)
 
-      assert %{"pleroma" => %{"is_seen" => true}} = response1
+      [notification3, notification2, notification1] = Notification.for_user(user1, %{limit: 3})
-      assert %{"pleroma" => %{"is_seen" => true}} = response2
+
       assert Repo.get(Notification, notification1.id).seen
       assert Repo.get(Notification, notification2.id).seen
       refute Repo.get(Notification, notification3.id).seen