thredded 0.14.4 → 0.15.1

data/app/forms/thredded/private_post_form.rb

@@ -11,7 +11,7 @@ module Thredded
 
     # @param user [Thredded.user_class]
     # @param topic [PrivateTopic]
-    # @param post [Post]
+    # @param post [PrivatePost]
     # @param post_params [Hash]
     def initialize(user:, topic:, post: nil, post_params: {})
       @topic = topic
@@ -43,7 +43,9 @@ module Thredded
 
     def save
       return false unless @post.valid?
+      was_persisted = @post.persisted?
       @post.save!
+      Thredded::UserPrivateTopicReadState.touch!(@post.user.id, @topic.id, @post) unless was_persisted
       true
     end
   end

data/app/forms/thredded/private_topic_form.rb

@@ -5,6 +5,7 @@ module Thredded
     include ActiveModel::Model
 
     delegate :id,
+             :title_was,
              to: :private_topic
 
     attr_accessor \

data/app/jobs/thredded/activity_updater_job.rb

@@ -7,15 +7,25 @@ module Thredded
     def perform(user_id, messageboard_id)
       now = Time.current
 
-      user_detail = Thredded::UserDetail.find_or_initialize_by(user_id: user_id)
-      user_detail.update!(last_seen_at: now)
+      begin
+        user_detail = Thredded::UserDetail.find_or_initialize_by(user_id: user_id)
+        user_detail.update!(last_seen_at: now)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
+      end
 
-      Thredded::MessageboardUser
-        .find_or_initialize_by(
-          thredded_messageboard_id: messageboard_id,
-          thredded_user_detail_id: user_detail.id
-        )
-        .update!(last_seen_at: now)
+      begin
+        Thredded::MessageboardUser
+          .find_or_initialize_by(
+            thredded_messageboard_id: messageboard_id,
+            thredded_user_detail_id: user_detail.id
+          )
+          .update!(last_seen_at: now)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
+      end
     end
   end
 end

data/app/jobs/thredded/auto_follow_and_notify_job.rb

@@ -5,7 +5,8 @@ module Thredded
     queue_as :default
 
     def perform(post_id)
-      post = Thredded::Post.find(post_id)
+      post = Thredded::Post.find_by(id: post_id)
+      return if post.nil? || post.postable.nil?
 
       Thredded::AutofollowUsers.new(post).run
       Thredded::NotifyFollowingUsers.new(post).run

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

@@ -50,16 +50,15 @@ module Thredded
     # Marks all the posts from the given one as unread for the given user
     # @param user [Thredded.user_class]
     # @param page [Integer]
-    def mark_as_unread(user, page)
+    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
       else
         read_state = postable.user_read_states.create_with(
-          read_at: previous_post.created_at,
-          page: page
+          read_at: previous_post.created_at
         ).find_or_create_by(user_id: user.id)
-        read_state.update_columns(read_at: previous_post.created_at, page: page)
+        read_state.update_columns(read_at: previous_post.created_at)
       end
     end
 

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

@@ -17,6 +17,8 @@ module Thredded
       validates :hash_id, presence: true, uniqueness: true
       validates :posts_count, numericality: true
 
+      validates :title, presence: true, length: { within: Thredded.topic_title_length_range }
+
       before_validation do
         self.hash_id = SecureRandom.hex(10) if hash_id.nil?
       end
@@ -56,6 +58,10 @@ module Thredded
           .merge(reads_class.where(reads[:id].eq(nil).or(reads[:read_at].lt(topics[:last_post_at]))))
       end
 
+      def post_class
+        reflect_on_association(:posts).klass
+      end
+
       private
 
       # @param user [Thredded.user_class]
@@ -63,6 +69,7 @@ module Thredded
       def read_states_by_postable_hash(user)
         read_states = reflect_on_association(:user_read_states).klass
           .where(user_id: user.id, postable_id: current_scope.map(&:id))
+          .with_page_info(posts_scope: Pundit.policy_scope(user, post_class.all))
         Thredded::TopicCommon::CachingHash.from_relation(read_states)
       end
 

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

@@ -6,6 +6,8 @@ module Thredded
     included do
       extend ClassMethods
       validates :user_id, uniqueness: { scope: :postable_id }
+      attribute :first_unread_post_page, ActiveRecord::Type::Integer.new
+      attribute :last_read_post_page, ActiveRecord::Type::Integer.new
     end
 
     # @return [Boolean]
