Merge branch 'user_info_fixes_again' into 'develop'

User info fixes again

See merge request pleroma/pleroma!489

lib/mix/tasks/sample_psql.eex

@@ -4,3 +4,4 @@ CREATE DATABASE pleroma_dev OWNER pleroma;
 --Extensions made by ecto.migrate that need superuser access
 CREATE EXTENSION IF NOT EXISTS citext;
 CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";

lib/pleroma/user/info.ex

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

test/web/ostatus/ostatus_test.exs

@@ -337,7 +337,7 @@ test "find_or_make_user sets all the nessary input fields" do
                %Pleroma.User.Info{
                  id: user.info.id,
                  ap_enabled: false,
-                 background: nil,
+                 background: %{},
                  banner: %{},
                  blocks: [],
                  deactivated: false,

test/web/twitter_api/twitter_api_controller_test.exs

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