thredded 0.15.5 → 0.16.0

data/app/models/thredded/post.rb

@@ -37,6 +37,8 @@ module Thredded
     after_commit :update_parent_last_user_and_time_from_last_post, on: %i[create destroy]
     after_commit :update_parent_last_user_and_time_from_last_post_if_moderation_state_changed, on: :update
 
+    after_commit :update_unread_posts_count_if_moderation_state_changed, on: :update
+
     after_commit :auto_follow_and_notify, on: %i[create update]
 
     # Finds the post by its ID, or raises {Thredded::Errors::PostNotFound}.
@@ -83,5 +85,9 @@ module Thredded
     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
+
+    def update_unread_posts_count_if_moderation_state_changed
+      update_unread_posts_count if previous_changes.include?('moderation_state')
+    end
   end
 end

data/app/models/thredded/private_topic.rb

@@ -29,7 +29,11 @@ module Thredded
              dependent:   :destroy
     has_one :first_post, # rubocop:disable Rails/InverseOf
             -> { order_oldest_first },
-            class_name:  'Thredded::PrivatePost',
+            class_name: 'Thredded::PrivatePost',
+            foreign_key: :postable_id
+    has_one :last_post, # rubocop:disable Rails/InverseOf
+            -> { order_newest_first },
+            class_name: 'Thredded::PrivatePost',
             foreign_key: :postable_id
     has_many :private_users,
              inverse_of: :private_topic,
@@ -39,7 +43,7 @@ module Thredded
              class_name: 'Thredded::UserPrivateTopicReadState',
              foreign_key: :postable_id,
              inverse_of: :postable,
