thredded 0.16.11 → 0.16.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741784943db6fb342733ffb31a72839b04f50c11f73800ac6ef12e4a69eb61a8
-  data.tar.gz: de850a7928e05f2d97990b918fe5fddf684859087fda119e6511f344ea385fc8
+  metadata.gz: dd9dbf548a2ae13d2c77b2a49e4022af13b17e5df084dc22baf370e37d7b1a2f
+  data.tar.gz: 6f21adfcf7f040ab397637f03f47df3c4f9f15d3956dfd4fb3a2a09b9a871ddd
 SHA512:
-  metadata.gz: bf23cc3d905ba1ab460bab9a0fd40babfb4bdccac806bc299a3100cf9550b7d80b5d0c948cfe7493997fef773a3260cca3449ff46360cd3ff66c2a63dd3c03a6
-  data.tar.gz: 155e6a9079c65c33008d91a9bf5def441dd7f5d78021d6656ee2d2625248e6d0bf01f773107b871000b917e9fbd39d5a0bc653f18953807d37a4a8779c223af7
+  metadata.gz: 80692ab8668d1fdbcc60309774f2dcab3e8a6893b1a78892e9507ad4a9f70d9d91d174ce9277058622faba6d562c3187f4cf6dfa2aec92c97a9863a32b858b4f
+  data.tar.gz: dd5c3253a6df6f69512eb5acd778beb0ef7370be4b53b30fb03c865b6669af3e7e5217cc46e5feaf4695c1354cd9b748743b05f66edc94eff5c55a8ef810b886

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.16.11'
+gem 'thredded', '~> 0.16.12'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/controllers/thredded/moderation_controller.rb

@@ -19,6 +19,8 @@ module Thredded
       @post_moderation_records = accessible_post_moderation_records
         .order(created_at: :desc)
         .send(Kaminari.config.page_method_name, current_page)
+        .preload(:messageboard, :post_user, :moderator, post: :postable)
+        .preload_first_topic_post
     end
 
     def activity

data/app/helpers/thredded/moderation_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Thredded
+  module ModerationHelper
+    include ::Thredded::RenderHelper
+
+    # @param records [Array<Thredded::PostModerationRecord>]
+    def render_post_moderation_records(records)
+      records_with_post_contents = render_collection_to_strings_with_cache(
+        partial: 'thredded/moderation/post_moderation_record_content',
+        collection: records, as: :post_moderation_record, expires_in: 1.week,
+        locals: {
+          options: {
+            users_provider: ::Thredded::UsersProviderWithCache.new
+          }
+        }
+      )
+      render partial: 'thredded/moderation/post_moderation_record',
+             collection: records_with_post_contents,
+             as: :record_and_post_content
+    end
+  end
+end

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

@@ -21,13 +21,20 @@ module Thredded
       scope :preload_first_topic_post, -> {
         posts_table_name = quoted_table_name
         result = all
-        ActiveRecord::Associations::Preloader.new.preload(
-          result.map(&:postable), :first_post,
+        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[0].preloaded_records.each do |post|
+          topic = owners_by_id.delete(post.postable_id)
+          next unless topic
+          topic.association(:first_post).target = post
+        end
         result
       }
 

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

@@ -14,7 +14,9 @@ module Thredded
       scope :order_recently_posted_first, -> { order(last_post_at: :desc, id: :desc) }
       scope :on_page, ->(page_num) { page(page_num) }
 
-      validates :hash_id, presence: true, uniqueness: true
+      validates :hash_id,
+                presence: true,
+                uniqueness: { case_sensitive: true }
       validates :posts_count, numericality: true
 
       validates :title, presence: true, length: { within: Thredded.topic_title_length_range }
@@ -53,9 +55,19 @@ module Thredded
         topics = arel_table
         reads_class = reflect_on_association(:user_read_states).klass
         reads = reads_class.arel_table
-        joins(topics.join(reads, Arel::Nodes::OuterJoin)
-                .on(topics[:id].eq(reads[:postable_id]).and(reads[:user_id].eq(user.id))).join_sources)
-          .merge(reads_class.where(reads[:id].eq(nil).or(reads[:unread_posts_count].not_eq(0))))
+
+        joins_reads =
+          topics.outer_join(reads)
+            .on(topics[:id].eq(reads[:postable_id]).and(reads[:user_id].eq(user.id))).join_sources
+
+        unread_scope = reads_class.where(reads[:id].eq(nil).or(reads[:unread_posts_count].not_eq(0)))
+
+        # Work around https://github.com/rails/rails/issues/36761
+        if Thredded.rails_gte_600_rc_2?
+          merge(unread_scope).joins(joins_reads)
+        else
+          joins(joins_reads).merge(unread_scope)
+        end
       end
 
       private

data/app/models/thredded/messageboard.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  class Messageboard < ActiveRecord::Base
+  class Messageboard < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     extend FriendlyId
     friendly_id :slug_candidates,
                 use: %i[slugged reserved],
@@ -21,7 +21,10 @@ module Thredded
                   ]
                 )
 
