:s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff

app/serializers/current_user_serializer.rb

@@ -7,6 +7,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :notification_channel_position,
              :site_flagged_posts_count,
              :moderator?,
+             :staff?,
              :reply_count,
              :topic_count,
              :enable_quoting,
@@ -15,15 +16,8 @@ class CurrentUserSerializer < BasicUserSerializer
 
   # we probably want to move this into site, but that json is cached so hanging it off current user seems okish
 
-  def moderator
-    # TODO we probably want better terminology
-    #
-    # we have admins / moderators and users who are either moderators or admins denoted by moderator?
-    object.moderator?
-  end
-
   def include_site_flagged_posts_count?
-    object.moderator?
+    object.staff?
   end
 
   def topic_count
@@ -34,10 +28,6 @@ class CurrentUserSerializer < BasicUserSerializer
     object.posts.where("post_number > 1").count
   end
 
-  def moderator?
-    object.moderator?
-  end
-
   def site_flagged_posts_count
     PostAction.flagged_posts_count
   end

app/serializers/post_serializer.rb

@@ -88,7 +88,7 @@ class PostSerializer < ApplicationSerializer
   end
 
   def cooked
-    if object.hidden && !scope.is_moderator?
+    if object.hidden && !scope.is_staff?
       if scope.current_user && object.user_id == scope.current_user.id
         I18n.t('flagging.you_must_edit')
       else
@@ -154,7 +154,7 @@ class PostSerializer < ApplicationSerializer
 
       # The following only applies if you're logged in
       if action_summary[:can_act] && scope.current_user.present?
-        action_summary[:can_clear_flags] = scope.is_moderator? && PostActionType.flag_types.values.include?(id)
+        action_summary[:can_clear_flags] = scope.is_staff? && PostActionType.flag_types.values.include?(id)
       end
 
       if post_actions.present? && post_actions.has_key?(id)
@@ -163,7 +163,7 @@ class PostSerializer < ApplicationSerializer
       end
 
       # anonymize flags
-      if !scope.is_moderator? && PostActionType.flag_types.values.include?(id)
+      if !scope.is_staff? && PostActionType.flag_types.values.include?(id)
         action_summary[:count] = action_summary[:acted] ? 1 : 0
       end