-             dependent: :destroy
+             dependent: :delete_all
 
     # Private topics with that have exactly the given participants.
     scope :has_exact_participants, ->(users) {
@@ -100,5 +104,11 @@ module Thredded
     def ensure_user_in_private_users
       users << user if user.present? && !users.include?(user)
     end
+
+    class << self
+      def post_class
+        Thredded::PrivatePost
+      end
+    end
   end
 end

data/app/models/thredded/topic.rb

@@ -64,7 +64,7 @@ module Thredded
             foreign_key: :postable_id
     has_one :last_post, # rubocop:disable Rails/InverseOf
             -> { order_newest_first },
-            class_name:  'Thredded::Post',
+            class_name: 'Thredded::Post',
             foreign_key: :postable_id
 
     has_many :topic_categories, inverse_of: :topic, dependent: :delete_all
@@ -73,7 +73,7 @@ module Thredded
              class_name: 'Thredded::UserTopicReadState',
              foreign_key: :postable_id,
              inverse_of: :postable,
-             dependent: :destroy
+             dependent: :delete_all
     has_many :user_follows,
              class_name: 'Thredded::UserTopicFollow',
              inverse_of: :topic,
@@ -115,6 +115,10 @@ module Thredded
 
       public
 
+      def post_class
+        Thredded::Post
+      end
+
       # @param user [Thredded.user_class]
       # @return [Array<[TopicCommon, UserTopicReadStateCommon, UserTopicFollow]>]
       def with_read_and_follow_states(user)
@@ -174,9 +178,10 @@ module Thredded
     end
 
     def handle_messageboard_change_after_commit
-      # Update the `posts.messageboard_id` column. The column is just a performance optimization,
+      # Update `messageboard_id` columns. These columns are a performance optimization,
       # so use update_all to avoid validitaing, triggering callbacks, and updating the timestamps:
       posts.update_all(messageboard_id: messageboard_id)
+      user_read_states.update_all(messageboard_id: messageboard_id)
 
       # Update the associated messageboard metadata that Rails does not update them automatically.
       previous_changes['messageboard_id'].each do |messageboard_id|

data/app/models/thredded/user_extender.rb

@@ -45,13 +45,6 @@ module Thredded
         has_many :thredded_post_moderation_records, foreign_key: 'post_user_id', inverse_of: :post_user
         has_many :thredded_post_moderated_records, foreign_key: 'moderator_id', inverse_of: :moderator
       end
-
-      scope :left_join_thredded_user_details, -> {
-        users = arel_table
-        user_details = Thredded::UserDetail.arel_table
-        joins(users.join(user_details, Arel::Nodes::OuterJoin)
-                .on(users[:id].eq(user_details[:user_id])).join_sources)
-      }
     end
 
     def thredded_user_preference

data/app/models/thredded/user_private_topic_read_state.rb

@@ -9,5 +9,40 @@ module Thredded
     belongs_to :postable,
                class_name: 'Thredded::PrivateTopic',
                inverse_of: :user_read_states
+
+    class << self
+      def topic_class
+        Thredded::PrivateTopic
+      end
+
+      def visible_posts_scope(_user)
+        Thredded::PrivatePost.all
+      end
+
+      # @param [Integer] user_id
+      # @param [Thredded::PrivatePost] post
+      # @param [Boolean] overwrite_newer
+      def touch!(user_id, post, overwrite_newer: false)
+        state = find_or_initialize_by(user_id: user_id, postable_id: post.postable_id)
+        return if !overwrite_newer && state.read_at? && state.read_at >= post.created_at
+        state.read_at = post.created_at
+        state.update!(state.calculate_post_counts)
+      end
+
+      # @param [Thredded.user_class] user
+      # @param [Thredded::PrivatePost] post
+      def read_on_first_post!(user, post)
+        create!(user: user, postable_id: post.postable_id, read_at: post.created_at, read_posts_count: 1,
+                unread_posts_count: 0)
+      end
+
+      protected
+
+      # @param [Array<Thredded.user_class>] users
+      # @return [Array<[id, unread_count, read_count]>]
+      def calculate_post_counts_for_users(users)
+        where(user_id: users.map(&:id)).calculate_post_counts
+      end
+    end
   end
 end

data/app/models/thredded/user_topic_read_state.rb

@@ -9,5 +9,46 @@ module Thredded
     belongs_to :postable,
                class_name: 'Thredded::Topic',
                inverse_of: :user_read_states
+    belongs_to :messageboard,
+               class_name: 'Thredded::Messageboard',
+               inverse_of: :user_topic_read_states
+
+    class << self
+      def topic_class
+        Thredded::Topic
+      end
+
+      def visible_posts_scope(user)
+        Thredded::Post.moderation_state_visible_to_user(user)
+      end
+
+      # @param [Integer] user_id
+      # @param [Thredded::Post] post
+      # @param [Boolean] overwrite_newer
+      def touch!(user_id, post, overwrite_newer: false)
+        state = find_or_initialize_by(user_id: user_id, postable_id: post.postable_id)
+        return if !overwrite_newer && state.read_at? && state.read_at >= post.created_at
+        state.messageboard_id = post.messageboard_id
+        state.read_at = post.created_at
+        state.update!(state.calculate_post_counts)
+      end
+
+      # @param [Thredded.user_class] user
+      # @param [Thredded::Post] post
+      def read_on_first_post!(user, post)
+        create!(user: user, postable_id: post.postable_id, messageboard_id: post.messageboard_id,
+                read_at: post.created_at, read_posts_count: 1, unread_posts_count: 0)
+      end
+
+      protected
+
+      # @param [Array<Thredded.user_class>] users
+      # @return [Array<[id, unread_count, read_count]>]
+      def calculate_post_counts_for_users(users)
+        users
+          .group_by { |user| visible_posts_scope(user) }
+          .flat_map { |s, u| where(user_id: u.map(&:id)).merge(s).calculate_post_counts }
+      end
+    end
   end
 end

data/app/view_models/thredded/messageboard_group_view.rb

@@ -6,19 +6,36 @@ module Thredded
     delegate :name, to: :@group, allow_nil: true
     attr_reader :group, :messageboards
 
-    # @param messageboard_scope [ActiveRecord::Relation<Thredded::Messageboard>]
+    # @param [ActiveRecord::Relation<Thredded::Messageboard>] messageboards_scope
+    # @param [Thredded.user_class] user The user viewing the messageboards.
+    # @param [Boolean] with_unread_topics_counts
     # @return [Array<MessageboardGroupView>]
-    def self.grouped(messageboard_scope)
-      messageboard_scope.preload(last_topic: [:last_user])
+    def self.grouped(messageboards_scope, user: nil, with_unread_topics_counts: user && !user.thredded_anonymous?)
+      scope = messageboards_scope.preload(last_topic: [:last_user])
         .eager_load(:group)
         .order(Arel.sql('COALESCE(thredded_messageboard_groups.position, 0) ASC, thredded_messageboard_groups.id ASC'))
         .ordered
-        .group_by(&:group)
-        .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
+      if with_unread_topics_counts
+        topics_scope = Pundit.policy_scope!(user, Thredded::Topic)
+        unread_topics_counts = messageboards_scope.unread_topics_counts(user: user, topics_scope: topics_scope)
+        unread_followed_topics_counts = messageboards_scope.unread_topics_counts(
+          user: user, topics_scope: topics_scope.followed_by(user)
+        )
+      end
+      scope.group_by(&:group).map do |(group, messageboards)|
+        MessageboardGroupView.new(group, messageboards.map do |messageboard|
+          MessageboardView.new(
+            messageboard,
+            unread_topics_count: with_unread_topics_counts && unread_topics_counts[messageboard.id] || 0,
+            unread_followed_topics_count:
+              with_unread_topics_counts && unread_followed_topics_counts[messageboard.id] || 0
+          )
+        end)
+      end
     end
 
-    # @param group Thredded::MessageboardGroup
-    # @param messageboards [Thredded::TopicCommon]
+    # @param [Thredded::MessageboardGroup] group
+    # @param [Array<Thredded::MessageboardView>] messageboards
     def initialize(group, messageboards)
       @group = group
       @messageboards = messageboards

data/app/view_models/thredded/messageboard_view.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Thredded
+  # A view model for Messageboard.
+  class MessageboardView
+    delegate :name,
+             :description,
+             :locked?,
+             :topics_count,
+             :posts_count,
+             :last_topic,
+             :last_user,
+             to: :@messageboard
+
+    # @return [Integer]
+    attr_reader :unread_topics_count
+
+    # @return [Integer]
+    attr_reader :unread_followed_topics_count
+
+    # @param [Thredded::Messageboard] messageboard
+    # @param [Integer] unread_topics_count
+    # @param [Integer] unread_followed_topics_count
+    def initialize(messageboard, unread_topics_count: 0, unread_followed_topics_count: 0)
+      @messageboard = messageboard
+      @unread_topics_count = unread_topics_count
+      @unread_followed_topics_count = unread_followed_topics_count
+    end
+
+    # @return [Boolean]
+    def unread_topics?
+      !@unread_topics_count.zero?
+    end
+
+    # @return [Boolean]
+    def unread_followed_topics?
+      !@unread_followed_topics_count.zero?
+    end
+
+    # @return [String]
+    def path
+      Thredded::UrlsHelper.messageboard_topics_path(@messageboard)
+    end
+
+    # @return [String]
+    def edit_preferences_path
+      Thredded::UrlsHelper.edit_messageboard_preferences_path(@messageboard)
+    end
+  end
+end

data/app/views/thredded/messageboards/_messageboard.html.erb

@@ -1,20 +1,10 @@
-<% if policy(messageboard).read? %>
-  <%= view_hooks.messageboards_index.messageboard.render self, messageboard: messageboard do %>
-    <%= link_to messageboard_topics_path(messageboard), class: 'thredded--messageboard' do %>
-      <header class="thredded--messageboard--header">
-        <h2 class="thredded--messageboard--title"><%= messageboard.name %></h2>
-        <%= render 'thredded/messageboards/messageboard_meta', messageboard: messageboard %>
-      </header>
-
-      <p class="thredded--messageboard--description"><%= messageboard.description %></p>
-
-      <% if messageboard.last_topic %>
-        <p class="thredded--messageboard--byline">
-          <%= t 'thredded.messageboard.last_updated_by_html',
-                time_ago: time_ago(messageboard.last_topic.last_post_at),
-                user: messageboard.last_user.thredded_display_name %>
-        </p>
-      <% end %>
-    <% end %>
+<%= view_hooks.messageboards_index.messageboard.render self, messageboard: messageboard do %>
+  <%= link_to messageboard.path,
+              class: ['thredded--messageboard',
+                      *('thredded--messageboard--has-unread-topics' if messageboard.unread_topics?),
+                      *('thredded--messageboard--has-unread-followed-topics' if messageboard.unread_followed_topics?)] do %>
+    <%= render 'thredded/messageboards/messageboard/header', messageboard: messageboard %>
+    <%= render 'thredded/messageboards/messageboard/description', messageboard: messageboard %>
+    <%= render 'thredded/messageboards/messageboard/last_updated', messageboard: messageboard %>
   <% end %>
 <% end %>

data/app/views/thredded/messageboards/index.html.erb

@@ -2,6 +2,10 @@
 <% content_for :thredded_page_id, 'thredded--messageboards-index' %>
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 <%= thredded_page do %>
+  <div class="thredded--svg-definitions">
+    <%= inline_svg 'thredded/follow.svg', id: 'thredded-follow-icon', title: nil %>
+    <%= inline_svg 'thredded/lock.svg', id: 'thredded-lock-icon', title: nil %>
+  </div>
   <%= view_hooks.messageboards_index.container.render self, groups: @groups do %>
     <section class="thredded--main-section thredded--messageboards">
       <%= view_hooks.messageboards_index.list.render self, groups: @groups do %>
@@ -11,7 +15,8 @@
           <% end %>
           <div class="thredded--messageboards-group">
             <%= view_hooks.messageboards_index.group.render self, group: group do %>
-              <%= render group.messageboards %>
+              <%= render partial: 'thredded/messageboards/messageboard',
+                         collection: group.messageboards %>
             <% end %>
           </div>
         <% end %>

data/app/views/thredded/messageboards/messageboard/_description.html.erb

@@ -0,0 +1 @@
+<p class="thredded--messageboard--description"><%= messageboard.description %></p>

data/app/views/thredded/messageboards/messageboard/_header.html.erb

@@ -0,0 +1,6 @@
+<header class="thredded--messageboard--header">
+  <h2 class="thredded--messageboard--title"><%= messageboard.name %></h2>
+  <%= render 'thredded/messageboards/messageboard/unread_followed_topics_badge', messageboard: messageboard %>
+  <span class="thredded--flex-spacer"></span>
+  <%= render 'thredded/messageboards/messageboard/meta', messageboard: messageboard %>
+</header>

data/app/views/thredded/messageboards/messageboard/_last_updated.html.erb

@@ -0,0 +1,7 @@
+<% if messageboard.last_topic %>
+  <p class="thredded--messageboard--byline">
+    <%= t 'thredded.messageboard.last_updated_by_html',
+          time_ago: time_ago(messageboard.last_topic.last_post_at),
+          user: messageboard.last_user.thredded_display_name %>
+  </p>
+<% end %>

data/app/views/thredded/messageboards/messageboard/_meta.html.erb

@@ -0,0 +1,19 @@
+<div class="thredded--messageboard--meta">
+  <% if messageboard.locked? %>
+    <span class="thredded--messageboard--meta--locked"
+          title="<%= t('thredded.messageboard.form.locked_notice') %>">
+      <svg class="thredded--messageboard--meta--icon" role="img"><use xlink:href="#thredded-lock-icon"></use></svg>
+    </span>
+  <% end %>
+  <h3 class="thredded--messageboard--meta--counts">
+    <% if messageboard.unread_topics? %>
+      <%= t 'thredded.messageboard.topics_and_unread_topics_counts',
+            topics_count: number_with_delimiter(messageboard.topics_count),
+            unread_topics_count: number_with_delimiter(messageboard.unread_topics_count) %>
+    <% else %>
+      <%= t 'thredded.messageboard.topics_and_posts_counts',
+            topics_count: number_with_delimiter(messageboard.topics_count),
+            posts_count: number_with_delimiter(messageboard.posts_count) %>
+    <% end %>
+  </h3>
+</div>

data/app/views/thredded/messageboards/messageboard/_unread_followed_topics_badge.html.erb

@@ -0,0 +1,6 @@
+<% if messageboard.unread_followed_topics? %>
+  <span class="thredded--messageboard--unread-followed-topics-count">
+    <svg class="thredded--messageboard--unread-followed-icon" role="img"><use xlink:href="#thredded-follow-icon"></use></svg>
+    <%= number_with_delimiter messageboard.unread_followed_topics_count %>
+  </span>
+<% end %>

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

@@ -1,2 +1,2 @@
-<%= link_to messageboard.name, edit_messageboard_preferences_path(messageboard),
+<%= link_to messageboard.name, messageboard.edit_preferences_path,
             class: 'thredded--preferences--messageboards-nav--item thredded--messageboard' %>

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

@@ -3,5 +3,5 @@
 <%= 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) %>
