thredded 0.16.5 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1addbc714333793d7418de6373463dbd991352f8c4f9dc3382f88f4f38fb6d02
-  data.tar.gz: 86115c68b177a7290e6587e4b12f541cb298759956b0f9de001d6b7a699ed3c7
+  metadata.gz: 903f97feaa1caa7429abcaddaeb75baa31065081cdef9beb1b080b9231961be0
+  data.tar.gz: 7b9bf56abfddf2da79c002bf623c6d5c8e3fdd124a45bfb9e684b7ea1f88c2e3
 SHA512:
-  metadata.gz: eaf9db260983b5ac06e476ba642a44a162ae0c521a4fa87d5d79d346fc2c06a73d69052c9a25ee8658936d115cd57044627f9fdcf862577ade2e7dd029ede6a0
-  data.tar.gz: 50948e3ebd7f3570fc5517fbb41656ca40bc4acd435753c7f268f45fd0a017dc9f7238a74292a2c651292a71130c7bbb2e78ba3e4306dfd81f5d5d2471333075
+  metadata.gz: e0d77ddf04ae512ac702cdb8ce062649800095e51e3ed92d4a5bc1f9d0aa042abde28abea3df2a5c9f87f73171e3715bb75c6ecb8265fa1587a7b0672c9fb46e
+  data.tar.gz: 5013b97d8f96962a6194cfd1377b3b04787f1400d6ec1481737f9fd263c6c9aafcb5e72776ed82df020d3f2a22c6ca61d841f26fafa74337f1604254b6b3f1e7

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

data/app/controllers/thredded/moderation_controller.rb

@@ -8,11 +8,9 @@ module Thredded
     def pending
       @posts = Thredded::PostsPageView.new(
         thredded_current_user,
-        moderatable_posts
-          .pending_moderation
-          .order_oldest_first
-          .preload(:user, :postable)
+        preload_posts_for_moderation(moderatable_posts.pending_moderation).order_newest_first
           .send(Kaminari.config.page_method_name, current_page)
+          .preload_first_topic_post
       )
       maybe_set_last_moderated_record_flash
     end
@@ -26,10 +24,9 @@ module Thredded
     def activity
       @posts = Thredded::PostsPageView.new(
         thredded_current_user,
-        moderatable_posts
-          .order_newest_first
-          .preload(:user, :postable, :messageboard)
+        preload_posts_for_moderation(moderatable_posts).order_oldest_first
           .send(Kaminari.config.page_method_name, current_page)
+          .preload_first_topic_post
       )
       maybe_set_last_moderated_record_flash
     end
@@ -114,5 +111,9 @@ module Thredded
     def current_page
       (params[:page] || 1).to_i
     end
+
+    def preload_posts_for_moderation(posts)
+      posts.includes(:user, :messageboard, :postable)
+    end
   end
 end

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

@@ -18,6 +18,18 @@ module Thredded
       scope :order_oldest_first, -> { order(created_at: :asc, id: :asc) }
       scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
 
+      scope :preload_first_topic_post, -> {
+        posts_table_name = quoted_table_name
+        ActiveRecord::Associations::Preloader.new.preload(
+          map(&:postable), :first_post,
+          Thredded::Post.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
+        )
+        self
+      }
+
       before_validation :ensure_user_detail, on: :create
 
       after_commit :update_unread_posts_count, on: %i[create destroy]

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-27 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -331,14 +331,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement