From: Maksim Pechnikov <parallel588@gmail.com>
Date: Mon, 11 Nov 2019 14:06:41 +0000 (+0300)
Subject: clean sql query
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ddbfc995ac40db9bd1da137b03e5acf6d050ddc5;p=akkoma

clean sql query
---

diff --git a/lib/pleroma/marker.ex b/lib/pleroma/marker.ex
index a7ea542dd..d5ca27bf2 100644
--- 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 373f9b06a..158903c4b 100644
--- 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)