@@ -23,20 +25,75 @@ module Thredded
       # @param user_id [Integer]
       # @param topic_id [Integer]
       # @param post [Thredded::PostCommon]
-      # @param post_page [Integer]
-      def touch!(user_id, topic_id, post, post_page)
+      def touch!(user_id, topic_id, post)
         # TODO: Switch to upsert once Travis supports PostgreSQL 9.5.
         # Travis issue: https://github.com/travis-ci/travis-ci/issues/4264
         # Upsert gem: https://github.com/seamusabshere/upsert
         state = find_or_initialize_by(user_id: user_id, postable_id: topic_id)
-        fail ArgumentError, "expected post_page >= 1, given #{post_page.inspect}" if post_page < 1
         return unless !state.read_at? || state.read_at < post.created_at
-        state.update!(read_at: post.created_at, page: post_page)
+        state.update!(read_at: post.created_at)
       end
 
       def read_on_first_post!(user, topic)
-        create!(user: user, postable: topic, read_at: Time.zone.now, page: 1)
+        create!(user: user, postable: topic, read_at: Time.zone.now)
       end
+
+      # Adds `first_unread_post_page` and `last_read_post_page` columns onto the scope.
+      # Skips the records that have no read posts.
+      def with_page_info( # rubocop:disable Metrics/MethodLength
+        posts_per_page: topic_class.default_per_page, posts_scope: post_class.all
+      )
+        states = arel_table
+        self_relation = is_a?(ActiveRecord::Relation) ? self : all
+        if self_relation == unscoped
+          states_select_manager = states
+        else
+          # Using the relation here is redundant but massively improves performance.
+          states_select_manager = Thredded::ArelCompat.new_arel_select_manager(
+            Arel::Nodes::TableAlias.new(Thredded::ArelCompat.relation_to_arel(self_relation), table_name)
+          )
+        end
+        read = if posts_scope == post_class.unscoped
+                 post_class.arel_table
+               else
+                 posts_subquery = Thredded::ArelCompat.relation_to_arel(posts_scope)
+                 Arel::Nodes::TableAlias.new(posts_subquery, 'read_posts')
+               end
+        unread_topics = topic_class.arel_table
+        page_info =
+          states_select_manager
+            .project(
+              states[:id],
+              Arel::Nodes::Case.new(unread_topics[:id].not_eq(nil))
+                .when(Thredded::ArelCompat.true_value(self)).then(
+                  Arel::Nodes::Addition.new(
+                    Thredded::ArelCompat.integer_division(self, read[:id].count, posts_per_page), 1
+                  )
+                ).else(nil)
+                .as('first_unread_post_page'),
+              Arel::Nodes::Addition.new(
+                Thredded::ArelCompat.integer_division(self, read[:id].count, posts_per_page),
+                Arel::Nodes::Case.new(Arel::Nodes::InfixOperation.new(:%, read[:id].count, posts_per_page))
+                  .when(0).then(0).else(1)
+              ).as('last_read_post_page')
+            )
+            .join(read)
+            .on(read[:postable_id].eq(states[:postable_id]).and(read[:created_at].lteq(states[:read_at])))
+            .outer_join(unread_topics)
+            .on(states[:postable_id].eq(unread_topics[:id]).and(unread_topics[:last_post_at].gt(states[:read_at])))
+            .group(states[:id], unread_topics[:id])
+            .as('id_and_page_info')
+
+        # We use a subquery because selected fields must appear in the GROUP BY or be used in an aggregate function.
+        select(states[Arel.star], page_info[:first_unread_post_page], page_info[:last_read_post_page])
+          .joins(states.join(page_info).on(states[:id].eq(page_info[:id])).join_sources)
+      end
+
+      def topic_class
+        reflect_on_association(:postable).klass
+      end
+
+      delegate :post_class, to: :topic_class
     end
   end
 end

data/app/models/thredded/null_user_topic_read_state.rb

@@ -13,5 +13,13 @@ module Thredded
     def post_read?(_post)
       false
     end
+
+    def first_unread_post_page
+      nil
+    end
+
+    def last_read_post_page
+      1
+    end
   end
 end

data/app/policies/thredded/private_post_policy.rb

@@ -2,6 +2,22 @@
 
 module Thredded
   class PrivatePostPolicy
