thredded 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb30f1cf973b0e6d8e26feb9006cbf20b1405cddfcaa2deb4e06ccd1d3a6524
-  data.tar.gz: cd3fa99b4797609c4e840ed02a3117ccf7288d1c706ef879ac6ee3d32546404a
+  metadata.gz: 5bd8be4009af787b59ded83d2baa329f83fe8af37162b24d44191bbdae5623a7
+  data.tar.gz: 66601634a6691c8b0488011034dc5a03d872d203452651bf5e792ed87edfa801
 SHA512:
-  metadata.gz: ef7c3bd8c922fc954a55e00625ffe267b0a164be7e4f36eb434de72a70f974571ae72cde41d799643ce893ef3f55aff7b5daebc70119cfe7462027d150ddf897
-  data.tar.gz: e005eb547cbbb181d9f118ff54e9d48427a28c6b3b66dd2e19289e8b5468ceeb059b35e80d9d62b896af964ea416184ac3ea4c4fc8d189675a9b2d5dd9d23616
+  metadata.gz: 416d1ccbef43a2d7b2127151cba2727013a348cf3b36bb5db91cae85e179f7eb579359e945e70296fe965685b73d394125db5bb66dac691c37a756ac4ca49ac4
+  data.tar.gz: 37e9420a65e8278e3dd85c6159817c0336ca544d09119720234a87bad97ba4189238e159eb9a739ce5a90748eb8b6f230cfb95486b05e0c156e41b019c7ff8eb

data/README.md

@@ -95,7 +95,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.15.4'
+gem 'thredded', '~> 0.15.5'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/stylesheets/thredded/base/_alerts.scss