+  <%= content || render('thredded/private_posts/content', post: private_post) %>
 <% end %>

data/app/views/thredded/theme_previews/show.html.erb

@@ -9,9 +9,15 @@
 <%= thredded_page do %>
   <%= render 'section_title', label: 'messageboards#index', href: messageboards_path %>
   <%= content_tag :section, class: 'thredded--thredded--main-section thredded--messageboards' do %>
-    <%= render @messageboards %>
-    <div class="thredded--messageboard--create">
-      <a class="thredded--button" href="<%= new_messageboard_path %>">
+    <div class="thredded--svg-definitions">
+      <%= inline_svg 'thredded/follow.svg', id: 'thredded-follow-icon', title: nil %>
+      <%= inline_svg 'thredded/lock.svg', id: 'thredded-lock-icon', title: nil %>
+    </div>
+    <div class="thredded--messageboards-group">
+      <%= render partial: 'thredded/messageboards/messageboard', collection: @messageboard_views %>
+    </div>
+    <div class="thredded--messageboards--actions">
+      <a class="thredded--button" href="<%= new_messageboard_path %>" rel="nofollow">
         <%= t 'thredded.messageboard.create' %>
       </a>
     </div>
@@ -82,7 +88,7 @@
   <%= render 'section_title', label: 'private_topics#show', href: private_topic_path(@private_topic) %>
   <section class="thredded--thredded--main-section">
     <%= render 'thredded/private_topics/header', topic: @private_topic %>