-    validates :name, uniqueness: true, length: { within: Thredded.messageboard_name_length_range }, presence: true
+    validates :name,
+              uniqueness: { case_sensitive: false },
+              length: { within: Thredded.messageboard_name_length_range },
+              presence: true
     validates :topics_count, numericality: true
     validates :position, presence: true, on: :update
     before_save :ensure_position
@@ -128,14 +131,28 @@ module Thredded
         messageboards = arel_table
         read_states = Thredded::UserTopicReadState.arel_table
         topics = topics_scope.arel_table
-        joins(:topics).merge(topics_scope).joins(
-          messageboards.outer_join(read_states).on(
-            messageboards[:id].eq(read_states[:messageboard_id])
-              .and(read_states[:postable_id].eq(topics[:id]))
-              .and(read_states[:user_id].eq(user.id))
-              .and(read_states[:unread_posts_count].eq(0))
-          ).join_sources
-        ).group(messageboards[:id]).pluck(
+
+        read_states_join_cond =
+          messageboards[:id].eq(read_states[:messageboard_id])
+            .and(read_states[:postable_id].eq(topics[:id]))
+            .and(read_states[:user_id].eq(user.id))
+            .and(read_states[:unread_posts_count].eq(0))
+
+        scope =
+          # Work around https://github.com/rails/rails/issues/36761
+          if Thredded.rails_gte_600_rc_2?
+            merge(topics_scope).joins(
+              messageboards.join(topics)
+                .on(topics[:messageboard_id].eq(messageboards[:id]))
+                .outer_join(read_states).on(read_states_join_cond).join_sources
+            )
+          else
+            joins(:topics).merge(topics_scope).joins(
+              messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
+            )
+          end
+
+        scope.group(messageboards[:id]).pluck(
           :id,
           Arel::Nodes::Subtraction.new(topics[:id].count, read_states[:id].count)
         ).to_h

data/app/models/thredded/messageboard_group.rb

@@ -8,7 +8,9 @@ module Thredded
              dependent: :nullify
 
     scope :ordered, -> { order(position: :asc, id: :asc) }
-    validates :name, presence: true, uniqueness: true
+    validates :name,
+              presence: true,
+              uniqueness: { case_sensitive: false }
     validates :position, presence: true, on: :update
     before_save :ensure_position
 

data/app/models/thredded/post_moderation_record.rb

@@ -27,8 +27,33 @@ module Thredded
       record.errors.add attr, "Post moderation_state is already #{value}" if record.previous_moderation_state == value
     end
 
+    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 }
+      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"))
+          #{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)
+        next unless topic
+        topic.association(:first_post).target = post
+      end
+      result
+    }
+
     paginates_per Thredded.posts_per_page
 
+    # @return [ActiveRecord::Relation<Thredded.user_class>] users that can read the moderated post.
+    def post_readers
+      Thredded.user_class.thredded_messageboards_readers([messageboard])
+    end
+
     # @param [Thredded.user_class] moderator
     # @param [Thredded::Post] post
     # @param [Symbol, String] previous_moderation_state

data/app/models/thredded/user_detail.rb

@@ -5,7 +5,9 @@ module Thredded
     include Thredded::ModerationState
 
     belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_detail
