projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into frontend-admin-api
[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 9705b7a914290d1ed3a58f60d81e1b7603877cc9..21d535d54e4cde064d82dd9f6227fa0ff9b0900a 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/marker_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/marker_view.ex
@@
-11,7
+11,10
@@
defmodule Pleroma.Web.MastodonAPI.MarkerView do
%{
last_read_id: m.last_read_id,
version: m.lock_version,
- updated_at: NaiveDateTime.to_iso8601(m.updated_at)
+ updated_at: NaiveDateTime.to_iso8601(m.updated_at),
+ pleroma: %{
+ unread_count: m.unread_count
+ }
}}
end)
end