thredded 0.12.1 → 0.12.2

data/app/mailer_previews/thredded/private_topic_mailer_preview.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # Previews for the PrivateTopicMailer
   class PrivateTopicMailerPreview < BaseMailerPreview
@@ -9,7 +10,7 @@ module Thredded
                              post
                            ]),
         post,
-        %w(glebm@test.com joel@test.com)
+        %w[glebm@test.com joel@test.com]
       )
     end
   end

data/app/mailers/thredded/base_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class BaseMailer < Thredded.parent_mailer.constantize
     helper ::Thredded::UrlsHelper

data/app/mailers/thredded/post_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PostMailer < Thredded::BaseMailer
     def post_notification(post_id, emails)

data/app/mailers/thredded/private_topic_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivateTopicMailer < Thredded::BaseMailer
     def message_notification(private_topic_id, post_id, emails)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # Moderation state of a piece of content, such as a Topic or a Post.
   # Requires an integer moderation_state column, a user_id column, and a user_detail association on the including class.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 module Thredded
   # Excludes pagination routes in addition to the given list of reserved words.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # Defines a moderation_state enum
   # Requires an integer moderation_state column on the including class.
@@ -6,7 +7,7 @@ module Thredded
     extend ActiveSupport::Concern
 
     included do
-      enum moderation_state: %i(pending_moderation approved blocked)
+      enum moderation_state: %i[pending_moderation approved blocked]
       validates :moderation_state, presence: true
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module NotifierPreference
     extend ActiveSupport::Concern

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # @abstract Classes that include this module are expected to implement {#readers}.
   # @!method readers

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Thredded
   class SearchParser
     def initialize(query)
       @query = query
-      @keywords = %w(in by order)
+      @keywords = %w[in by order]
     end
 
     def parse
@@ -20,7 +21,7 @@ module Thredded
         keyword_scan = @query.scan(regex)
         @query = @query.gsub(regex, '')
 
-        next unless keyword_scan.present?
+        next if keyword_scan.blank?
         keyword_scan.each do |term|
           found_terms_hash[keyword] ||= []
           found_terms_hash[keyword] << term.delete(' ').split(':')[1]

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module TopicCommon
     extend ActiveSupport::Concern
@@ -6,7 +7,7 @@ module Thredded
       paginates_per 50 if respond_to?(:paginates_per)
 
       belongs_to :last_user,
-                 class_name:  Thredded.user_class,
+                 class_name: Thredded.user_class_name,
                  foreign_key: 'last_user_id'
 
       scope :order_recently_posted_first, -> { order(last_post_at: :desc, id: :desc) }

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class TopicsSearch
     def initialize(query, scope)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserTopicReadStateCommon
     extend ActiveSupport::Concern

data/app/models/thredded/category.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module Thredded
   class Category < ActiveRecord::Base
     extend FriendlyId
     belongs_to :messageboard
     has_many :topic_categories
     has_many :topics, through: :topic_categories
-    friendly_id :name, use: [:history, :scoped], scope: :messageboard
+    friendly_id :name, use: %i[history scoped], scope: :messageboard
 
     validates :name, presence: true
     validates :messageboard_id, presence: true

data/app/models/thredded/messageboard.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 module Thredded
   class Messageboard < ActiveRecord::Base
     extend FriendlyId
     friendly_id :slug_candidates,
-                use:            [:slugged, :reserved],
+                use:            %i[slugged reserved],
                 # Avoid route conflicts
                 reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(
-                  %w(
+                  %w[
                     admin
                     autocomplete-users
                     messageboards
@@ -15,7 +16,7 @@ module Thredded
                     private-posts
                     private-topics
                     theme-preview
-                  )
+                  ]
                 )
 
     validates :name, uniqueness: true, length: { maximum: 60 }, presence: true
@@ -45,7 +46,7 @@ module Thredded
              through:    :messageboard_users,
              source:     :user_detail
     has_many :recently_active_users,
-             class_name: Thredded.user_class,
+             class_name: Thredded.user_class_name,
              through:    :recently_active_user_details,
              source:     :user
 

data/app/models/thredded/messageboard_group.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class MessageboardGroup < ActiveRecord::Base
     has_many :messageboards,

data/app/models/thredded/messageboard_notifications_for_followed_topics.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class MessageboardNotificationsForFollowedTopics < ActiveRecord::Base
     belongs_to :user_preference,
@@ -6,7 +7,7 @@ module Thredded
                foreign_key: :user_id,
                inverse_of: :messageboard_notifications_for_followed_topics
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_user_messageboard_preferences
     belongs_to :messageboard
     scope :for_messageboard, ->(messageboard) { where(messageboard_id: messageboard.id) }

data/app/models/thredded/messageboard_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # The state of a user with regards to a messageboard, such as the last time the user was active (visited)
   # the messageboard.

data/app/models/thredded/notifications_for_followed_topics.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Thredded
   class NotificationsForFollowedTopics < ActiveRecord::Base
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_notifications_for_followed_topics
     belongs_to :messageboard # or is global
     belongs_to :user_preference,

data/app/models/thredded/notifications_for_private_topics.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Thredded
   class NotificationsForPrivateTopics < ActiveRecord::Base
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_notifications_for_private_topics
     belongs_to :user_preference,
                primary_key: :user_id,

data/app/models/thredded/null_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class NullUser
     include ::Thredded::UserPermissions::Read::All

data/app/models/thredded/null_user_topic_read_state.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class NullUserTopicReadState
     def page

