projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
marker_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/marker_view.ex
b/lib/pleroma/web/mastodon_api/views/marker_view.ex
index 415dae93b43b491a6bd5ce3606649d2e438c912d..985368fe5a771463fb780403a17871fbf6d7bcab 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/marker_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/marker_view.ex
@@
-10,10
+10,7
@@
defmodule Pleroma.Web.MastodonAPI.MarkerView do
Map.put_new(acc, m.timeline, %{
last_read_id: m.last_read_id,
version: m.lock_version,
Map.put_new(acc, m.timeline, %{
last_read_id: m.last_read_id,
version: m.lock_version,
- updated_at: NaiveDateTime.to_iso8601(m.updated_at),
- pleroma: %{
- unread_count: m.unread_count
- }
+ updated_at: NaiveDateTime.to_iso8601(m.updated_at)
})
end)
end
})
end)
end