thredded 0.16.15 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac00c63103252bbf9bff35aa057a6630605ad897368010665476b8b4d2abfc3a
-  data.tar.gz: cf7c0937115c8967c8fed0ba5789e4445db0a9e8b098a3109563b63be3883059
+  metadata.gz: c38b0b431b19a2a3bcb74955be64a67835d60870754e65436e8498ca67729bc8
+  data.tar.gz: 1b9827d5ed79af58f52c86e5badb430e1b44dfaff0381fde2390ad08ce436b26
 SHA512:
-  metadata.gz: cd1d9295ea54d35b3f6f1ac48f741b2766645c118b4519b717d5c4f87d926be12492ff2f4b76449088dfe2357b10e518b28442c76ac2998c19614ea2d3631603
-  data.tar.gz: 6d8892713aba82af3017146f0c4f5f8238af39842f4536640689915fa3833b68dc63023502c23e1311a63b6dd45aec0c02c14e4be3367fa6b67e3a471df70caf
+  metadata.gz: 43a2362878a9949d88097d77efe90c7997483e1c70f0fb505ffff1fa06e2097036d6ae6aff829120a406bac06b9e1cbb0879c1b614cf0c8205f837044a6fb105
+  data.tar.gz: 6f59d7de62c088da6ef53bb474ab02bdc666313ff5e050f86c3a1414a7371d93d60874008dc2ce68b8df8a7601754fe9771fef1804e11e1a4060620968465917

data/README.md

@@ -1,6 +1,6 @@
-# Thredded [![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded) [![Travis-CI](https://api.travis-ci.org/thredded/thredded.svg?branch=master)](https://travis-ci.org/thredded/thredded/) [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=master)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+# Thredded [![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded) [![Travis-CI](https://api.travis-ci.org/thredded/thredded.svg?branch=main)](https://travis-ci.org/thredded/thredded/) [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=main)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-_Thredded_ is a Rails 4.2+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
+_Thredded_ is a Rails 5.2+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
 
 Some of the features currently in Thredded:
 
@@ -96,7 +96,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.16.15'
+gem 'thredded', '~> 1.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -174,7 +174,7 @@ mkdir -p app/views/thredded/shared/nav && cp "$(bundle show thredded)/$_/_standa
 
 ### Application layout
 
-You can also use Thredded with your application (or other) layout by by setting `Thredded.layout` in the initializer.
+You can also use Thredded with your application (or other) layout by setting `Thredded.layout` in the initializer.
 
 In this case, you will need to reference your paths/routes carefully and pull in thredded assets (styles and javascript):
 
@@ -352,7 +352,7 @@ with a "themed" version of thredded.
 #### Styles
 
 Thredded comes with a light Sass theme controlled by a handful of variables that can be found here:
-https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/base/_variables.scss.
+https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/base/_variables.scss.
 
 To override the styles, override the variables *before* importing Thredded styles, e.g.:
 
