Moderator Tool Improvements

.gitignore

@@ -60,6 +60,9 @@ qpixel-import.tar.gz
 
 dump.rdb
 
+# Ignore rbenv local file
+.ruby-version
+
 # Ignore IRB files
 .irbrc
 .irb_history

app/assets/javascripts/application.js

@@ -65,6 +65,15 @@ $(document).on('ready', function() {
     });
   });
 
+  $(".is-partial-only:not(.open)").on("click", (evt) => {
+    if (evt.target.classList.contains("open")) {
+      return;
+    }
+
+    evt.target.classList.add("open");
+    evt.stopPropagation();
+  });
+
   if (document.cookie.indexOf('dismiss_fvn') === -1 ) {
     $('#fvn-dismiss').on('click', () => {
       document.cookie = 'dismiss_fvn=true; path=/; expires=Fri, 31 Dec 9999 23:59:59 GMT';

app/assets/stylesheets/application.scss

@@ -269,3 +269,35 @@ img.header--item-image {
 .widget--header-link {
   margin: 0 0 0 0.5em;
 }
+
+
+.is-partial-only:not(.open) {
+  max-height: 100px;
+  overflow: hidden;
+  position: relative;
+
+  &::after {
+    content: '';
+    position: absolute;
+    right: 0; left: 0;
+    bottom: 0;
+    height: 75px;
+    background-color: rgba(255, 255, 255, 0.5);
+    background: linear-gradient(#ffffff66, #fffffffa);
+    z-index: 10000000;
+  }
+
+  &::before {
+    content: 'expand';
+    position: absolute;
+    left: 50%;
+    transform: translate(-50%);
+    bottom: 10px;
+    z-index: 10000001;
+    padding: 5px 20px;
+    background-color: #ddd;
+    border: 1px solid #666;
+    border-radius: 15px;
+    cursor: pointer;
+  }
+}

app/assets/stylesheets/tabs.scss

@@ -2,4 +2,8 @@
 
 .tabs {
   margin-bottom: 1em;
+
+  .tabs--push {
+    flex-grow: 1;
+  }
 }

app/assets/stylesheets/users.scss

@@ -231,3 +231,19 @@ $sizes: (16, 32, 40, 48, 64, 128, 256);
     }
   }
 }
+
+
+.modtools--sidebar {
+  margin-right: 1rem;
+}
+.modtools--usercard {
+  padding: 0.5rem;
+}
+.modtools-tbl-noborder {
+  th {
+    border-bottom-width: 1px !important;
+    width: 150px;
+  }
+}
+
+.mod-warnings-clear-form { display: inline; }

app/controllers/admin_controller.rb

@@ -2,7 +2,7 @@
 class AdminController < ApplicationController
   before_action :verify_admin, except: [:change_back, :verify_elevation]
   before_action :verify_global_admin, only: [:admin_email, :send_admin_email, :new_site, :create_site, :setup,
-                                             :setup_save, :hellban]
+                                             :setup_save, :failban]
   before_action :verify_developer, only: [:change_users, :impersonate, :all_email, :send_all_email]
 
   def index; end
@@ -143,7 +143,7 @@
     render
   end
 
-  def hellban
+  def failban
     @user = User.find params[:id]
     @user.block("user manually blocked by admin ##{current_user.id}")
     flash[:success] = t 'admin.user_fed_stat'
@@ -152,6 +152,7 @@
 
   def impersonate
     @user = User.find params[:id]
+    render layout: 'without_sidebar'
   end
 
   def change_users

app/controllers/application_controller.rb

@@ -299,7 +299,10 @@ def pull_categories
   def check_if_warning_or_suspension_pending
     return if current_user.nil?
 
-    warning = ModWarning.where(community_user: current_user.community_user, active: true).any?
+    warning = ModWarning.where(community_user: current_user.community_user)
+                        .or(ModWarning.where(user: current_user, is_global: true))
+                        .where(active: true)
+                        .any?
     return unless warning
 
     # Ignore devise and warning routes

app/controllers/comments_controller.rb

@@ -1,15 +1,18 @@
 # Provides mainly web actions for using and making comments.
+
 class CommentsController < ApplicationController
   before_action :authenticate_user!, except: [:post, :show, :thread]
   before_action :set_comment, only: [:update, :destroy, :undelete, :show]
   before_action :set_thread, only: [:thread, :thread_rename, :thread_restrict, :thread_unrestrict, :thread_followers]
   before_action :check_privilege, only: [:update, :destroy, :undelete]
   before_action :check_if_target_post_locked, only: [:create, :post_follow]
   before_action :check_if_parent_post_locked, only: [:update, :destroy]
+  before_action :check_if_thread_is_private, only: [:update, :destroy, :undelete]
+  before_action :check_if_not_mod_and_thread_is_private, only: [:thread_rename, :thread_restrict, :thread_unrestrict]
 
   def create_thread
     @post = Post.find(params[:post_id])
-    if @post.comments_disabled && !current_user.is_moderator && !current_user.is_admin
+    if @post.comments_disabled && !current_user.is_moderator
       render json: { status: 'failed', message: 'Comments have been disabled on this post.' }, status: :forbidden
       return
     elsif !@post.can_access?(current_user)
@@ -63,11 +66,13 @@
   def create
     @comment_thread = CommentThread.find(params[:id])
     @post = @comment_thread.post
-    if @post.comments_disabled && !current_user.is_moderator && !current_user.is_admin
-      render json: { status: 'failed', message: 'Comments have been disabled on this post.' }, status: :forbidden
-      return
-    elsif !@post.can_access?(current_user)
-      return not_found
+    unless @post.nil?
+      if !@post.can_access?(current_user)
+        return not_found
+      elsif @post.comments_disabled && !current_user.is_moderator
+        render json: { status: 'failed', message: 'Comments have been disabled on this post.' }, status: :forbidden
+        return
+      end
     end
 
     body = params[:content]
@@ -89,10 +94,13 @@
                                         .where('link LIKE ?', "#{thread_url}%")
         next if existing_notification.exists?
 
-        title = @post.parent.nil? ? @post.title : @post.parent.title
-        follower.user.create_notification("There are new comments in a followed thread '#{@comment_thread.title}' " \
-                                          "on the post '#{title}'",
-                                          helpers.comment_link(@comment))
+        if @post.nil?
+          wording = "There are new comments in a private thread '#{@comment_thread.title}'"
+        else
+          post_title = @post.parent.nil? ? @post.title : @post.parent.title
+          wording = "There are new comments in a followed thread '#{@comment_thread.title}' on the post '#{post_title}'"
+        end
+        follower.user.create_notification(wording, helpers.comment_link(@comment))
       end
     else
       flash[:danger] = @comment.errors.full_messages.join(', ')
@@ -161,8 +169,7 @@
   end
 
   def thread_followers
-    return not_found unless @comment_thread.can_access?(current_user)
-    return not_found unless current_user.is_moderator || current_user.is_admin
+    return not_found unless current_user.is_moderator
 
     @followers = ThreadFollower.where(comment_thread: @comment_thread).joins(:user, user: :community_user)
                                .includes(:user, user: [:community_user, :avatar_attachment])
@@ -292,7 +299,7 @@
   end
 
   def check_privilege
-    unless current_user.is_moderator || current_user.is_admin || current_user == @comment.user
+    unless current_user.is_moderator || current_user == @comment.user
       render template: 'errors/forbidden', status: :forbidden
     end
   end
@@ -302,7 +309,7 @@
   end
 
   def check_if_target_post_locked
-    check_if_locked(Post.find(params[:post_id]))
+    params[:post_id].present? && check_if_locked(Post.find(params[:post_id]))
   end
 
   def check_for_pings(thread, content)
@@ -326,12 +333,14 @@
   end
 
   def comment_rate_limited
+    return false if @comment_thread&.is_private
+
     recent_comments = Comment.where(created_at: 24.hours.ago..DateTime.now, user: current_user).where \
                              .not(post: Post.includes(:parent).where(parents_posts: { user_id: current_user.id })) \
                              .where.not(post: Post.where(user_id: current_user.id)).count
     max_comments_per_day = SiteSetting[current_user.privilege?('unrestricted') ? 'RL_Comments' : 'RL_NewUserComments']
 
-    if (!@post.user_id == current_user.id || @post&.parent&.user_id == current_user.id) \
+    if (!@post&.user_id == current_user.id || @post&.parent&.user_id == current_user.id) \
        && recent_comments >= max_comments_per_day
       comment_limit_msg = "You have used your daily comment limit of #{recent_comments} comments. " \
                           'Come back tomorrow to continue commenting. Comments on own posts and on answers ' \
@@ -349,4 +358,17 @@
     end
     false
   end
+
+  def check_if_thread_is_private
+    if @comment_thread&.is_private
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+    end
+  end
+
+  def check_if_not_mod_and_thread_is_private
+    unless current_user.is_moderator
+      check_if_thread_is_private
+    end
+  end
 end

app/controllers/mod_warning_controller.rb

@@ -1,8 +1,9 @@
 class ModWarningController < ApplicationController
   before_action :verify_moderator, only: [:log, :new, :create, :lift]
+  before_action :verify_global_moderator, only: [:new_global, :create_global]
 
   before_action :set_warning, only: [:current, :approve]
-  before_action :set_user, only: [:log, :new, :create, :lift]
+  before_action :set_user, only: [:log, :new, :create, :lift, :new_global, :create_global]
 
   def current
     render layout: 'without_sidebar'
@@ -21,7 +22,20 @@
   end
 
   def log
-    @warnings = ModWarning.where(community_user: @user.community_user).order(created_at: :desc).all
+    warnings = ModWarning.where(community_user: @user.community_user)
+    if current_user.is_global_moderator || current_user.is_global_admin
+      warnings = warnings.or(ModWarning.where(user: @user, is_global: true))
+    end
+    warnings = warnings.all
+                       .map { |w| { type: :warning, value: w } }
+
+    user_followed_threads = ThreadFollower.where(user: @user).select(:comment_thread_id)
+    messages = CommentThread.where(post: nil, is_private: true, id: user_followed_threads)
+                            .all
+                            .filter { |m| m.comments.first.user&.id != @user&.id }
+                            .map { |m| { type: :message, value: m } }
+
+    @entries = (warnings + messages).sort_by { |e| e[:value].created_at }.reverse
     render layout: 'without_sidebar'
   end
 
@@ -44,25 +58,64 @@
 
     @warning = ModWarning.new(author: current_user, community_user: @user.community_user,
                               body: params[:mod_warning][:body], is_suspension: is_suspension,
-                              suspension_end: suspension_end, active: true, read: false)
+                              suspension_end: suspension_end, active: true, read: false,
+                              is_global: false)
     if @warning.save
       if is_suspension
         @user.community_user.update(is_suspended: is_suspension, suspension_end: suspension_end,
                                     suspension_public_comment: params[:mod_warning][:suspension_public_notice])
       end
 
