Moderator Tool Improvements

app/assets/javascripts/application.js

@@ -65,6 +65,13 @@ $(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

@@ -277,3 +277,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

@@ -212,3 +212,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/application_controller.rb

@@ -269,8 +269,9 @@ def pull_categories
   def check_if_warning_or_suspension_pending
     return if current_user.nil?
 
+    global_warning = ModWarning.where(user: current_user, is_global: true, active: true).any?
     warning = ModWarning.where(community_user: current_user.community_user, active: true).any?
-    return unless warning
+    return unless global_warning || warning
 
     # Ignore devise and warning routes
     return if devise_controller? || ['custom_sessions', 'mod_warning', 'errors'].include?(controller_name)

app/controllers/comments_controller.rb

@@ -1,4 +1,6 @@
 # Provides mainly web actions for using and making comments.
+
+# rubocop:disable Metrics/ClassLength
 class CommentsController < ApplicationController
   before_action :authenticate_user!, except: [:post, :show, :thread]
   before_action :set_comment, only: [:update, :destroy, :undelete, :show]
@@ -56,11 +58,13 @@ def create_thread
   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 [email protected]_access?(current_user)
-      return not_found
+    unless @post.nil?
+      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 [email protected]_access?(current_user)
+        return not_found
+      end
     end
 
     body = params[:content]
@@ -82,6 +86,8 @@ def create
                                         .where('link LIKE ?', "#{thread_url}%")
         next if existing_notification.exists?
 
+        next if @post.nil?
+
         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}'",
@@ -94,6 +100,12 @@ def create
   end
 
   def update
+    if @comment_thread&.is_private
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     before = @comment.content
     if @comment.update comment_params
       unless current_user.id == @comment.user_id
@@ -110,6 +122,12 @@ def update
   end
 
   def destroy
+    if @comment_thread&.is_private
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     if @comment.update(deleted: true)
       @comment_thread = @comment.comment_thread
       unless current_user.id == @comment.user_id
@@ -123,6 +141,12 @@ def destroy
   end
 
   def undelete
+    if @comment_thread&.is_private
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     if @comment.update(deleted: false)
       @comment_thread = @comment.comment_thread
       unless current_user.id == @comment.user_id
@@ -169,11 +193,23 @@ def thread_rename
       return
     end
 
+    if @comment_thread&.is_private && !current_user.is_moderator
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     @comment_thread.update title: params[:title]
     redirect_to comment_thread_path(@comment_thread.id)
   end
 
   def thread_restrict
+    if @comment_thread&.is_private && !current_user.is_moderator
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     case params[:type]
     when 'lock'
       return not_found unless current_user.privilege?('flag_curate') && !@comment_thread.locked?
@@ -204,6 +240,12 @@ def thread_restrict
   end
 
   def thread_unrestrict
+    if @comment_thread&.is_private && !current_user.is_moderator
+      flash[:danger] = 'This action is not permitted.'
+      redirect_to comment_thread_path(@comment_thread.id)
+      return
+    end
+
     case params[:type]
     when 'lock'
       return not_found unless current_user.privilege?('flag_curate') && @comment_thread.locked?
@@ -278,7 +320,7 @@ def check_if_parent_post_locked
   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)
@@ -302,12 +344,14 @@ def apply_pings(pings)
   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 ([email protected]_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' \
@@ -326,3 +370,4 @@ def comment_rate_limited
     false
   end
 end
+# rubocop:enable Metrics/ClassLength

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,24 @@ def approve
   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
+    @warnings = @warnings.map { |w| { type: :warning, value: w } }
+
+    @messages = ThreadFollower.where(user: @user).all.map { |t| t.id - 1 }
+    @messages = CommentThread.where(post: nil, is_private: true, id: @messages).all
+    @messages = @messages.filter { |m| m.comments.first.user&.id != @user&.id }
+    @messages = @messages.map { |m| { type: :message, value: m } }
+
+    print "#{'*' * 50}\n"
+    print @messages
+    print "\n#{'*' * 50}"
+
+    @entries = @warnings + @messages
+    @entries = @entries.sort_by { |e| e[:value].created_at }.reverse
     render layout: 'without_sidebar'
   end
 
@@ -44,25 +62,65 @@ def create
 
     @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 = 7300 if suspension_duration > 7300
+
+    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 suspensions 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 +133,8 @@ def lift
   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

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