@@ -366,8 +366,8 @@ If you are writing a Thredded plugin, import the [`thredded/base`][thredded-scss
 The `base` package only defines variables, mixins, and %-placeholders, so it can be imported safely without producing
 any duplicate CSS.
 
-[thredded-scss-dependencies]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_dependencies.scss
-[thredded-scss-base]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_base.scss
+[thredded-scss-dependencies]: https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/_dependencies.scss
+[thredded-scss-base]: https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/_base.scss
 
 ### Email and other notifications
 
@@ -513,35 +513,35 @@ Below is an overview of the default permissions, with links to the implementatio
 <tbody>
 <tr>
   <th align="center">Logged in</th>
-  <td align="center" rowspan="2"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/read/all.rb">
+  <td align="center" rowspan="2"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/read/all.rb">
     ✅ All
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/write/all.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/write/all.rb">
     ✅ All
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
     Readers of the messageboards<br>the user can post in
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb">
     <code>moderator_column</code>
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/admin/if_admin_column_true.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/admin/if_admin_column_true.rb">
     <code>admin_column</code>
   </a></td>
 </tr>
 <tr>
   <th align="center">Not logged in</th>
   <!-- rowspan -->
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/write/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/write/none.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/moderate/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/moderate/none.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/admin/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/admin/none.rb">
     ❌ No
   </a></td>
 </tr>
@@ -551,7 +551,7 @@ Below is an overview of the default permissions, with links to the implementatio
 ### Handling "Permission denied" and "Not found" errors
 
 Thredded defines a number of Exception classes for not found / permission denied errors.
-The complete list can be found [here](https://github.com/thredded/thredded/blob/master/app/controllers/thredded/application_controller.rb#L18-L40).
+The complete list can be found [here](https://github.com/thredded/thredded/blob/main/app/controllers/thredded/application_controller.rb#L18-L40).
 
 Currently, the default behaviour is to render an error message with an appropriate response code within the Thredded
 layout. You may want to override the handling for `Thredded::Errors::LoginRequired` to render a login form instead.
@@ -655,12 +655,24 @@ By default, the dummy app server uses Webpack for JavaScript.
 To use Sprockets instead, run:
 
 ```bash
-THREDDED_TESTAPP_WEBPACK=1 bin/rails s
+THREDDED_TESTAPP_SPROCKETS=1 bin/rails s
 ```
 
+alternatively you can use guard (which comes with activereload to make development more pleasant) with:
+
+    export THREDDED_USE_GUARD=1
+    bundle
+    bundle exec guard
+
+
 ### Testing
 
-To run the tests, just run `rspec`. The test suite will re-create the test database on every run, so there is no need to
+In order to run the tests locally, you will need to be running webpack-dev-server (or do a manual compilation):
+
+    cd spec/dummy && yarn && cd -
+    BUNDLE_GEMFILE="${PWD}/Gemfile" spec/dummy/bin/webpack-dev-server
+
+Then to run the tests, just run `rspec`. The test suite will re-create the test database on every run, so there is no need to
 run tasks that maintain the test database.
 
 By default, SQLite is used in development and test. On Travis, the tests will run using SQLite, PostgreSQL, MySQL,
@@ -677,8 +689,8 @@ sudo apt-get install chromium-chromedriver
 On Mac, run:
 
 ```bash
-brew cask install chromium
-brew cask install chromedriver
+brew install --cask chromium
+brew install --cask chromedriver
 ```
 
 To get better page saves (`page.save_and_open_page`) from local capybara specs ensure you are running the server locally 
@@ -777,7 +789,7 @@ start the included docker-compose.yml file with:
 
 ```console
 docker-compose build
-docker-compose up -d
+docker-compose up
 ```
 
 The above will build and run everything, daemonized, resulting in a running
@@ -797,4 +809,4 @@ docker-compose run web bundle exec rake
 
 The docker container uses PostgreSQL.
 
-[initializer]: https://github.com/thredded/thredded/blob/master/lib/generators/thredded/install/templates/initializer.rb
+[initializer]: https://github.com/thredded/thredded/blob/main/lib/generators/thredded/install/templates/initializer.rb

data/app/assets/javascripts/thredded/components/preview_area.es6

@@ -27,7 +27,9 @@
       }, 200, false);
 
       textarea.addEventListener('input', onChange, false);
-
+      if(textarea.value.trim() !== '') {
+        onChange();
+      }
       this.requestId = 0;
     }
 

data/app/commands/thredded/create_messageboard.rb

@@ -34,8 +34,8 @@ module Thredded
     end
 
     def first_topic_content
-      <<-MARKDOWN
-#{I18n.t('thredded.messageboard_first_topic.content', thredded_version: Thredded::VERSION)}
+      <<~MARKDOWN
+        #{I18n.t('thredded.messageboard_first_topic.content', thredded_version: Thredded::VERSION)}
       MARKDOWN
     end
   end

data/app/controllers/concerns/thredded/render_preview.rb