data/app/models/thredded/post.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module Thredded
   class Post < ActiveRecord::Base
     include Thredded::PostCommon
     include Thredded::ContentModerationState
 
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_posts
     belongs_to :messageboard,
                counter_cache: true
@@ -29,10 +30,10 @@ module Thredded
 
     validates :messageboard_id, presence: true
 
-    after_commit :update_parent_last_user_and_time_from_last_post, on: [:create, :destroy]
+    after_commit :update_parent_last_user_and_time_from_last_post, on: %i[create destroy]
     after_commit :update_parent_last_user_and_time_from_last_post_if_moderation_state_changed, on: :update
 
-    after_commit :auto_follow_and_notify, on: [:create, :update]
+    after_commit :auto_follow_and_notify, on: %i[create update]
 
     # @param [Integer] per_page
     # @param [Thredded.user_class] user

data/app/models/thredded/post_moderation_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PostModerationRecord < ActiveRecord::Base
     include Thredded::ModerationState
@@ -13,8 +14,8 @@ module Thredded
     belongs_to :messageboard, inverse_of: :post_moderation_records
     validates :messageboard_id, presence: true
     belongs_to :post, inverse_of: :moderation_records
-    belongs_to :post_user, class_name: Thredded.user_class, inverse_of: :thredded_post_moderation_records
-    belongs_to :moderator, class_name: Thredded.user_class, inverse_of: :thredded_post_moderation_records
+    belongs_to :post_user, class_name: Thredded.user_class_name, inverse_of: :thredded_post_moderation_records
+    belongs_to :moderator, class_name: Thredded.user_class_name, inverse_of: :thredded_post_moderation_records
 
     validates_each :moderation_state do |record, attr, value|
       if record.previous_moderation_state == value

data/app/models/thredded/private_post.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivatePost < ActiveRecord::Base
     include Thredded::PostCommon
 
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_posts
     belongs_to :postable,
                class_name:    'Thredded::PrivateTopic',
@@ -15,7 +16,7 @@ module Thredded
                primary_key: :user_id,
                foreign_key: :user_id
 
-    after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
+    after_commit :update_parent_last_user_and_timestamp, on: %i[create destroy]
     after_commit :notify_users, on: [:create]
 
     # @param [Integer] per_page

data/app/models/thredded/private_topic.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivateTopic < ActiveRecord::Base
     include Thredded::TopicCommon
@@ -7,12 +8,12 @@ module Thredded
 
     extend FriendlyId
     friendly_id :slug_candidates,
-                use:            [:history, :reserved],
+                use:            %i[history reserved],
                 # Avoid route conflicts
-                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w(new))
+                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w[new])
 
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_topics
     belongs_to :user_detail,
                primary_key:   :user_id,

data/app/models/thredded/private_user.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivateUser < ActiveRecord::Base
     belongs_to :private_topic, inverse_of: :private_users
-    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_private_users
+    belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_private_users
   end
 end

data/app/models/thredded/stats.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class Stats
     include ActionView::Helpers::NumberHelper

data/app/models/thredded/topic.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class Topic < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     include Thredded::TopicCommon
@@ -22,12 +23,12 @@ module Thredded
 
     extend FriendlyId
     friendly_id :slug_candidates,
-                use: %i(history reserved),
+                use: %i[history reserved],
                 # Avoid route conflicts
-                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w(topics))
+                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w[topics])
 
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_topics
 
     belongs_to :messageboard,
@@ -67,14 +68,14 @@ module Thredded
              inverse_of: :topic,
              dependent: :destroy
     has_many :followers,
-             class_name: Thredded.user_class,
+             class_name: Thredded.user_class_name,
              source: :user,
              through: :user_follows
 
     delegate :name, to: :messageboard, prefix: true
 
     after_commit :update_messageboard_last_topic, on: :update, if: -> { previous_changes.include?('moderation_state') }
-    after_update :update_last_user_and_time_from_last_post!, if: -> { previous_changes.include?('moderation_state') }
+    after_commit :update_last_user_and_time_from_last_post!, if: -> { previous_changes.include?('moderation_state') }
 
     after_commit :handle_messageboard_change_after_commit,
                  on: :update,

data/app/models/thredded/topic_category.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class TopicCategory < ActiveRecord::Base
     belongs_to :category

data/app/models/thredded/user_detail.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserDetail < ActiveRecord::Base
     include Thredded::ModerationState
 
-    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_user_detail
+    belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_detail
     validates :user_id, presence: true, uniqueness: true
 
     has_many :topics, class_name: 'Thredded::Topic', foreign_key: :user_id, primary_key: :user_id

data/app/models/thredded/user_extender.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserExtender
     extend ActiveSupport::Concern
@@ -14,7 +15,7 @@ module Thredded
         opt.has_many :thredded_posts, class_name: 'Thredded::Post'
         opt.has_many :thredded_topics, class_name: 'Thredded::Topic'
         opt.has_many :thredded_private_posts, class_name: 'Thredded::PrivatePost'
-        opt.has_many :thredded_private_topics, class_name: 'Thredded::PrivateTopic'
+        opt.has_many :thredded_started_private_topics, class_name: 'Thredded::PrivateTopic'
       end
 
       with_options dependent: :nullify, foreign_key: 'last_user_id', inverse_of: :last_user do |opt|

data/app/models/thredded/user_messageboard_preference.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserMessageboardPreference < ActiveRecord::Base
     belongs_to :user_preference,
@@ -6,7 +7,7 @@ module Thredded
                foreign_key: :user_id,
                inverse_of: :messageboard_preferences
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_user_messageboard_preferences
     belongs_to :messageboard