Page MenuHomePhorge
Files F85628712

No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/mix/tasks/pleroma/marker.ex b/lib/mix/tasks/pleroma/marker.ex
deleted file mode 100644
index bebef0d6a..000000000
--- a/lib/mix/tasks/pleroma/marker.ex
+++ /dev/null
@@ -1,36 +0,0 @@
-defmodule Mix.Tasks.Pleroma.Marker do
- use Mix.Task
- import Mix.Pleroma
- import Ecto.Query
-
- alias Pleroma.Notification
- alias Pleroma.Repo
-
- def run(["update_markers"]) do
- start_pleroma()
-
- from(q in Notification,
- select: %{
- timeline: "notifications",
- user_id: q.user_id,
- 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)
- },
- group_by: [q.user_id]
- )
- |> Repo.all()
- |> Enum.each(fn attrs ->
- Pleroma.Marker
- |> struct(attrs)
- |> Ecto.Changeset.change()
- |> Pleroma.Repo.insert(
- returning: true,
- on_conflict: {:replace, [:last_read_id, :unread_count]},
- conflict_target: [:user_id, :timeline]
- )
- end)
-
- shell_info("Done")
- end
-end
diff --git a/priv/repo/migrations/20191030202008_add_unread_to_marker.exs b/priv/repo/migrations/20191030202008_add_unread_to_marker.exs
index f81339c9f..2b3abc682 100644
--- a/priv/repo/migrations/20191030202008_add_unread_to_marker.exs
+++ b/priv/repo/migrations/20191030202008_add_unread_to_marker.exs
@@ -1,18 +1,48 @@
defmodule Pleroma.Repo.Migrations.AddUnreadToMarker do
use Ecto.Migration
import Ecto.Query
alias Pleroma.Repo
- alias Pleroma.Notification
def up do
alter table(:markers) do
add_if_not_exists(:unread_count, :integer, default: 0)
end
+
+ flush()
+
+ update_markers()
end
def down do
alter table(:markers) do
remove_if_exists(:unread_count, :integer)
end
end
+
+ def update_markers do
+ now = NaiveDateTime.utc_now()
+
+ markers_attrs =
+ from(q in "notifications",
+ select: %{
+ timeline: "notifications",
+ user_id: q.user_id,
+ 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)
+ },
+ group_by: [q.user_id]
+ )
+ |> Repo.all()
+ |> Enum.map(fn attrs ->
+ attrs
+ |> Map.put_new(:inserted_at, now)
+ |> Map.put_new(:updated_at, now)
+ end)
+
+ Repo.insert_all("markers", markers_attrs,
+ on_conflict: {:replace, [:last_read_id, :unread_count]},
+ conflict_target: [:user_id, :timeline]
+ )
+ end
end

File Metadata

Mime Type
text/x-diff
Expires
Sat, Aug 8, 1:44 PM (1 d, 16 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1723524
Default Alt Text
(2 KB)

Event Timeline