Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'

[akkoma] / lib / pleroma / user.ex

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 6f8e39f74574e3a7f1b64ed341ceb68211a63cfc..64c69b209cddc9ae339f4e1a13b2aad6d6361d87 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -68,7 +68,8 @@ defmodule Pleroma.User do
       following_count: length(user.following) - oneself,
       note_count: user.info["note_count"] || 0,
       follower_count: user.info["follower_count"] || 0,
-      locked: user.info["locked"] || false
+      locked: user.info["locked"] || false,
+      default_scope: user.info["default_scope"] || "public"
     }
   end
 
@@ -472,7 +473,7 @@ defmodule Pleroma.User do
     # ensure that the actor who published the announced object appears only once
     to =
       if actor.nickname != nil do
-        (to ++ [object.data["actor"]])
+        to ++ [object.data["actor"]]
       else
         to
       end