@@ -17,6 +17,7 @@
 %thredded--alert {
   border: solid 1px;
   border-radius: 3px;
+  box-sizing: border-box;
   margin-bottom: $thredded-small-spacing;
   padding: $thredded-small-spacing;
   text-decoration: none;

data/app/controllers/thredded/application_controller.rb

@@ -16,7 +16,8 @@ module Thredded
       :unread_followed_topics_count,
       :unread_topics_count,
       :preferences,
-      :thredded_signed_in?
+      :thredded_signed_in?,
+      :thredded_moderator?
 
     rescue_from Thredded::Errors::MessageboardNotFound,
                 Thredded::Errors::PrivateTopicNotFound,
@@ -57,6 +58,11 @@ module Thredded
       !thredded_current_user.thredded_anonymous?
     end
 
+    def thredded_moderator?
+      return @is_thredded_moderator unless @is_thredded_moderator.nil?
+      @is_thredded_moderator = !thredded_current_user.thredded_can_moderate_messageboards.empty?
+    end
+
     if Rails::VERSION::MAJOR < 5
       # redirect_back polyfill
       def redirect_back(fallback_location:, **args)
@@ -154,9 +160,7 @@ module Thredded
     def unread_followed_topics_count
       @unread_followed_topics_count ||=
         if thredded_signed_in?
-          scope = topics_scope
-          scope = topics_scope.where(messageboard_id: messageboard.id) if messageboard_or_nil
-          scope.unread_followed_by(thredded_current_user).count
+          topics_scope.unread_followed_by(thredded_current_user).count
         else
           0
         end
@@ -165,9 +169,7 @@ module Thredded
     def unread_topics_count
       @unread_topics_count ||=
         if thredded_signed_in?
-          scope = topics_scope
-          scope = topics_scope.where(messageboard_id: messageboard.id) if messageboard_or_nil
-          scope.unread(thredded_current_user).count
+          topics_scope.unread(thredded_current_user).count
         else
           0
         end
@@ -190,5 +192,10 @@ module Thredded
     def thredded_require_login!
       fail Thredded::Errors::LoginRequired if thredded_current_user.thredded_anonymous?
     end
+
+    def thredded_require_moderator!
+      return if thredded_moderator?
+      fail Pundit::NotAuthorizedError, 'You are not authorized to perform this action.'
+    end
   end
 end

data/app/controllers/thredded/messageboards_controller.rb

@@ -12,15 +12,14 @@ module Thredded
     end
 
     def new
-      @messageboard = Thredded::Messageboard.new
-      @messageboard_group = Thredded::MessageboardGroup.all
-      authorize_creating @messageboard
+      @new_messageboard = Thredded::Messageboard.new
+      authorize_creating @new_messageboard
     end
 
     def create
-      @messageboard = Thredded::Messageboard.new(messageboard_params)
-      authorize_creating @messageboard
-      if Thredded::CreateMessageboard.new(@messageboard, thredded_current_user).run
+      @new_messageboard = Thredded::Messageboard.new(messageboard_params)
+      authorize_creating @new_messageboard
+      if Thredded::CreateMessageboard.new(@new_messageboard, thredded_current_user).run
         redirect_to root_path
       else
         render :new

data/app/controllers/thredded/moderation_controller.rb

@@ -3,7 +3,7 @@
 module Thredded
   class ModerationController < Thredded::ApplicationController
     before_action :thredded_require_login!
-    before_action :load_moderatable_messageboards
+    before_action :thredded_require_moderator!
 
     def pending
       @posts = Thredded::PostsPageView.new(
@@ -35,12 +35,20 @@ module Thredded
     end
 
     def moderate_post
-      return head(:bad_request) unless Thredded::Post.moderation_states.include?(params[:moderation_state])
-      flash[:last_moderated_record_id] = Thredded::ModeratePost.run!(
-        post: moderatable_posts.find(params[:id]),
-        moderation_state: params[:moderation_state],
-        moderator: thredded_current_user,
-      ).id
+      moderation_state = params[:moderation_state].to_s
+      return head(:bad_request) unless Thredded::Post.moderation_states.include?(moderation_state)
+      post = moderatable_posts.find(params[:id].to_s)
+      if post.moderation_state != moderation_state
+        flash[:last_moderated_record_id] = Thredded::ModeratePost.run!(
+          post: post,
+          moderation_state: moderation_state,
+          moderator: thredded_current_user,
+        ).id
+      else
+        flash[:alert] = "Post was already #{moderation_state}:"
+        flash[:last_moderated_record_id] =
+          Thredded::PostModerationRecord.order_newest_first.find_by(post_id: post.id)&.id
+      end
       redirect_back fallback_location: pending_moderation_path
     end
 
@@ -49,9 +57,7 @@ module Thredded
         .left_join_thredded_user_details
         .merge(Thredded::UserDetail.order(moderation_state_changed_at: :desc))
       @query = params[:q].to_s
-      if @query.present?
-        @users = DbTextSearch::CaseInsensitive.new(@users, Thredded.user_name_column).prefix(@query)
-      end
+      @users = DbTextSearch::CaseInsensitive.new(@users, Thredded.user_name_column).prefix(@query) if @query.present?
       @users = @users.page(current_page)
     end
 
@@ -81,19 +87,23 @@ module Thredded
     end
 
     def moderatable_posts
-      Thredded::Post.where(messageboard_id: @moderatable_messageboards)
+      if moderatable_messageboards == Thredded::Messageboard.all
+        Thredded::Post.all
+      else
+        Thredded::Post.where(messageboard_id: moderatable_messageboards)
+      end
     end
 
     def accessible_post_moderation_records
-      Thredded::PostModerationRecord
-        .where(messageboard_id: @moderatable_messageboards)
+      if moderatable_messageboards == Thredded::Messageboard.all
+        Thredded::PostModerationRecord.all
+      else
+        Thredded::PostModerationRecord.where(messageboard_id: moderatable_messageboards)
+      end
     end
 
-    def load_moderatable_messageboards
-      @moderatable_messageboards = thredded_current_user.thredded_can_moderate_messageboards.to_a
-      if @moderatable_messageboards.empty? # rubocop:disable Style/GuardClause
-        fail Pundit::NotAuthorizedError, 'You are not authorized to perform this action.'
-      end
+    def moderatable_messageboards
+      @moderatable_messageboards ||= thredded_current_user.thredded_can_moderate_messageboards
     end
 
     def current_page

data/app/controllers/thredded/topics_controller.rb

@@ -56,7 +56,7 @@ module Thredded
       return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       page_scope = policy_scope(topic.posts)
         .order_oldest_first
-        .includes(:user, :messageboard, :postable)
+        .includes(:user, :messageboard)
         .page(current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)

data/app/forms/thredded/post_form.rb

@@ -16,7 +16,7 @@ module Thredded
     def initialize(user:, topic:, post: nil, post_params: {})
       @messageboard = topic.messageboard
       @topic = topic
-      @post = post ? post : topic.posts.build
+      @post = post || topic.posts.build
       user ||= Thredded::NullUser.new
 
       if post_params.include?(:quote_post)

data/app/forms/thredded/private_post_form.rb

@@ -15,7 +15,7 @@ module Thredded
     # @param post_params [Hash]
     def initialize(user:, topic:, post: nil, post_params: {})
       @topic = topic
-      @post = post ? post : topic.posts.build
+      @post = post || topic.posts.build
       user ||= Thredded::NullUser.new
 
       if post_params.include?(:quote_post)

data/app/forms/thredded/private_topic_form.rb

@@ -14,8 +14,7 @@ module Thredded
       :user_ids,
       :locked,
       :sticky,
-      :content,
-      :private_topic
+      :content
 
     attr_reader :user, :params
     attr_writer :user_names
@@ -131,7 +130,7 @@ module Thredded
 
     def parse_names(text) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
       result = []
-      current = String.new
+      current = +''
       in_name = in_quoted = false
       text.each_char do |char|
         case char

data/app/forms/thredded/topic_form.rb

@@ -4,7 +4,7 @@ module Thredded
   class TopicForm
     include ActiveModel::Model
 
-    attr_accessor :title, :category_ids, :locked, :sticky, :content, :topic
+    attr_accessor :title, :category_ids, :locked, :sticky, :content
     attr_reader :user, :messageboard
 
     validate :validate_children

data/app/helpers/thredded/application_helper.rb

@@ -24,7 +24,7 @@ module Thredded
         'thredded--main-container',
         content_for(:thredded_page_id),
         "thredded--global-nav-icons-#{global_nav_icons_count}",
-        ('thredded--is-moderator' unless moderatable_messageboards_ids.empty?),
+        ('thredded--is-moderator' if thredded_moderator?),
         ('thredded--private-messaging-enabled' if Thredded.private_messaging_enabled),
       ].compact
     end
@@ -32,7 +32,7 @@ module Thredded
     def global_nav_icons_count
       result = 1 # Notification Settings
       result += 1 if Thredded.private_messaging_enabled
-      result += 1 if moderatable_messageboards_ids.present?
+      result += 1 if thredded_moderator?
       result
     end
 
@@ -115,14 +115,15 @@ module Thredded
       end
     end
 
-    def moderatable_messageboards_ids
-      @moderatable_messageboards_ids ||=
-        thredded_current_user.thredded_can_moderate_messageboards.pluck(:id)
-    end
-
     def posts_pending_moderation_count
-      @posts_pending_moderation_count ||=
-        Thredded::Post.where(messageboard_id: moderatable_messageboards_ids).pending_moderation.count
+      @posts_pending_moderation_count ||= begin
+        scope = Thredded::Post.pending_moderation
+        moderatable_messageboards = thredded_current_user.thredded_can_moderate_messageboards
+        unless moderatable_messageboards == Thredded::Messageboard.all
+          scope = scope.where(messageboard_id: moderatable_messageboards.pluck(:id))
+        end
+        scope.count
+      end
     end
   end
 end

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -31,7 +31,7 @@ Additionally, Markdown is extended to support the following:
           last_user:    mock_user,
           locked:       [false, true].sample,
           messageboard: mock_messageboard,
-          posts_count:  1 + rand(42),
+          posts_count:  rand(1..42),
           sticky:       [false, true].sample,
           updated_at:   Time.zone.now,
           user:         mock_user,
@@ -45,7 +45,7 @@ Additionally, Markdown is extended to support the following:
         attr.reverse_merge(
           content:      'A test post',
           created_at:   Time.zone.now,
-          id:           1 + rand(1334),
+          id:           rand(1..1334),
           messageboard: topic.messageboard,
           postable:     topic,
           updated_at:   Time.zone.now,
@@ -62,7 +62,7 @@ Additionally, Markdown is extended to support the following:
           slug:        'a-test-private-topic',
           created_at:  3.days.ago,
           last_user:   mock_user,
-          posts_count: 1 + rand(42),
+          posts_count: rand(1..42),
           updated_at:  Time.zone.now,
           user:        mock_user,
         )
@@ -75,7 +75,7 @@ Additionally, Markdown is extended to support the following:
         attr.reverse_merge(
           content:    'A test private post',
           created_at: Time.zone.now,
-          id:         1 + rand(1334),
+          id:         rand(1..1334),
           postable:   private_topic,
           updated_at: Time.zone.now,
           user:       private_topic.last_user,

data/app/models/concerns/thredded/content_moderation_state.rb

@@ -11,35 +11,35 @@ module Thredded
     included do
       before_validation :set_default_moderation_state, on: :create
 
-      scope :moderation_state_visible_to_all, -> { where(visible_to_all_arel_node) }
-
-      scope :moderation_state_visible_to_user, ->(user) {
-        visible = visible_to_all_arel_node
-        # @type [Arel::Table]
-        table = arel_table
-        if user && !user.thredded_anonymous?
-          # Own content
-          visible = visible.or(table[:user_id].eq(user.id))
-          # Content that one can moderate
-          moderatable_messageboard_ids = user.thredded_can_moderate_messageboards.map(&:id)
-          if moderatable_messageboard_ids.present?
-            visible = visible.or(table[:messageboard_id].in(moderatable_messageboard_ids))
-          end
-        end
-        where(visible)
-      }
-
-      # @return [Arel::Nodes::Node]
-      # @api private
-      def self.visible_to_all_arel_node
+      scope :moderation_state_visible_to_all, -> do
         if Thredded.content_visible_while_pending_moderation
           # All non-blocked content
-          arel_table[:moderation_state].not_eq(moderation_states[:blocked])
+          where.not(moderation_state: moderation_states[:blocked])
         else
           # Only approved content
-          arel_table[:moderation_state].eq(moderation_states[:approved])
+          where(moderation_state: moderation_states[:approved])
         end
       end
+
+      scope :moderation_state_visible_to_user, ->(user) {
+        moderatable_messageboards = user.thredded_can_moderate_messageboards
+        if moderatable_messageboards == Thredded::Messageboard.all
+          # If the user can moderate all messageboards, they can see all the content.
+          result = all
+        else
+          # Visible to all.
+          result = moderation_state_visible_to_all
+
+          # Own content.
+          result = result.or(where(user_id: user.id)) if user && !user.thredded_anonymous?
+
+          # Content that the user can moderate.
+          if moderatable_messageboards != Thredded::Messageboard.none
+            result = result.or(messageboard_id: moderatable_messageboards)
+          end
+        end
+        result
+      }
     end
 
     # Whether this is visible to anyone based on the moderation state.
@@ -55,7 +55,7 @@ module Thredded
     def moderation_state_visible_to_user?(user)
       moderation_state_visible_to_all? ||
         (!user.thredded_anonymous? &&
-          (user_id == user.id || user.thredded_can_moderate_messageboards.map(&:id).include?(messageboard_id)))
+          (user_id == user.id || user.thredded_can_moderate_messageboard?(messageboard)))
     end
 
     private

data/app/models/concerns/thredded/topic_common.rb

@@ -6,7 +6,7 @@ module Thredded
     included do
       paginates_per Thredded.topics_per_page if respond_to?(:paginates_per)
 
-      belongs_to :last_user,
+      belongs_to :last_user, # rubocop:disable Rails/InverseOf
                  class_name: Thredded.user_class_name,
                  foreign_key: 'last_user_id',
                  **(Thredded.rails_gte_51? ? { optional: true } : {})

data/app/models/concerns/thredded/user_topic_read_state_common.rb

@@ -41,7 +41,7 @@ module Thredded
       # Adds `first_unread_post_page` and `last_read_post_page` columns onto the scope.
       # Skips the records that have no read posts.
       def with_page_info( # rubocop:disable Metrics/MethodLength
-        posts_per_page: topic_class.default_per_page, posts_scope: post_class.all
+        posts_per_page: post_class.default_per_page, posts_scope: post_class.all
       )
         states = arel_table
         self_relation = is_a?(ActiveRecord::Relation) ? self : all

data/app/models/thredded/category.rb

@@ -4,7 +4,7 @@ module Thredded
   class Category < ActiveRecord::Base
     extend FriendlyId
     belongs_to :messageboard
-    has_many :topic_categories
+    has_many :topic_categories, inverse_of: :category, dependent: :delete_all
     has_many :topics, through: :topic_categories
     friendly_id :name, use: %i[history scoped], scope: :messageboard
 

data/app/models/thredded/messageboard.rb

@@ -20,7 +20,7 @@ module Thredded
                   ]
                 )
 
