clean sql query

diff --git a/lib/pleroma/marker.ex b/lib/pleroma/marker.ex
index a7ea542dd009b8be54452dc0e379c6691dbc82e3..d5ca27bf202beefac048a74e02ff2b08d22fdb8e 100644 (file)
--- a/lib/pleroma/marker.ex
+++ b/lib/pleroma/marker.ex
@@ -56,7 +56,7 @@ defmodule Pleroma.Marker do
     |> Multi.insert(
       :marker,
       fn %{counters: attrs} ->
-        Marker
+        %Marker{timeline: "notifications", user_id: user.id}
         |> struct(attrs)
         |> Ecto.Changeset.change()
       end,

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 373f9b06a85b7f2771be63ab45e217d61f4313f9..158903c4b2f1d41693f9d8589353c4de37c7bb21 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -41,8 +41,6 @@ defmodule Pleroma.Notification do
     from(q in Pleroma.Notification,
       where: q.user_id == ^user.id,
       select: %{
-        timeline: "notifications",
-        user_id: type(^user.id, :string),
         unread_count: fragment("SUM( CASE WHEN seen = false THEN 1 ELSE 0 END )"),
         last_read_id:
           type(fragment("MAX( CASE WHEN seen = true THEN id ELSE null END )"), :string)