-      redirect_to user_path(@user)
+      redirect_to mod_user_path(@user)
+    else
+      render :new
+    end
+  end
+
+  def new_global
+    @warning = ModWarning.new(author: current_user, is_suspension: true)
+    render layout: 'without_sidebar'
+  end
+
+  def create_global
+    suspension_duration = params[:mod_warning][:suspension_duration].to_i
+
+    suspension_duration = 1 if suspension_duration <= 0
+    suspension_duration = 365 if suspension_duration > 365
+
+    suspension_end = DateTime.now + suspension_duration.days
+
+    @warning = ModWarning.new(author: current_user, user: @user,
+                              body: params[:mod_warning][:body], is_suspension: true,
+                              suspension_end: suspension_end, active: true, read: false,
+                              is_global: true)
+    if @warning.save
+      @user.update(is_globally_suspended: true, global_suspension_end: suspension_end)
+
+      redirect_to mod_user_path(@user)
     else
       render :new
     end
   end
 
   def lift
-    @warning = ModWarning.where(community_user: @user.community_user, active: true).last
+    @warning   = ModWarning.where(user: @user, is_global: true, active: true).last
+    @warning ||= ModWarning.where(community_user: @user.community_user, active: true).last
     return not_found if @warning.nil?
 
+    if @warning.is_global && !current_user.is_global_moderator && !current_user.is_global_admin
+      flash[:error] = 'A network-wide suspension has been applied which may only be lifted by global moderators. ' \
+                      'Community-wide suspensions which have been imposed before that global suspension cannot be ' \
+                      'lifted at this time (which is probably why you are seeing this error).'
+      redirect_to mod_warning_log_path(@user)
+    end
+
     @warning.update(active: false, read: false)
-    @user.community_user.update is_suspended: false, suspension_public_comment: nil, suspension_end: nil
+    if @warning.is_global
+      @user.update is_globally_suspended: false, global_suspension_end: nil
+    else
+      @user.community_user.update is_suspended: false, suspension_public_comment: nil, suspension_end: nil
+    end
 
     AuditLog.moderator_audit(event_type: 'warning_lift', related: @warning, user: current_user,
                              comment: "<<Warning #{@warning.attributes_print} >>")
@@ -75,7 +128,8 @@
   private
 
   def set_warning
-    @warning = ModWarning.where(community_user: current_user.community_user, active: true).last
+    @warning   = ModWarning.where(user: current_user, active: true, is_global: true).last
+    @warning ||= ModWarning.where(community_user: current_user.community_user, active: true).last
     not_found if @warning.nil?
   end
 

app/controllers/moderator_controller.rb

@@ -67,6 +67,7 @@
         total: Vote.where(recv_user: @user).count
       )
     )
+    render layout: 'without_sidebar'
   end
 
   private