Merge branch 'spc-fix-3' into 'develop'

[akkoma] / lib / pleroma / user / info.ex

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index ffb800177de59daf2127f004bc2f5a132248870d..c6c923aac0f30a3b61480004d37f615081d419ca 100644 (file)
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -31,7 +31,7 @@ defmodule Pleroma.User.Info do
     field(:hub, :string, default: nil)
     field(:salmon, :string, default: nil)
     field(:hide_network, :boolean, default: false)
-    field(:pinned_activities, {:array, :integer}, default: [])
+    field(:pinned_activities, {:array, :string}, default: [])
 
     # Found in the wild
     # ap_id -> Where is this used?
@@ -42,8 +42,6 @@ defmodule Pleroma.User.Info do
     # subject _> Where is this used?
   end
 
-  def superuser?(info), do: info.is_admin || info.is_moderator
-
   def set_activation_status(info, deactivated) do
     params = %{deactivated: deactivated}
 
@@ -202,14 +200,14 @@ defmodule Pleroma.User.Info do
 
   def add_pinnned_activity(info, %Pleroma.Activity{id: id}) do
     if id not in info.pinned_activities do
-      max_pinned_posts = Pleroma.Config.get([:instance, :max_pinned_posts], 0)
+      max_pinned_statuses = Pleroma.Config.get([:instance, :max_pinned_statuses], 0)
       params = %{pinned_activities: info.pinned_activities ++ [id]}
 
       info
       |> cast(params, [:pinned_activities])
       |> validate_length(:pinned_activities,
-        max: max_pinned_posts,
-        message: "You have already pinned the maximum number of toots"
+        max: max_pinned_statuses,
+        message: "You have already pinned the maximum number of statuses"
       )
     else
       change(info)