mastodon api: fix up quite a few test failures
authorWilliam Pitcock <nenolod@dereferenced.org>
Tue, 20 Nov 2018 19:02:23 +0000 (19:02 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Tue, 20 Nov 2018 19:02:23 +0000 (19:02 +0000)
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

index a0b74311b9d4ee3b0262129a9dfeb534ac978302..280bd78fc6b2507c108bfac6b1a0253570f15670 100644 (file)
@@ -659,7 +659,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
 
   # TODO: Use proper query
   def blocks(%{assigns: %{user: user}} = conn, _) do
-    with blocked_users <- user.info["blocks"] || [],
+    with blocked_users <- user.info.blocks || [],
          accounts <- Enum.map(blocked_users, fn ap_id -> User.get_cached_by_ap_id(ap_id) end) do
       res = AccountView.render("accounts.json", users: accounts, for: user, as: :user)
       json(conn, res)
@@ -667,7 +667,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   end
 
   def domain_blocks(%{assigns: %{user: %{info: info}}} = conn, _) do
-    json(conn, info["domain_blocks"] || [])
+    json(conn, info.domain_blocks || [])
   end
 
   def block_domain(%{assigns: %{user: blocker}} = conn, %{"domain" => domain}) do
@@ -915,11 +915,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
             max_toot_chars: limit
           },
           rights: %{
-            delete_others_notice: !!user.info["is_moderator"]
+            delete_others_notice: !!user.info.is_moderator
           },
           compose: %{
             me: "#{user.id}",
-            default_privacy: user.info["default_scope"] || "public",
+            default_privacy: user.info.default_scope || "public",
             default_sensitive: false
           },
           media_attachments: %{