fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix background updating / handling.

Browse source
This commit is contained in:
lain 2018-12-02 11:20:38 +01:00
parent 371d96b1da
commit 91065e1968
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/user/info.ex
View file

@ -4,7 +4,7 @@ defmodule Pleroma.User.Info do
embedded_schema do embedded_schema do
field(:banner, :map, default: %{}) field(:banner, :map, default: %{})
field(:background, :string, default: nil) field(:background, :map, default: %{})
field(:source_data, :map, default: %{}) field(:source_data, :map, default: %{})
field(:note_count, :integer, default: 0) field(:note_count, :integer, default: 0)
field(:follower_count, :integer, default: 0) field(:follower_count, :integer, default: 0)
@ -134,7 +134,8 @@ defmodule Pleroma.User.Info do
:locked, :locked,
:no_rich_text, :no_rich_text,
:default_scope, :default_scope,
:banner :banner,
:background
]) ])
end end

2
test/web/ostatus/ostatus_test.exs
View file

@ -337,7 +337,7 @@ defmodule Pleroma.Web.OStatusTest do
%Pleroma.User.Info{ %Pleroma.User.Info{
id: user.info.id, id: user.info.id,
ap_enabled: false, ap_enabled: false,
background: nil, background: %{},
banner: %{}, banner: %{},
blocks: [], blocks: [],
deactivated: false, deactivated: false,

6
test/web/twitter_api/twitter_api_controller_test.exs
View file

@ -24,6 +24,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|> assign(:user, user) |> assign(:user, user)
|> post(authenticated_twitter_api__path(conn, :update_banner), %{"banner" => new_banner}) |> post(authenticated_twitter_api__path(conn, :update_banner), %{"banner" => new_banner})
|> json_response(200) |> json_response(200)
user = Repo.get(User, user.id)
assert user.info.banner["type"] == "Image"
end end
end end
@ -39,6 +42,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|> assign(:user, user) |> assign(:user, user)
|> post(authenticated_twitter_api__path(conn, :update_background), %{"img" => new_bg}) |> post(authenticated_twitter_api__path(conn, :update_background), %{"img" => new_bg})
|> json_response(200) |> json_response(200)
user = Repo.get(User, user.id)
assert user.info.background["type"] == "Image"
end end
end end