@@ -2,6 +2,12 @@
 
 module Thredded
   module RenderPreview
+    extend ActiveSupport::Concern
+
+    included do
+      skip_forgery_protection
+    end
+
     protected
 
     def render_preview

data/app/controllers/thredded/application_controller.rb

@@ -4,7 +4,11 @@ module Thredded
   class ApplicationController < ::ApplicationController # rubocop:disable Metrics/ClassLength
     layout :thredded_layout
     include ::Thredded::UrlsHelper
-    include Pundit
+    if defined?(Pundit::Authorization)
+      include Pundit::Authorization
+    else
+      include Pundit
+    end
 
     helper Thredded::Engine.helpers
     helper_method \
@@ -63,15 +67,6 @@ module Thredded
       @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)
-        redirect_to :back, args
-      rescue ActionController::RedirectBackError
-        redirect_to fallback_location, args
-      end
-    end
-
     # @param given [Hash]
     # @return [Boolean] whether the given params are a subset of the controller's {#params}.
     def params_match?(given = {})

data/app/controllers/thredded/topics_controller.rb

@@ -203,12 +203,6 @@ module Thredded
       @messageboard = topic.messageboard
     end
 
-    def topic_params
-      params
-        .require(:topic)
-        .permit(:title, :locked, :sticky, category_ids: [])
-    end
-
     def topic_params_for_update
       params
         .require(:topic)

data/app/forms/thredded/private_topic_form.rb

@@ -130,7 +130,7 @@ module Thredded
       end
     end
 
-    def parse_names(text) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
+    def parse_names(text) # rubocop:disable Metrics/MethodLength
       result = []
       current = +''
       in_name = in_quoted = false

data/app/helpers/thredded/application_helper.rb

@@ -92,7 +92,7 @@ module Thredded
     end
 
     def paginate(collection, args = {})
-      super(collection, args.reverse_merge(views_prefix: 'thredded'))
+      super(collection, **args.reverse_merge(views_prefix: 'thredded'))
     end
 
     # @param topic [BaseTopicView]
@@ -108,9 +108,9 @@ module Thredded
     # @param follow_reason ['manual', 'posted', 'mentioned', 'auto', nil]
     def topic_follow_reason_text(follow_reason)
       if follow_reason
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         # i18n-tasks-use t('thredded.topics.following.manual') t('thredded.topics.following.posted') t('thredded.topics.following.mentioned') t('thredded.topics.following.auto')
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
         t("thredded.topics.following.#{follow_reason}")
       else
         t('thredded.topics.not_following')

data/app/helpers/thredded/urls_helper.rb

@@ -54,7 +54,7 @@ module Thredded
     # @param user [Thredded.user_class] the current user
     # @return [String] path to the topic page with the post anchor.
     def post_path(post, user:, **params)
-      post_url(post, params.merge(user: user, only_path: true))
+      post_url(post, **params.merge(user: user, only_path: true))
     end
 
     # @param post [Post, PrivatePost]

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -11,13 +11,13 @@ module Thredded
     protected
 
     def mock_content(mention_users: [])
