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 issue/1276
[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 38fbeed5f2b6c62ddf51ca5c02dc2028fc9e9745..415dae93b43b491a6bd5ce3606649d2e438c912d 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/marker_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/marker_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerView do
@@
-10,7
+10,10
@@
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)
+ updated_at: NaiveDateTime.to_iso8601(m.updated_at),
+ pleroma: %{
+ unread_count: m.unread_count
+ }
})
end)
end
})
end)
end