a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

update marker api

This commit is contained in:
Maksim Pechnikov 2019-10-30 23:49:05 +03:00
parent 1b82eb6d41
commit 209319c8d2
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/views/marker_view.ex
View File

@ -10,8 +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,
unread_count: m.unread_count,
updated_at: NaiveDateTime.to_iso8601(m.updated_at)
updated_at: NaiveDateTime.to_iso8601(m.updated_at),
pleroma: %{
unread_count: m.unread_count
}
})
end)
end

20
test/web/mastodon_api/controllers/marker_controller_test.exs
View File

@ -26,13 +26,13 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
|> json_response(200)
assert response == %{
"notifications" => %{
"last_read_id" => "69420",
"unread_count" => 7,
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
}
}
"notifications" => %{
"last_read_id" => "69420",
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0,
"pleroma" => %{ "unread_count" => 7 }
}
}
end
test "gets markers with missed scopes", %{conn: conn} do
@ -72,7 +72,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
"last_read_id" => "69420",
"updated_at" => _,
"version" => 0,
"unread_count" => 0
"pleroma" => %{ "unread_count" => 0 }
}
} = response
end
@ -100,9 +100,9 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
assert response == %{
"notifications" => %{
"last_read_id" => "69888",
"unread_count" => 0,
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
"version" => 0,
"pleroma" => %{ "unread_count" => 0 }
}
}
end

8
test/web/mastodon_api/views/marker_view_test.exs
View File

@ -14,15 +14,15 @@ defmodule Pleroma.Web.MastodonAPI.MarkerViewTest do
assert MarkerView.render("markers.json", %{markers: [marker1, marker2]}) == %{
"home" => %{
last_read_id: "42",
unread_count: 0,
updated_at: NaiveDateTime.to_iso8601(marker2.updated_at),
version: 0
version: 0,
pleroma: %{unread_count: 0}
},
"notifications" => %{
last_read_id: "17",
unread_count: 5,
updated_at: NaiveDateTime.to_iso8601(marker1.updated_at),
version: 0
version: 0,
pleroma: %{unread_count: 5}
}
}
end