-    validates :user_id, uniqueness: true, **(Thredded.rails_gte_51? ? {} : { presence: true })
+    validates :user_id,
+              uniqueness: { case_sensitive: true },
+              **(Thredded.rails_gte_51? ? {} : { 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/views/thredded/moderation/_post_moderation_record.html.erb

@@ -1,5 +1,9 @@
 <%
-  record = post_moderation_record
+  if local_assigns.key?(:record_and_post_content)
+    record, post_content = record_and_post_content
+  else
+    record = post_moderation_record
+  end
   post = record.post
   if post
     post_view = Thredded::PostView.new(post, policy(post))
@@ -34,12 +38,14 @@
       <% end %>
     <% end %>
     <% if post %>
-      <%= render 'thredded/posts_common/header_with_user_and_topic', post: post_view, post_user_link: post_user_link %>
+      <%= render 'thredded/posts_common/header_with_user_and_topic',
+                 post: post_view, user: record.post_user, post_user_link: post_user_link %>
     <% else %>
       <header><h2 class="thredded--post--user"><%= post_user_link %></h2></header>
     <% end %>
     <div class="thredded--post--content">
-      <%= Thredded::ContentFormatter.new(self).format_content(record.post_content) %>
+      <%= post_content ||
+              render('thredded/moderation/post_moderation_record_content', post_moderation_record: record) %>
     </div>
   </article>
   <%= render 'post_moderation_actions', post: post if post %>

data/app/views/thredded/moderation/_post_moderation_record_content.html.erb

@@ -0,0 +1,3 @@
+<%= Thredded::ContentFormatter.
+    new(self, (local_assigns[:options] || {}).update(users_provider_scope: post_moderation_record.post_readers)).
+    format_content(post_moderation_record.post_content) %>

data/app/views/thredded/moderation/activity.html.erb

@@ -7,7 +7,7 @@
     <h1><%= t 'thredded.recent_activity' %></h1>
     <% if @last_moderated_record %>
       <div class="thredded--moderated-notice">
-        <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
+        <%= render_post_moderation_records([@last_moderated_record]) %>
       </div>
     <% end %>
     <% if @posts.present? %>

data/app/views/thredded/moderation/history.html.erb

@@ -6,7 +6,7 @@
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <% if @post_moderation_records.present? %>
-      <%= render partial: 'post_moderation_record', collection: @post_moderation_records %>
+      <%= render_post_moderation_records @post_moderation_records %>
       <%= paginate @post_moderation_records %>
     <% end %>
   </section>

data/app/views/thredded/moderation/pending.html.erb

@@ -6,7 +6,7 @@
   <section class="thredded--main-section">
     <% if @last_moderated_record %>
       <div class="thredded--moderated-notice">
-        <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
+        <%= render_post_moderation_records([@last_moderated_record]) %>
       </div>
     <% end %>
     <% if @posts.present? %>

data/app/views/thredded/posts_common/_header_with_user_and_topic.html.erb

@@ -1,9 +1,11 @@
 <%# @param post [Thredded::PostView] %>
+<%# @param user [Thredded.user_class] optional %>
 <%# @param post_user_link [String] optional %>
 <% topic = post.to_model.postable %>
-<% post_user_link ||= user_link(post.user) %>
+<% user ||= post.user %>
+<% post_user_link ||= user_link(user) %>
 <header>
-  <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
+  <%= image_tag Thredded.avatar_url.call(user), class: 'thredded--post--avatar' if user %>
   <h2 class="thredded--post--user-and-topic">
     <%=
       topic_link = link_to(topic.title, post.permalink_path)

data/lib/thredded.rb

@@ -251,6 +251,13 @@ module Thredded # rubocop:disable Metrics/ModuleLength
       @rails_gte_51
     end
 
+    # @api private
+    # Mainly to work around https://github.com/rails/rails/issues/36761
+    def rails_gte_600_rc_2?
+      @rails_gte_600_rc_2 = (Rails.gem_version >= Gem::Version.new('6.0.0.rc2')) if @rails_gte_600_rc_2.nil?
+      @rails_gte_600_rc_2
+    end
+
     # @api private
     def rails_supports_csp_nonce?
       @rails_supports_csp_nonce = (Rails.gem_version >= Gem::Version.new('5.2.0')) if @rails_supports_csp_nonce.nil?

data/lib/thredded/db_tools.rb

@@ -9,13 +9,14 @@ module Thredded
       def migrate(paths:, quiet:, &filter)
         verbose_was = ActiveRecord::Migration.verbose
         ActiveRecord::Migration.verbose = !quiet
-        migrate = -> {
-          if Rails::VERSION::STRING >= '5.2'
-            ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter)
+        migrate =
+          if Rails.gem_version >= Gem::Version.new('6.0.0.rc2')
+            -> { ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration).migrate(nil, &filter) }
+          elsif Rails::VERSION::STRING >= '5.2'
+            -> { ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter) }
           else
-            ActiveRecord::Migrator.migrate(paths, &filter)
+            -> { ActiveRecord::Migrator.migrate(paths, &filter) }
           end
-        }
         if quiet
           silence_active_record(&migrate)
         else

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.16.11'
+  VERSION = '0.16.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.11
+  version: 0.16.12
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -130,6 +130,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,6 +140,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: rb-gravatar
   requirement: !ruby/object:Gem::Requirement
@@ -751,6 +757,7 @@ files:
 - app/forms/thredded/user_preferences_form.rb
 - app/helpers/thredded/application_helper.rb
 - app/helpers/thredded/icon_helper.rb
+- app/helpers/thredded/moderation_helper.rb
 - app/helpers/thredded/nav_helper.rb
 - app/helpers/thredded/render_helper.rb
 - app/helpers/thredded/urls_helper.rb
@@ -854,6 +861,7 @@ files:
 - app/views/thredded/moderation/_post.html.erb
 - app/views/thredded/moderation/_post_moderation_actions.html.erb
 - app/views/thredded/moderation/_post_moderation_record.html.erb
+- app/views/thredded/moderation/_post_moderation_record_content.html.erb
 - app/views/thredded/moderation/_user_moderation_state.html.erb
 - app/views/thredded/moderation/_user_post.html.erb
 - app/views/thredded/moderation/_users_search_form.html.erb