-      <<-MARKDOWN
-Hey #{mention_users.map { |u| "@#{u}" } * ', '}!
-All of the basic [Markdown](https://kramdown.gettalong.org/quickref.html) formatting is supported (powered by [Kramdown](https://kramdown.gettalong.org)).
+      <<~MARKDOWN
+        Hey #{mention_users.map { |u| "@#{u}" } * ', '}!
+        All of the basic [Markdown](https://kramdown.gettalong.org/quickref.html) formatting is supported (powered by [Kramdown](https://kramdown.gettalong.org)).
 
-Additionally, Markdown is extended to support the following:
+        Additionally, Markdown is extended to support the following:
 
-#{Thredded::FormattingDemoContent.parts.join("\n")}
+        #{Thredded::FormattingDemoContent.parts.join("\n")}
       MARKDOWN
     end
 

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

@@ -11,7 +11,7 @@ module Thredded
     end
 
     def include?(slug)
-      @words.include?(slug) || slug =~ PAGINATION_PATTERN
+      @words.include?(slug) || PAGINATION_PATTERN.match?(slug)
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Thredded
       delegate :human_name, to: :notifier, prefix: true
 
       def self.detect_or_default(prefs, notifier)
-        (prefs && prefs.find { |pref| pref.notifier_key == notifier.key }) || default(notifier)
+        (prefs&.find { |pref| pref.notifier_key == notifier.key }) || default(notifier)
       end
     end
 

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

@@ -23,12 +23,12 @@ module Thredded
         result = all
         owners_by_id = result.each_with_object({}) { |r, h| h[r.postable_id] = r.postable }
         next result if owners_by_id.empty?
-        preloader = ActiveRecord::Associations::Preloader.new.preload(
-          owners_by_id.values, :first_post,
-          unscoped.where(<<~SQL.delete("\n"))
-          #{posts_table_name}.created_at = (
-          SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
-        SQL
+        preloader = Thredded::Compat.association_preloader(
+          records: owners_by_id.values, associations: [:first_post],
+          scope: unscoped.where(<<~SQL.delete("\n"))
+            #{posts_table_name}.created_at = (
+            SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
+          SQL
         )
         preloader[0].preloaded_records.each do |post|
           topic = owners_by_id.delete(post.postable_id)
@@ -68,7 +68,7 @@ module Thredded
     def mark_as_unread(user)
       if previous_post.nil?
         read_state = postable.user_read_states.find_by(user_id: user.id)
-        read_state.destroy if read_state
+        read_state&.destroy
       else
         postable.user_read_states.touch!(user.id, previous_post, overwrite_newer: true)
       end
@@ -81,6 +81,7 @@ module Thredded
     protected
 
     def update_unread_posts_count
+      return if destroyed_by_association
       postable.user_read_states.update_post_counts!
     end
 

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

@@ -9,7 +9,7 @@ module Thredded
       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 } : {})
+                 optional: true
 
       scope :order_recently_posted_first, -> { order(last_post_at: :desc, id: :desc) }
       scope :on_page, ->(page_num) { page(page_num) }

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

@@ -29,7 +29,7 @@ module Thredded
     def calculate_post_counts
       relation = self.class.visible_posts_scope(user).where(postable_id: postable_id)
       unread_posts_count, read_posts_count =
-        Thredded::ArelCompat.pluck(relation, *self.class.post_counts_arel(read_at))[0]
+        relation.pluck(*self.class.post_counts_arel(read_at))[0]
       { unread_posts_count: unread_posts_count || 0, read_posts_count: read_posts_count || 0 }
     end
 
@@ -44,7 +44,7 @@ module Thredded
         selects << states[Arel.star] if !is_a?(ActiveRecord::Relation) || select_values.empty?
         selects += [
           Arel::Nodes::Case.new(states[:unread_posts_count].not_eq(0))
-            .when(Thredded::ArelCompat.true_value(self)).then(
+            .when(true).then(
               Arel::Nodes::Addition.new(
                 Thredded::ArelCompat.integer_division(self, states[:read_posts_count], posts_per_page), 1
               )
@@ -75,11 +75,11 @@ module Thredded
         [
           Arel::Nodes::Sum.new(
             [Arel::Nodes::Case.new(posts[:created_at].gt(read_at))
-               .when(Thredded::ArelCompat.true_value(self)).then(1).else(0)]
+               .when(true).then(1).else(0)]
           ).as('unread_posts_count'),
           Arel::Nodes::Sum.new(
             [Arel::Nodes::Case.new(posts[:created_at].gt(read_at))
-               .when(Thredded::ArelCompat.true_value(self)).then(0).else(1)]
+               .when(true).then(0).else(1)]
           ).as('read_posts_count')
         ]
       end
@@ -90,7 +90,7 @@ module Thredded
         posts = post_class.arel_table
         relation = joins(states.join(posts).on(states[:postable_id].eq(posts[:postable_id])).join_sources)
           .group(states[:id])
-        Thredded::ArelCompat.pluck(relation, states[:id], *post_counts_arel(states[:read_at], posts: posts))
+        relation.pluck(states[:id], *post_counts_arel(states[:read_at], posts: posts))
       end
     end
   end

data/app/models/thredded/messageboard.rb

@@ -39,7 +39,7 @@ module Thredded
     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 } : {})
