thredded 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9af60f2898343a1404af723bb3dd314807876a
-  data.tar.gz: 7b6ac99f8869dc6722671e4c7491997815463cf7
+  metadata.gz: 7a1acf1b52acfeb414676b3d0b4c60cf9ea347af
+  data.tar.gz: cc19fecffc62460f24b8781ab0f4dc27bcf2db95
 SHA512:
-  metadata.gz: 28a32a71b5e598e03fe027194b96b7577be422cae39f4208b28719e991d740ec78e8580be3f03b202f28b1bf19bb825d936608ecf18968ac1ebe5462c6be0b94
-  data.tar.gz: fe05b0331bb1f3fa9d4ed33749dbe78e6e836f5ece7cc53dc864e3ff69792a308e403854a6eb516f21865e7734ca7833cafc009f006a2274f0fe8b9b21b72264
+  metadata.gz: 4085dd28328ce761c890fdf976d199cc3b6ac2aab5ca7da0ec32ab866ee95f8c8ae465f9f74c387dfdc13b4dbe201dca503820060c02e636472e35bd3548c4e6
+  data.tar.gz: 917c71e13f4b5bfd94d8567ff146c871f39201ed9727e0e1fe77b88bfdd19304cf3dbd25a5935015e03ae37982986828fbb100b5b88960afef9b5c3c6ae2f252

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# v0.6.3
+
+This is a minor bugfix release.
+
+## Fixed
+
+* Last topic post and last messageboard topic is kept in sync correctly with regards to moderation state changes.
+[#384](https://github.com/thredded/thredded/issues/384) [#387](https://github.com/thredded/thredded/issues/387)
+* Posts and private posts are now ordered by created at and not by ID, to avoid ordering issues in cases such as
+imported content. [#360](https://github.com/thredded/thredded/issues/360)
+* The global preferences URL now works when the Thredde URL helpers are included into another engine.
+[#355](https://github.com/thredded/thredded/pull/355)
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.6.2...v0.6.3.
+
 # v0.6.2
 
 This is a minor bugfix release.

data/README.md

@@ -44,7 +44,7 @@ application and not an engine like Thredded.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.6.1'
+gem 'thredded', '~> 0.6.3'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

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

@@ -39,6 +39,23 @@
   }
 }
 
+.thredded--button-light {
+  background-color: $thredded-button-light-background;
+  color: $thredded-button-light-color;
+
+  &:hover,
+  &:active,
+  &:focus {
+    background-color: $thredded-button-light-hover-background;
+    color: $thredded-button-light-hover-color;
+  }
+}
+
+.thredded--button-wide {
+  width: 100%;
+  text-align: center;
+}
+
 %thredded--buttons-list {
   text-align: center;
   a, .button_to {

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

@@ -63,8 +63,15 @@ $thredded-form-color: $thredded-text-color !default;
 // Buttons
 $thredded-button-background: $thredded-action-color !default;
 $thredded-button-color: #fff !default;
-$thredded-button-hover-color: $thredded-button-color !default;
 $thredded-button-hover-background: darken($thredded-button-background, 15%) !default;
+$thredded-button-hover-color: $thredded-button-color !default;
+
+$thredded-button-light-background: lighten($thredded-button-background, 35%) !default;
+$thredded-button-light-color: darken($thredded-button-background, 15%) !default;
+$thredded-button-light-hover-background: darken($thredded-button-light-background, 15%) !default;
+$thredded-button-light-hover-color: darken($thredded-button-light-color, 15%) !default;
+
+
 $thredded-button-border-radius: 3px !default;
 $thredded-button-font-family: $thredded-base-font-family !default;
 $thredded-button-font-size: $thredded-font-size-small !default;

data/app/commands/thredded/mark_all_read.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Thredded
+  class MarkAllRead
+    def self.run(user)
+      unread_topics = Thredded::PrivateTopic.unread(user)
+      return if unread_topics.empty?
+
+      unread_topics.each do |topic|
+        last_post = topic.posts.order_oldest_first.last
+        total_pages = topic.posts.page(1).total_pages
+
+        UserPrivateTopicReadState.touch!(
+          user.id,
+          topic.id,
+          last_post,
+          total_pages
+        )
+      end
+    end
+  end
+end

data/app/controllers/thredded/messageboard_groups_controller.rb

@@ -12,7 +12,7 @@ module Thredded
       authorize @messageboard_group, :create?
 
       if @messageboard_group.save
-        redirect_to root_path
+        redirect_to root_path, notice: I18n.t('thredded.messageboard_group.created_notice')
       else
         render action: :new
       end

data/app/controllers/thredded/moderation_controller.rb

@@ -68,7 +68,7 @@ module Thredded
         .order_newest_first
         .includes(:postable)
         .page(current_page)
-      @posts = PostsPageView.new(current_user, posts_scope)
+      @posts = PostsPageView.new(thredded_current_user, posts_scope)
     end
 
     def moderate_user

data/app/controllers/thredded/read_states_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Thredded
+  class ReadStatesController < Thredded::ApplicationController
+    before_action :thredded_require_login!
+
+    def update
+      MarkAllRead.run(thredded_current_user) if signed_in?
+
+      redirect_to request.referer
+    end
+  end
+end

data/app/forms/thredded/topic_form.rb

@@ -47,7 +47,6 @@ module Thredded
         locked: locked,
         sticky: sticky,
         user: non_null_user,
-        last_user: non_null_user,
         categories: topic_categories,
       )
     end

data/app/helpers/thredded/urls_helper.rb

@@ -83,7 +83,7 @@ module Thredded
       if messageboard.try(:persisted?)
         edit_messageboard_preferences_url(messageboard, params)
       else
-        super(params)
+        edit_global_preferences_url(params)
       end
     end
 

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

@@ -13,18 +13,30 @@ module Thredded
 
       validates :content, presence: true
 
-      scope :order_oldest_first, -> { order(id: :asc) }
-      scope :order_newest_first, -> { order(id: :desc) }
+      scope :order_oldest_first, -> { order(created_at: :asc, id: :asc) }
+      scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
+
+      before_validation :ensure_user_detail, on: :create
     end
 
     def avatar_url
       Thredded.avatar_url.call(user)
     end
 
+    def calculate_page(postable_posts, per_page)
+      1 + postable_posts.where(postable_posts.arel_table[:created_at].lt(created_at)).count / per_page
+    end
+
     # @param view_context [Object] the context of the rendering view.
     # @return [String] formatted and sanitized html-safe post content.
     def filtered_content(view_context, users_provider: -> (names) { readers_from_user_names(names) })
       Thredded::ContentFormatter.new(view_context, users_provider: users_provider).format_content(content)
     end
+
+    private
+
+    def ensure_user_detail
+      build_user_detail if user && !user_detail
+    end
   end
 end

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

@@ -10,7 +10,7 @@ module Thredded
                  foreign_key: 'last_user_id'
 
       scope :order_recently_updated_first, -> { order(updated_at: :desc, id: :desc) }
-      scope :on_page, -> (page_num) { page(page_num).per(30) }
+      scope :on_page, -> (page_num) { page(page_num) }
 
       validates :hash_id, presence: true, uniqueness: true
       validates :posts_count, numericality: true
@@ -20,6 +20,8 @@ module Thredded
       end
 
       delegate :name, :name=, :email, :email=, to: :user, prefix: true
+
+      before_validation :ensure_user_detail, on: :create
     end
 
     def user
@@ -34,6 +36,12 @@ module Thredded
       !public?
     end
 
+    private
+
+    def ensure_user_detail
+      build_user_detail if user && !user_detail
+    end
+
     module ClassMethods
       # @param user [Thredded.user_class]
       # @return [ActiveRecord::Relation]

data/app/models/thredded/messageboard.rb

@@ -64,5 +64,12 @@ module Thredded
         [:name, '-board']
       ]
     end
+
+    def update_last_topic!
+      return if destroyed?
+      update_column(
+        :last_topic_id, topics.order_recently_updated_first.moderation_state_visible_to_all.select(:id).first.try(:id)
+      )
+    end
   end
 end

data/app/models/thredded/post.rb

@@ -26,24 +26,22 @@ module Thredded
 
     validates :messageboard_id, presence: true
 
-    after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
+    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_if_moderation_state_changed, on: :update
+
     after_commit :auto_follow_and_notify, on: [:create, :update]
 
     # @param [Integer] per_page
     # @param [Thredded.user_class] user
     def page(per_page: self.class.default_per_page, user:)
       readable_posts = PostPolicy::Scope.new(user, postable.posts).resolve
-      1 + readable_posts.where(postable.posts.arel_table[:id].lt(id)).count / per_page
+      calculate_page(readable_posts, per_page)
     end
 
     def private_topic_post?
       false
     end
 
-    def user_detail
-      super || build_user_detail
-    end
-
     # @return [ActiveRecord::Relation<Thredded.user_class>] users from the list of user names that can read this post.
     def readers_from_user_names(user_names)
       DbTextSearch::CaseInsensitive
@@ -61,18 +59,13 @@ module Thredded
       AutoFollowAndNotifyJob.perform_later(id)
     end
 
-    def update_parent_last_user_and_timestamp
-      return if postable.destroyed?
-      last_post = if destroyed? || !moderation_state_visible_to_all?
-                    postable.posts.order_oldest_first.moderation_state_visible_to_all.select(:user_id, :updated_at).last
-                  else
-                    self
-                  end
-      if last_post
-        postable.update_columns(last_user_id: last_post.user_id, updated_at: last_post.updated_at)
-      else
-        postable.update_columns(last_user_id: nil, updated_at: postable.created_at)
-      end
+    def update_parent_last_user_and_time_from_last_post
+      postable.update_last_user_and_time_from_last_post!
+      messageboard.update_last_topic!
+    end
+
+    def update_parent_last_user_and_time_from_last_post_if_moderation_state_changed
+      update_parent_last_user_and_time_from_last_post if previous_changes.include?('moderation_state')
     end
   end
 end

data/app/models/thredded/private_post.rb

@@ -20,17 +20,13 @@ module Thredded
 
     # @param [Integer] per_page
     def page(per_page: self.class.default_per_page)
-      1 + postable.posts.where(postable.posts.arel_table[:id].lt(id)).count / per_page
+      calculate_page(postable.posts, per_page)
     end
 
     def private_topic_post?
       true
     end
 
-    def user_detail
-      super || build_user_detail
-    end
-
     # @return [ActiveRecord::Relation<Thredded.user_class>] users from the list of user names that can read this post.
     def readers_from_user_names(user_names)
       DbTextSearch::CaseInsensitive

data/app/models/thredded/private_topic.rb

@@ -58,10 +58,6 @@ module Thredded
       false
     end
 
-    def user_detail
-      super || build_user_detail
-    end
-
     def should_generate_new_friendly_id?
       title_changed?
     end

data/app/models/thredded/topic.rb

@@ -15,6 +15,12 @@ module Thredded
 
     scope :order_sticky_first, -> { order(sticky: :desc) }
 
+    scope :followed_by, lambda { |user|
+      joins(:user_follows)
+        .where(thredded_user_topic_follows: { user_id: user.id })
+    }
+    scope :unread_followed_by, ->(user) { followed_by(user).unread(user) }
+
     extend FriendlyId
     friendly_id :slug_candidates,
                 use:            [:history, :reserved, :scoped],
@@ -46,6 +52,9 @@ module Thredded
     has_one :first_post, -> { order_oldest_first },
             class_name:  'Thredded::Post',
             foreign_key: :postable_id
+    has_one :last_post, -> { order_newest_first },
+            class_name:  'Thredded::Post',
+            foreign_key: :postable_id
 
     has_many :topic_categories, dependent: :destroy
     has_many :categories, through: :topic_categories
@@ -63,7 +72,8 @@ module Thredded
              source: :user,
              through: :user_follows
 
-    after_commit :update_messageboard_last_topic, on: [:create, :destroy]
+    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') }
 
     def self.find_by_slug!(slug)
       friendly.find(slug)
@@ -101,10 +111,6 @@ module Thredded
       true
     end
 
-    def user_detail
-      super || build_user_detail
-    end
-
     def should_generate_new_friendly_id?
       title_changed?
     end
@@ -114,6 +120,20 @@ module Thredded
       first_post.try(:last_moderation_record)
     end
 
+    def update_last_user_and_time_from_last_post!
+      return if destroyed?
+      scope = posts.order_newest_first
+      scope = scope.moderation_state_visible_to_all if moderation_state_visible_to_all?
+      last_post = scope.select(:user_id, :created_at).first
+      if last_post
+        update_columns(last_user_id: last_post.user_id, updated_at: last_post.created_at)
+      else
+        # Either a visible topic is left with no visible posts, or an invisible topic is left with no posts at all.
+        # This shouldn't happen in stock Thredded.
+        update_columns(last_user_id: nil, updated_at: created_at)
+      end
+    end
+
     private
 
     def slug_candidates
@@ -124,13 +144,7 @@ module Thredded
     end
 
     def update_messageboard_last_topic
-      return if messageboard.destroyed?
-      last_topic = if destroyed? || !moderation_state_visible_to_all?
-                     messageboard.topics.order_recently_updated_first.moderation_state_visible_to_all.select(:id).first
-                   else
-                     self
-                   end
-      messageboard.update_columns(last_topic_id: last_topic.try(:id))
+      messageboard.update_last_topic!
     end
   end
 end

data/app/view_models/thredded/topic_view.rb

@@ -3,6 +3,7 @@ module Thredded
   # A view model for Topic.
   class TopicView < BaseTopicView
     delegate :categories, :id, :blocked?, :last_moderation_record,
+             :last_post,
              to: :@topic
 
     # @param topic [TopicCommon]

data/app/view_models/thredded/topics_page_view.rb

@@ -14,10 +14,11 @@ module Thredded
 
     # @param user [Thredded.user_class] the user who is viewing the posts page
     # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>]
-    def initialize(user, topics_page_scope)
+    # @param topic_view_class [Class] view_model for topic instances
+    def initialize(user, topics_page_scope, topic_view_class: TopicView)
       @topics_page_scope = topics_page_scope
       @topic_views = @topics_page_scope.with_read_and_follow_states(user).map do |(topic, read_state, follow)|
-        TopicView.new(topic, read_state, follow, Pundit.policy!(user, topic))
+        topic_view_class.new(topic, read_state, follow, Pundit.policy!(user, topic))
       end
     end
   end

data/app/views/thredded/preferences/_form.html.erb

@@ -1,7 +1,7 @@
 <%= form_for(
         preferences,
         method: :patch,
-        url:    (preferences.messageboard ? messageboard_preferences_path(preferences.messageboard) : preferences_path),
+        url:    (preferences.messageboard ? messageboard_preferences_path(preferences.messageboard) : global_preferences_path),
         html:   {
             class:                                'thredded--form thredded--notification-preferences-form',
             'data-thredded-user-preferences-form' => true

data/app/views/thredded/private_topic_mailer/message_notification.html.erb

@@ -1,5 +1,5 @@
 <blockquote><%= @topic.posts.first.filtered_content(self) %></blockquote>
-
+<%                           # as this is only sent on first post, doesn't need to define order %>
 <hr />
 
 <p>

data/app/views/thredded/private_topic_mailer/message_notification.text.erb

@@ -1,5 +1,5 @@
 <%= @topic.posts.first.content %>
-
+<%               # as this is only sent on first post, doesn't need to define order %>
 ---
 
 This email was sent to you because <%= @topic.user %>