-    <%= render @private_posts %>
+    <%= render partial: 'thredded/private_posts/private_post', collection: @private_posts %>
     <%= render 'thredded/private_posts/form',
                post:        @private_post_form,
                button_text: t('thredded.private_posts.form.create_btn')

data/app/views/thredded/topics/_topic.html.erb

@@ -5,7 +5,7 @@
   <div class="thredded--topics--posts-count"><%= topic.posts_count %></div>
 
   <div class="thredded--topics--follow-info" title="<%= topic_follow_reason_text topic.follow_reason %>">
-    <svg class="thredded--topics--follow-icon" viewBox="0 0 116 121" role="img">
+    <svg class="thredded--topics--follow-icon" role="img">
       <% if topic.followed? %>
         <use xlink:href="#thredded-follow-icon"></use>
       <% else %>

data/app/views/thredded/topics/unread.html.erb

@@ -7,7 +7,7 @@
 
 <%= thredded_page do %>
   <% if @topics.present? %>
-    <div class="thredded--svg-definitions ">
+    <div class="thredded--svg-definitions">
       <%= inline_svg 'thredded/follow.svg', id: 'thredded-follow-icon', title: nil %>
       <%= inline_svg 'thredded/unfollow.svg', id: 'thredded-unfollow-icon' %>
     </div>