+    belongs_to :last_topic, class_name: 'Thredded::Topic', optional: true
 
     has_many :user_details, through: :posts
     has_many :messageboard_users,
@@ -65,7 +65,7 @@ module Thredded
                inverse_of: :messageboards,
                foreign_key: :messageboard_group_id,
                class_name: 'Thredded::MessageboardGroup',
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :post_moderation_records, inverse_of: :messageboard, dependent: :delete_all
     scope :top_level_messageboards, -> { where(group: nil) }
@@ -142,8 +142,7 @@ module Thredded
         relation = joins(:topics).merge(topics_scope).joins(
           messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
         ).group(messageboards[:id])
-        Thredded::ArelCompat.pluck(
-          relation,
+        relation.pluck(
           :id,
           Arel::Nodes::Subtraction.new(topics[:id].count, read_states[:id].count)
         ).to_h

data/app/models/thredded/notifications_for_followed_topics.rb

@@ -7,7 +7,7 @@ module Thredded
                inverse_of: :thredded_notifications_for_followed_topics
     belongs_to :messageboard,
                # If messageboard is `nil`, these are the global preferences.
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :user_preference,
                primary_key: :user_id,
                foreign_key: :user_id,

data/app/models/thredded/post.rb

@@ -8,7 +8,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_posts,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :messageboard,
                counter_cache: true,
                inverse_of: :posts
@@ -21,7 +21,7 @@ module Thredded
                primary_key:   :user_id,
                foreign_key:   :user_id,
                counter_cache: true,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     has_many :moderation_records,
              class_name: 'Thredded::PostModerationRecord',
              dependent: :nullify
@@ -78,6 +78,7 @@ module Thredded
     end
 
     def update_parent_last_user_and_time_from_last_post
+      return if destroyed_by_association
       postable.update_last_user_and_time_from_last_post!
       messageboard.update_last_topic!
     end

data/app/models/thredded/post_moderation_record.rb

@@ -3,25 +3,24 @@
 module Thredded
   class PostModerationRecord < ActiveRecord::Base
     include Thredded::ModerationState
-    # Rails 4 doesn't support enum _prefix
-    enum previous_moderation_state: moderation_states, _prefix: :previous if Rails::VERSION::MAJOR >= 5
+    enum previous_moderation_state: moderation_states, _prefix: :previous
     validates :previous_moderation_state, presence: true
 
     scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
 
     belongs_to :messageboard, inverse_of: :post_moderation_records
-    validates :messageboard_id, presence: true unless Thredded.rails_gte_51?
+
     belongs_to :post,
                inverse_of: :moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :post_user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_post_moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :moderator,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_post_moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     validates_each :moderation_state do |record, attr, value|
       record.errors.add attr, "Post moderation_state is already #{value}" if record.previous_moderation_state == value
@@ -30,14 +29,16 @@ module Thredded
     scope :preload_first_topic_post, -> {
       posts_table_name = Thredded::Post.quoted_table_name
       result = all
-      owners_by_id = result.each_with_object({}) { |r, h| h[r.post.postable_id] = r.post.postable }
+      owners_by_id = result.each_with_object({}) do |r, h|
+        h[r.post.postable_id] = r.post.postable if r.post
+      end
       next result if owners_by_id.empty?
-      preloader = ActiveRecord::Associations::Preloader.new.preload(
-        owners_by_id.values, :first_post,
-        Thredded::Post.unscoped.where(<<~SQL.delete("\n"))
+      preloader = Thredded::Compat.association_preloader(
+        records: owners_by_id.values, associations: [:first_post],
+        scope: Thredded::Post.unscoped.where(<<~SQL.delete("\n"))
           #{posts_table_name}.created_at = (
           SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
-      SQL
+        SQL
       )
       preloader[0].preloaded_records.each do |post|
         topic = owners_by_id.delete(post.postable_id)
@@ -60,8 +61,6 @@ module Thredded
     # @param [Symbol, String] moderation_state
     # @return [Thredded::PostModerationRecord] the newly created persisted record
     def self.record!(moderator:, post:, previous_moderation_state:, moderation_state:)
-      # Rails 4 doesn't support enum _prefix
-      previous_moderation_state = moderation_states[previous_moderation_state.to_s] if Rails::VERSION::MAJOR < 5
       create!(
         previous_moderation_state: previous_moderation_state,
         moderation_state:          moderation_state,

data/app/models/thredded/private_post.rb

@@ -7,7 +7,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_posts,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :postable,
                class_name:    'Thredded::PrivateTopic',
                inverse_of:    :posts,
@@ -16,7 +16,7 @@ module Thredded
                inverse_of:  :private_posts,
                primary_key: :user_id,
                foreign_key: :user_id,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     after_commit :update_parent_last_user_and_timestamp, on: %i[create destroy]
     after_commit :notify_users, on: [:create]

data/app/models/thredded/private_topic.rb

@@ -15,12 +15,12 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :user_detail,
                primary_key:   :user_id,
                foreign_key:   :user_id,
                inverse_of:    :private_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :posts,
              class_name:  'Thredded::PrivatePost',
@@ -102,6 +102,8 @@ module Thredded
     end
 
     def ensure_user_in_private_users
+      # TODO: investigate performance of this. Seems to take a long time and be repeatedly called in tests
+      #       can we avoid callling this so often
       users << user if user.present? && !users.include?(user)
     end
 

data/app/models/thredded/topic.rb

@@ -37,7 +37,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     belongs_to :messageboard,
                counter_cache: true,
@@ -50,7 +50,7 @@ module Thredded
                foreign_key:   :user_id,
                inverse_of:    :topics,
                counter_cache: :topics_count,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :posts,
              autosave: true,

data/app/models/thredded/user_detail.rb

@@ -7,7 +7,7 @@ module Thredded
     belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_detail
     validates :user_id,
               uniqueness: { case_sensitive: true },
-              **(Thredded.rails_gte_51? ? {} : { presence: true })
+              presence: true
 
     with_options foreign_key: :user_id, primary_key: :user_id, inverse_of: :user_detail, dependent: :nullify do
       has_many :topics, class_name: 'Thredded::Topic'

data/app/models/thredded/user_extender.rb

@@ -30,7 +30,7 @@ module Thredded
                  class_name: 'Thredded::MessageboardNotificationsForFollowedTopics'
         has_many :thredded_notifications_for_private_topics, class_name: 'Thredded::NotificationsForPrivateTopics'
         has_many :thredded_post_notifications, class_name: 'Thredded::UserPostNotification'
-        has_many :thredded_private_users, class_name: 'Thredded::PrivateUser'
+        has_many :thredded_private_users, class_name: 'Thredded::PrivateUser', inverse_of: :user
         has_many :thredded_topic_read_states, class_name: 'Thredded::UserTopicReadState'
         has_many :thredded_private_topic_read_states, class_name: 'Thredded::UserPrivateTopicReadState'
         has_many :thredded_topic_follows, class_name: 'Thredded::UserTopicFollow'

data/app/view_models/thredded/post_view.rb

@@ -13,6 +13,7 @@ module Thredded
              :blocked?,
              :last_moderation_record,
              :cache_key,
+             :cache_version,
              :cache_key_with_version,
              to: :@post