+    # The scope of readable private posts.
+    # {PrivateTopicPolicy} must be applied separately.
+    class Scope
+      # @param user [Thredded.user_class]
+      # @param scope [ActiveRecord::Relation<Thredded::Post>]
+      def initialize(user, scope)
+        @user = user
+        @scope = scope
+      end
+
+      # @return [ActiveRecord::Relation<Thredded::Post>]
+      def resolve
+        @scope
+      end
+    end
+
     # @param user [Thredded.user_class]
     # @param post [Thredded::PrivatePost]
     def initialize(user, post)

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -35,12 +35,15 @@ module Thredded
 
     # View hooks for collections of public or private posts.
     class PostsCommon
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :before_first_unread_post
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :pagination_top
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :pagination_bottom
 
       def initialize
+        @before_first_unread_post = ViewHook.new
         @pagination_top = ViewHook.new
         @pagination_bottom = ViewHook.new
       end

data/app/view_models/thredded/base_topic_view.rb

@@ -37,7 +37,11 @@ module Thredded
     end
 
     def path
-      Thredded::UrlsHelper.topic_path(@topic, page: @read_state.page)
+      Thredded::UrlsHelper.topic_path(
+        @topic,
+        page: @read_state.first_unread_post_page || @read_state.last_read_post_page,
+        anchor: ('unread' if @read_state.first_unread_post_page)
+      )
     end
   end
 end

data/app/view_models/thredded/post_view.rb

@@ -17,10 +17,14 @@ module Thredded
     # @param post [Thredded::PostCommon]
     # @param policy [#create? #update? #destroy? #moderate?]
     # @param topic_view [Thredded::TopicView]
-    def initialize(post, policy, topic_view: nil)
+    # @param first_in_page [Boolean]
+    # @param first_unread_in_page [Boolean]
+    def initialize(post, policy, topic_view: nil, first_in_page: false, first_unread_in_page: false)
       @post   = post
       @policy = policy
       @topic_view = topic_view
+      @first_unread_in_page = first_unread_in_page
+      @first_in_page = first_in_page
     end
 
     def can_reply?
@@ -85,5 +89,13 @@ module Thredded
         POST_IS_UNREAD
       end
     end
+
+    def first_unread_in_page?
+      @first_unread_in_page
+    end
+
+    def first_in_page?
+      @first_in_page
+    end
   end
 end

data/app/view_models/thredded/posts_page_view.rb

@@ -19,7 +19,7 @@ module Thredded
     # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
     def initialize(user, paginated_scope, topic_view: nil)
       @paginated_scope = paginated_scope
-      @post_views      = paginated_scope.map do |post|
+      @post_views = paginated_scope.map do |post|
         Thredded::PostView.new(post, Pundit.policy!(user, post), topic_view: topic_view)
       end
     end

data/app/view_models/thredded/topic_posts_page_view.rb

@@ -10,8 +10,20 @@ module Thredded
     # @param topic [Thredded::TopicCommon]
     # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
     def initialize(user, topic, paginated_scope)
+      @paginated_scope = paginated_scope
       @topic = "#{paginated_scope.reflect_on_association(:postable).klass}View".constantize.from_user(topic, user)
-      super(user, paginated_scope, topic_view: @topic)
+      prev_read = false
+      @post_views = paginated_scope.map.with_index do |post, i|
+        post_read = @topic.post_read?(post)
+        post_view = Thredded::PostView.new(
+          post, Pundit.policy!(user, post),
+          topic_view: @topic,
+          first_in_page: i.zero?,
+          first_unread_in_page: !post_read && prev_read
+        )
+        prev_read = post_read
+        post_view
+      end
     end
   end
 end

data/app/views/thredded/posts/_post.html.erb

@@ -1,4 +1,5 @@
 <% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= render 'thredded/posts_common/before_first_unread_post', post: post if post.first_unread_in_page? %>
 <%= content_tag :article, id: dom_id(post), class: "thredded--post thredded--#{post.read_state}--post" do %>
   <%= render 'thredded/posts_common/actions', post: post, actions: local_assigns[:actions] %>
   <%= render 'thredded/posts_common/header', post: post %>

data/app/views/thredded/posts/edit.html.erb

@@ -2,6 +2,7 @@
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
+    <li><%= link_to @post_form.topic.title, post_path(@post_form.post, user: thredded_current_user) %></li>
     <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post_form.post) %></li>
   </ul>
 <% end %>

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