-    validates :name, uniqueness: true, length: { maximum: 60 }, presence: true
+    validates :name, uniqueness: true, length: { within: Thredded.messageboard_name_length_range }, presence: true
     validates :topics_count, numericality: true
     validates :position, presence: true, on: :update
     before_save :ensure_position, on: :create
@@ -31,7 +31,7 @@ module Thredded
 
     has_many :categories, dependent: :destroy
     has_many :user_messageboard_preferences, dependent: :destroy
-    has_many :posts, dependent: :destroy
+    has_many :posts, dependent: :destroy, inverse_of: :messageboard
     has_many :topics, dependent: :destroy, inverse_of: :messageboard
 
     belongs_to :last_topic, class_name: 'Thredded::Topic', **(Thredded.rails_gte_51? ? { optional: true } : {})
@@ -72,13 +72,13 @@ module Thredded
         ordered_by_topics_count_desc
       end.ordered_by_position.order(id: :asc)
     }
-    scope :ordered_by_position, ->() { order(position: :asc) }
-    scope :ordered_by_created_at_asc, ->() { order(created_at: :asc) }
-    scope :ordered_by_last_post_at_desc, ->() {
+    scope :ordered_by_position, -> { order(position: :asc) }
+    scope :ordered_by_created_at_asc, -> { order(created_at: :asc) }
+    scope :ordered_by_last_post_at_desc, -> {
       joins('LEFT JOIN thredded_topics AS last_topics ON thredded_messageboards.last_topic_id = last_topics.id')
         .order(Arel.sql('COALESCE(last_topics.last_post_at, thredded_messageboards.created_at) DESC'))
     }
-    scope :ordered_by_topics_count_desc, ->() {
+    scope :ordered_by_topics_count_desc, -> {
       order(topics_count: :desc)
     }