@@ -0,0 +1,7 @@
+<div class="thredded--before-first-unread-post<%= ' unread--before-first-unread-post--first-in-page' if post.first_in_page? %>">
+  <%= view_hooks.posts_common.before_first_unread_post.render(self, post: post) do %>
+    <% unless post.first_in_page? %>
+      <span id="unread"></span>
+    <% end %>
+  <% end %>
+</div>

data/app/views/thredded/posts_common/form/_after_content.html.erb

@@ -0,0 +1,8 @@
+<%#
+# This partial is deprecated. Add a view hook to the initializer instead, for example:
+
+Thredded.view_hooks.post_form.content_text_area.config.after do
+  # This is rendered in the Thredded view context, so all Thredded helpers and URLs are accessible here directly.
+  render partial: 'my_partial'
+end
+%>

data/app/views/thredded/posts_common/form/_before_content.html.erb

@@ -0,0 +1,8 @@
+<%#
+# This partial is deprecated. Add a view hook to the initializer instead, for example:
+
+Thredded.view_hooks.post_form.content_text_area.config.before do
+  # This is rendered in the Thredded view context, so all Thredded helpers and URLs are accessible here directly.
+  render partial: 'my_partial'
+end
+%>

data/app/views/thredded/private_posts/_private_post.html.erb

@@ -1,5 +1,6 @@
 <% private_post, content = post_and_content if local_assigns.key?(:post_and_content) %>
-<%= content_tag :article, id: dom_id(private_post), class: 'thredded--post' do %>
+<%= render 'thredded/posts_common/before_first_unread_post', post: private_post if private_post.first_unread_in_page? %>
+<%= content_tag :article, id: dom_id(private_post), class: "thredded--post thredded--#{private_post.read_state}--post" do %>
   <%= render 'thredded/posts_common/actions', post: private_post, actions: local_assigns[:actions] %>
   <%= render 'thredded/posts_common/header', post: private_post %>
   <%= content || render('thredded/private_posts/content', post: post) %>

data/app/views/thredded/private_posts/edit.html.erb

@@ -2,6 +2,7 @@
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
+    <li><%= link_to @post_form.topic.title, post_path(@post_form.post, user: thredded_current_user) %></li>
     <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post_form.post) %></li>
   </ul>
 <% end %>

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

@@ -12,6 +12,7 @@
     <li class="title">
       <%= form.label :title, t('thredded.private_topics.form.title_label') %>
       <%= form.text_field :title, placeholder: placeholder, required: true %>
+      <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
     </li>
     <li>
       <%= form.label :user_names, t('thredded.private_topics.form.users_label') %>

data/app/views/thredded/private_topics/edit.html.erb

@@ -4,7 +4,7 @@
   <ul class="thredded--navigation-breadcrumbs">
     <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
     <li><%= link_to t('thredded.nav.private_topics'), private_topics_path %></li>
-    <li><%= link_to @private_topic.title, topic_path(@private_topic) %></li>
+    <li><%= link_to @private_topic.title_was || @private_topic.title, topic_path(@private_topic) %></li>
     <li><%= link_to t('thredded.nav.edit_private_topic'), edit_private_topic_path(@private_topic) %></li>
   </ul>
 <% end %>
@@ -22,6 +22,7 @@
                               placeholder: t('thredded.private_topics.form.title_placeholder_new'),
                               autofocus: true,
                               required: true %>
+          <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
         </li>
         <li>
           <button type="submit" class="thredded--form--submit"

data/app/views/thredded/shared/_field_errors.html.erb

@@ -0,0 +1,3 @@
+<div class="thredded--alert thredded--alert-danger">
+  <%= safe_join messages, raw("<br>") %>
+</div>

data/app/views/thredded/shared/_nav.html.erb

@@ -2,7 +2,7 @@
   <ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
     <%= render 'thredded/shared/nav/moderation' %>
     <%= render 'thredded/shared/nav/notification_preferences', messageboard: messageboard_or_nil %>
-    <%= render 'thredded/shared/nav/private_topics' %>
+    <%= render 'thredded/shared/nav/private_topics' if Thredded.private_messaging_enabled %>
     <% if Thredded.standalone_layout? %>
       <%= render 'thredded/shared/nav/standalone_profile' if thredded_signed_in? %>
       <%= render 'thredded/shared/nav/standalone' %>