thredded 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a642798592ef42f04c27440bdeb2b9930273fca1bbb2cb41da3138dd10af429c
-  data.tar.gz: 78e334145b31fc55950554b3909864fbe6617a262fbfa07006eec2262ab526bf
+  metadata.gz: aab83b50d26733e85b80ff5a6c6373c53ddc48b93ac14de35212bdea46ff3330
+  data.tar.gz: a02d079d68535ed32160d9e2d6299dc96918bbda7c694212441cf51091f367e3
 SHA512:
-  metadata.gz: 5b134c56f3c79b38ed2b13b42e45c6c5fa7dbb54258ab941980fa7791077a8f1fdc1e76ba24d0c5658478ce762beddaf080133fe16fbd8684c467f2d1efbbe80
-  data.tar.gz: 560bfe2c2922595f5a93728bffb7becb25a32a39fa4ddc209ff8f5778c28ccc87cd46b0a08d106383cf2bb440c83f1a7a532bd0247683ff2e63d30028ca99e3f
+  metadata.gz: 15f36babaaacfeeee4afc75863097638c919bb94bd6bd27501e0c4ebddb851bd45af5a664733ec8a823e1d39598f86bfeafe15eceae7d46942459f32d02e04d0
+  data.tar.gz: c6d79b3effb4bd22ba0b4dfe6e434d55ee445c5237b0e00f5d651a400e48d2c3a6c707503bf8f8803e54b170fef6c44f3c7fb5d131c4357aec1b7e5496b0beea

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.0'
+gem 'thredded', '~> 0.16.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -559,13 +559,20 @@ Rails.application.config.to_prepare do
   Thredded::ApplicationController.module_eval do
     # Require authentication to access the forums:
     before_action :thredded_require_login!
+    # NB: in rails 4.2 you will need to change this to:
+    # before_action { thredded_require_login! }
 
     # You may also want to render a login form after the
     # "Please sign in first" message:
     rescue_from Thredded::Errors::LoginRequired do |exception|
       # Place the code for rendering the login form here, for example:
-      @message = exception.message
-      render template: 'sessions/new', status: :forbidden
+      flash.now[:notice] = exception.message
+      controller = Users::SessionsController.new
+      controller.request = request
+      controller.request.env['devise.mapping'] = Devise.mappings[:user]
+      controller.response = response
+      controller.response_options = { status: :forbidden }
+      controller.process(:new)
     end
   end
 end

data/app/assets/javascripts/thredded/components/topics.es6

@@ -10,32 +10,53 @@
   const TOPIC_UNREAD_CLASS = 'thredded--topic-unread';
   const TOPIC_READ_CLASS = 'thredded--topic-read';
   const POSTS_COUNT_SELECTOR = '.thredded--topics--posts-count';
-  const POSTS_PER_PAGE = 50;
 
   function pageNumber(url) {
     const match = url.match(/\/page-(\d)$/);
     return match ? +match[1] : 1;
   }
 
-  function totalPages(numPosts) {
-    return Math.ceil(numPosts / POSTS_PER_PAGE);
+  function totalPages(numPosts, postsPerPage) {
+    return Math.ceil(numPosts / postsPerPage);
   }
 
-  function getTopicNode(node) {
+  function getAncestorTag(node, ancestorTagName) {
     do {
       node = node.parentNode;
-    } while (node && node.tagName !== 'ARTICLE');
+    } while (node && node.tagName !== ancestorTagName);
     return node;
   }
 
+  function getTopicNode(node) {
+    return getAncestorTag(node, 'ARTICLE');
+  }
+
+  function getUnreadNavItem(unreadFollowedCountElement) {
+    return getAncestorTag(unreadFollowedCountElement, 'LI');
+  }
+
   function initTopicsList(topicsList) {
+    const postsPerPage = +topicsList.getAttribute('data-thredded-topic-posts-per-page') || 25;
+    const isPrivateTopics = topicsList.getAttribute('data-thredded-topics') === 'private';
+    const unreadFollowedCountElement = document.querySelector('[data-unread-followed-count]');
     topicsList.addEventListener('click', (evt) => {
       const link = evt.target;
       if (link.tagName !== 'A' || link.parentNode.tagName !== 'H1') return;
       const topic = getTopicNode(link);
-      if (pageNumber(link.href) === totalPages(+topic.querySelector(POSTS_COUNT_SELECTOR).textContent)) {
+      if (pageNumber(link.href) === totalPages(+topic.querySelector(POSTS_COUNT_SELECTOR).textContent, postsPerPage)) {
+        if (!isPrivateTopics && unreadFollowedCountElement &&
+          topic.hasAttribute('data-followed') && topic.hasAttribute('data-unread')) {
+          const count = (+unreadFollowedCountElement.textContent) - 1;
+          if (count === 0) {
+            const navItem = getUnreadNavItem(unreadFollowedCountElement);
+            navItem.parentElement.removeChild(navItem);
+          } else {
+            unreadFollowedCountElement.textContent = count.toLocaleString();
+          }
+        }
         topic.classList.add(TOPIC_READ_CLASS);
         topic.classList.remove(TOPIC_UNREAD_CLASS);
+        topic.removeAttribute('data-unread');
       }
     });
   }

data/app/assets/javascripts/thredded/components/users_select.es6

@@ -44,7 +44,7 @@
           current.push(char);
       }
     }
-    if (current.length) result.push({name: current.join(''), index: currentIndex});
+    if (current.length) result.current = {name: current.join(''), index: currentIndex};
     return result;
   }
 
@@ -63,6 +63,9 @@
         maxCount: Thredded.UsersSelect.DROPDOWN_MAX_COUNT,
       },
     });
+    textarea.addEventListener('blur', (evt) => {
+      textcomplete.hide();
+    });
 
     const searchFn = Thredded.UserTextcomplete.searchFn({
       url: textarea.getAttribute('data-autocomplete-url'),
@@ -77,8 +80,8 @@
       index: 0,
       match: (text) => {
         const names = parseNames(text);
-        if (names.length) {
-          const {name, index} = names[names.length - 1];
+        if (names.current) {
+          const {name, index} = names.current;
           const matchData = [name];
           matchData.index = index;
           return matchData;

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

@@ -7,12 +7,15 @@ $thredded-grid-breakpoint-max-widths: (mobile: 34rem, tablet: 48rem) !default;
 $thredded-content-breakout-min-width: 4rem !default;
 
 // Typography
-$thredded-base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif !default;
+$thredded-base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 $thredded-base-font-size: 1rem !default; // 16px
 $thredded-font-size-small: 0.875rem !default; // 14px
 $thredded-base-line-height: 1.5 !default;
 $thredded-heading-font-family: inherit !default;
 $thredded-heading-line-height: 1.2 !default;
+$thredded-messageboard-title-font-size: 1.125rem !default;
+$thredded-topic-header-font-size: 1.25rem !default;
+$thredded-topic-header-font-size-tablet-and-up: 1.5rem !default;
 
 // Spacings
 $thredded-large-spacing: $thredded-base-line-height * 2rem !default;

data/app/assets/stylesheets/thredded/components/_messageboard.scss

@@ -29,9 +29,9 @@
 
 .thredded--messageboard--title {
   @extend %thredded--heading;
+  font-size: $thredded-messageboard-title-font-size;
   display: inline-block;
   float: left;
-  font-size: 1.125rem; // 18px
   line-height: 1.2;
   vertical-align: baseline;
 }
@@ -157,6 +157,11 @@
         }
       }
 
+      // A helper class for sizing incomplete rows with more than two missing items.
+      .thredded--grid-sizer {
+        @extend %thredded--messageboards-cell-flex;
+      }
+
       .thredded--messageboard {
         @extend %thredded--messageboards-cell-flex;
         margin-top: $margin-y;

data/app/assets/stylesheets/thredded/components/_topic-header.scss

@@ -10,11 +10,11 @@
 
 .thredded--topic-header--title {
   @extend %thredded--heading;
-  font-size: 1.25rem;
+  font-size: $thredded-topic-header-font-size;
   line-height: 1.2;
   margin-bottom: $thredded-small-spacing / 2;
   @include thredded-media-tablet-and-up {
-    font-size: 1.5rem;
+    font-size: $thredded-topic-header-font-size-tablet-and-up;
   }
 }
 

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -20,3 +20,10 @@
 .thredded--user-navigation--unread-topics--followed-count {
   @extend %thredded--nav-tabs--item--badge;
 }
+.thredded--unread-topics--followed-icon {
+  fill: currentColor;
+  width: 1em;
+  height: 1em;
+  top: 0.1em;
+  position: relative;
+}

data/app/controllers/thredded/autocomplete_users_controller.rb

@@ -28,8 +28,10 @@ module Thredded
     def users_by_prefix
       query = params[:q].to_s.strip
       if query.length >= Thredded.autocomplete_min_length
-        DbTextSearch::CaseInsensitive.new(users_scope, Thredded.user_name_column).prefix(query)
+        case_insensitive = DbTextSearch::CaseInsensitive.new(users_scope, Thredded.user_name_column)
+        case_insensitive.prefix(query)
           .where.not(id: thredded_current_user.id)
+          .order(case_insensitive.column_for_order(:asc))
           .limit(MAX_RESULTS)
       else
         []

data/app/controllers/thredded/moderation_controller.rb

@@ -12,7 +12,7 @@ module Thredded
           .pending_moderation
           .order_oldest_first
           .preload(:user, :postable)
-          .page(current_page)
+          .send(Kaminari.config.page_method_name, current_page)
       )
       maybe_set_last_moderated_record_flash
     end
@@ -20,7 +20,7 @@ module Thredded
     def history
       @post_moderation_records = accessible_post_moderation_records
         .order(created_at: :desc)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
     end
 
     def activity
@@ -29,7 +29,7 @@ module Thredded
         moderatable_posts
           .order_newest_first
           .preload(:user, :postable, :messageboard)
-          .page(current_page)
+          .send(Kaminari.config.page_method_name, current_page)
       )
       maybe_set_last_moderated_record_flash
     end
@@ -63,7 +63,7 @@ module Thredded
         )
       @query = params[:q].to_s
       @users = DbTextSearch::CaseInsensitive.new(@users, Thredded.user_name_column).prefix(@query) if @query.present?
-      @users = @users.page(current_page)
+      @users = @users.send(Kaminari.config.page_method_name, current_page)
     end
 
     def user
@@ -73,7 +73,7 @@ module Thredded
         .where(messageboard_id: policy_scope(Messageboard.all).pluck(:id))
         .order_newest_first
         .includes(:postable)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       @posts = Thredded::PostsPageView.new(thredded_current_user, posts_scope)
     end
 

data/app/controllers/thredded/private_topics_controller.rb

@@ -12,7 +12,7 @@ module Thredded
         .distinct
         .for_user(thredded_current_user)
         .order_recently_posted_first
-        .page(params[:page])
+        .send(Kaminari.config.page_method_name, params[:page])
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @private_topics = Thredded::PrivateTopicsPageView.new(thredded_current_user, page_scope)
 
@@ -29,7 +29,7 @@ module Thredded
         .posts
         .includes(:user)
         .order_oldest_first
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, private_topic, page_scope)
       Thredded::UserPrivateTopicReadState.touch!(thredded_current_user.id, page_scope.last) if thredded_signed_in?

data/app/controllers/thredded/theme_previews_controller.rb

@@ -15,11 +15,15 @@ module Thredded
         Thredded::MessageboardView.new(Thredded::Messageboard.first(2)[-1], unread_topics_count: 2),
         Thredded::MessageboardView.new(Thredded::Messageboard.first(3)[-1]),
       ]
-      @topics = Thredded::TopicsPageView.new(@user, @messageboard.topics.page(1).limit(3))
+      @topics = Thredded::TopicsPageView.new(@user, @messageboard.topics
+                                            .send(Kaminari.config.page_method_name, 1)
+                                            .limit(3))
       @private_topics = Thredded::PrivateTopicsPageView.new(@user, @user.thredded_private_topics.page(1).limit(3))
       topic = Thredded::Topic.new(messageboard: @messageboard, title: 'Hello', slug: 'hello', user: @user)
       @topic = Thredded::TopicView.from_user(topic, @user)
-      @posts = Thredded::TopicPostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
+      @posts = Thredded::TopicPostsPageView.new(@user, topic, topic.posts
+                                                .send(Kaminari.config.page_method_name, 1)
+                                                .limit(3))
       @post = topic.posts.build(id: 1337, postable: topic, content: 'Hello world', user: @user)
       @post_form = Thredded::PostForm.for_persisted(@post)
       @new_post = Thredded::PostForm.new(user: @user, topic: topic)
@@ -27,7 +31,9 @@ module Thredded
       @new_private_topic = Thredded::PrivateTopicForm.new(user: @user)
       private_topic = Thredded::PrivateTopic.new(id: 17, title: 'Hello', user: @user, last_user: @user, users: [@user])
       @private_topic = Thredded::PrivateTopicView.from_user(private_topic, @user)
-      @private_posts = Thredded::TopicPostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
+      @private_posts = Thredded::TopicPostsPageView.new(@user, private_topic, private_topic.posts
+                                                        .send(Kaminari.config.page_method_name, 1)
+                                                        .limit(3))
       @private_post = private_topic.posts.build(
         id: 1337, postable: private_topic, content: 'A private hello world', user: @user
       )

data/app/controllers/thredded/topics_controller.rb

@@ -23,7 +23,7 @@ module Thredded
       page_scope = policy_scope(messageboard.topics)
         .order_sticky_first.order_recently_posted_first
         .includes(:categories, :last_user, :user)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
       @new_topic = init_new_topic
@@ -34,7 +34,7 @@ module Thredded
         .unread(thredded_current_user)
         .order_followed_first(thredded_current_user).order_recently_posted_first
         .includes(:categories, :last_user, :user)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
       @new_topic = init_new_topic
@@ -46,7 +46,7 @@ module Thredded
         .search_query(@query)
         .order_recently_posted_first
         .includes(:categories, :last_user, :user)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
     end
@@ -57,7 +57,7 @@ module Thredded
       page_scope = policy_scope(topic.posts)
         .order_oldest_first
         .includes(:user, :messageboard)
-        .page(current_page)
+        .send(Kaminari.config.page_method_name, current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
       Thredded::UserTopicReadState.touch!(thredded_current_user.id, page_scope.last) if thredded_signed_in?
@@ -79,7 +79,7 @@ module Thredded
         policy_scope(@category.topics)
           .unstuck
           .order_recently_posted_first
-          .page(current_page)
+          .send(Kaminari.config.page_method_name, current_page)
       )
       render :index
     end
@@ -88,7 +88,7 @@ module Thredded
       @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
       if @new_topic.save
-        redirect_to messageboard_topics_path(messageboard)
+        redirect_to next_page_after_create(params[:next_page])
       else
         render :new
       end
@@ -141,6 +141,19 @@ module Thredded
 
     private
 
+    def next_page_after_create(next_page)
+      case next_page
+      when 'messageboard', '', nil
+        return messageboard_topics_path(messageboard)
+      when 'topic'
+        messageboard_topic_path(messageboard, @new_topic.topic)
+      when %r{\A/[^/]\S+\z}
+        next_page
+      else
+        fail "Unexpected value for next page: #{next_page.inspect}"
+      end
+    end
+
     def in_messageboard?
       params.key?(:messageboard_id)
     end

data/app/helpers/thredded/application_helper.rb

@@ -5,6 +5,7 @@ module Thredded
     include ::Thredded::UrlsHelper
     include ::Thredded::NavHelper
     include ::Thredded::RenderHelper
+    include ::Thredded::IconHelper
 
     # @return [AllViewHooks] View hooks configuration.
     def view_hooks

data/app/helpers/thredded/icon_helper.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Thredded
+  module IconHelper
+    def shared_inline_svg(filename, **args)
+      svg = content_tag :svg, **args do
+        content_tag :use, '', 'xlink:href' => "##{thredded_icon_id(filename)}"
+      end
+      if (definition = define_svg_icons(filename))
+        definition + svg
+      else
+        svg
+      end
+    end
+
+    def define_svg_icons(*filenames)
+      return if filenames.blank?
+      sb = filenames.map do |filename|
+        inline_svg_once(filename, id: thredded_icon_id(filename))
+      end
+      return if sb.compact.blank?
+      content_tag :div, safe_join(sb), class: 'thredded--svg-definitions'
+    end
+
+    def inline_svg_once(filename, id:, **transform_params)
+      return if @already_inlined_svg_ids&.include?(id)
+      record_already_inlined_svg(filename, id)
+      inline_svg(filename, id: id, **transform_params)
+    end
+
+    private
+
+    def record_already_inlined_svg(filename, id)
+      if filename.is_a?(String) # in case it's an IO or other
+        fail "Please use id: #{thredded_icon_id(filename)}" unless id == thredded_icon_id(filename)
+      end
+      @already_inlined_svg_ids ||= []
+      @already_inlined_svg_ids << id
+    end
+
+    def thredded_icon_id(svg_filename)
+      "thredded-#{File.basename(svg_filename, '.svg').dasherize}-icon"
+    end
+  end
+end

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

@@ -35,7 +35,7 @@ module Thredded
 
           # Content that the user can moderate.
           if moderatable_messageboards != Thredded::Messageboard.none
-            result = result.or(messageboard_id: moderatable_messageboards)
+            result = result.or(where(messageboard_id: moderatable_messageboards))
           end
         end
         result

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

@@ -69,17 +69,12 @@ module Thredded
         Thredded::TopicCommon::CachingHash.from_relation(read_states)
       end
 
-      public
-
-      # @param user [Thredded.user_class]
-      # @return [Array<[TopicCommon, UserTopicReadStateCommon]>]
-      def with_read_states(user)
-        null_read_state = Thredded::NullUserTopicReadState.new
-        return current_scope.zip([null_read_state]) if user.thredded_anonymous?
-        read_states_by_postable = read_states_by_postable_hash(user)
-        current_scope.map do |postable|
-          [postable, read_states_by_postable[postable] || null_read_state]
-        end
+      # @param [Thredded.user_class] user
+      # @param [Array<Number>] topic_ids
+      # @return [Hash{topic ID => posts count}] Counts of posts visible to the given user in the given topics.
+      def post_counts_for_user_and_topics(user, topic_ids)
+        return {} if topic_ids.empty?
+        Pundit.policy_scope!(user, post_class.all).where(postable_id: topic_ids).group(:postable_id).count
       end
     end
 

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

@@ -21,6 +21,11 @@ module Thredded
       post.created_at <= read_at
     end
 
+    # @return [Number]
+    def posts_count
+      read_posts_count + unread_posts_count
+    end
+
     def calculate_post_counts
       unread_posts_count, read_posts_count =
         self.class.visible_posts_scope(user)

data/app/models/thredded/null_user.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 module Thredded
+  # A Thredded::NullUser stands in place of a real (mainapp supplied) User when:
+  #
+  # * user is not logged in (ie. the thredded_current_user)
+  # * a user that was hard-deleted
+  #   (e.g. if a post was made by a user, and then that user is destroyed, the post's user ID is nullified).
   class NullUser
     include ::Thredded::UserPermissions::Read::All
     include ::Thredded::UserPermissions::Write::None

data/app/models/thredded/null_user_topic_read_state.rb

@@ -2,6 +2,12 @@
 
 module Thredded
   class NullUserTopicReadState
+    attr_reader :posts_count
+
+    def initialize(posts_count:)
+      @posts_count = posts_count
+    end
+
     def page
       1
     end

data/app/models/thredded/private_topic.rb

@@ -109,6 +109,24 @@ module Thredded
       def post_class
         Thredded::PrivatePost
       end
+
+      # @param [Thredded.user_class] user
+      # @return [Array<[PrivateTopic, PrivateUserTopicReadState]>]
+      def with_read_states(user)
+        if user.thredded_anonymous?
+          current_scope.map do |topic|
+            [topic, Thredded::NullUserTopicReadState.new(posts_count: topic.posts_count)]
+          end
+        else
+          read_states_by_postable = read_states_by_postable_hash(user)
+          current_scope.map do |topic|
+            [
+              topic,
+              read_states_by_postable[topic] || Thredded::NullUserTopicReadState.new(posts_count: topic.posts_count)
+            ]
+          end
+        end
+      end
     end
   end
 end

data/app/models/thredded/topic.rb

@@ -122,12 +122,26 @@ module Thredded
       # @param user [Thredded.user_class]
       # @return [Array<[TopicCommon, UserTopicReadStateCommon, UserTopicFollow]>]
       def with_read_and_follow_states(user)
-        null_read_state = Thredded::NullUserTopicReadState.new
-        return current_scope.zip([null_read_state, nil]) if user.thredded_anonymous?
-        read_states_by_topic = read_states_by_postable_hash(user)
-        follows_by_topic = follows_by_topic_hash(user)
-        current_scope.map do |topic|
-          [topic, read_states_by_topic[topic] || null_read_state, follows_by_topic[topic]]
+        topics = current_scope.to_a
+        if user.thredded_anonymous?
+          post_counts = post_counts_for_user_and_topics(user, topics.map(&:id))
+          topics.map do |topic|
+            [topic, Thredded::NullUserTopicReadState.new(posts_count: post_counts[topic.id] || 0), nil]
+          end
+        else
+          read_states_by_topic = read_states_by_postable_hash(user)
+          post_counts = post_counts_for_user_and_topics(
+            user, topics.reject { |topic| read_states_by_topic.key?(topic) }.map(&:id)
+          )
+          follows_by_topic = follows_by_topic_hash(user)
+          current_scope.map do |topic|
+            [
+              topic,
+              read_states_by_topic[topic] ||
+                Thredded::NullUserTopicReadState.new(posts_count: post_counts[topic.id] || 0),
+              follows_by_topic[topic]
+            ]
+          end
         end
       end
     end

data/app/view_models/thredded/base_topic_view.rb

@@ -4,7 +4,6 @@ module Thredded
   # A view model for TopicCommon.
   class BaseTopicView
     delegate :title,
-             :posts_count,
              :last_post_at,
              :created_at,
              :user,
@@ -12,16 +11,16 @@ module Thredded
              :to_model,
              to: :@topic
 
-    delegate :read?, :post_read?,
+    delegate :read?, :post_read?, :posts_count,
              to: :@read_state
 
-    # @param topic [TopicCommon]
-    # @param read_state [UserTopicReadStateCommon, nil]
-    # @param policy [#destroy?]
+    # @param [TopicCommon] topic
+    # @param [UserTopicReadStateCommon, NullUserTopicReadState, nil] read_state
+    # @param [#destroy?] policy
     def initialize(topic, read_state, policy)
-      @read_state = read_state || Thredded::NullUserTopicReadState.new
-      @topic      = topic
-      @policy     = policy
+      @topic = topic
+      @read_state = read_state || Thredded::NullUserTopicReadState.new(posts_count: @topic.posts_count)
+      @policy = policy
     end
 
     def states

data/app/view_models/thredded/messageboard_group_view.rb

@@ -10,22 +10,29 @@ module Thredded
     # @param [Thredded.user_class] user The user viewing the messageboards.
     # @param [Boolean] with_unread_topics_counts
     # @return [Array<MessageboardGroupView>]
-    def self.grouped(messageboards_scope, user: nil, with_unread_topics_counts: user && !user.thredded_anonymous?)
+    def self.grouped( # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
+      messageboards_scope, user: Thredded::NullUser.new, with_unread_topics_counts: !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
+      topics_scope = Thredded::TopicPolicy::Scope.new(user, Thredded::Topic.all).resolve
       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
+      topic_counts = topics_scope.group(:messageboard_id).count
+      posts_scope = Thredded::PostPolicy::Scope.new(user, Thredded::Post.all).resolve
+      post_counts = posts_scope.group(:messageboard_id).count
       scope.group_by(&:group).map do |(group, messageboards)|
         MessageboardGroupView.new(group, messageboards.map do |messageboard|
           MessageboardView.new(
             messageboard,
+            topics_count: topic_counts[messageboard.id] || 0,
+            posts_count: post_counts[messageboard.id] || 0,
             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

data/app/view_models/thredded/messageboard_view.rb

@@ -6,12 +6,16 @@ module Thredded
     delegate :name,
              :description,
              :locked?,
-             :topics_count,
-             :posts_count,
              :last_topic,
              :last_user,
              to: :@messageboard
 
+    # @return [Integer]
+    attr_reader :topics_count
+
+    # @return [Integer]
+    attr_reader :posts_count
+
     # @return [Integer]
     attr_reader :unread_topics_count
 
@@ -19,10 +23,20 @@ module Thredded
     attr_reader :unread_followed_topics_count
 
     # @param [Thredded::Messageboard] messageboard
+    # @param [Integer] topics_count
+    # @param [Integer] posts_count
     # @param [Integer] unread_topics_count
     # @param [Integer] unread_followed_topics_count
-    def initialize(messageboard, unread_topics_count: 0, unread_followed_topics_count: 0)
+    def initialize(
+      messageboard,
+      topics_count: messageboard.topics_count,
+      posts_count: messageboard.posts_count,
+      unread_topics_count: 0,
+      unread_followed_topics_count: 0
+    )
       @messageboard = messageboard
+      @topics_count = topics_count
+      @posts_count = posts_count
       @unread_topics_count = unread_topics_count
       @unread_followed_topics_count = unread_followed_topics_count
     end

data/app/view_models/thredded/topic_view.rb

@@ -7,9 +7,9 @@ module Thredded
              :last_post, :messageboard_id, :messageboard_name,
              to: :@topic
 
-    # @param topic [TopicCommon]
-    # @param read_state [UserTopicReadStateCommon, nil]
-    # @param policy [#destroy?]
+    # @param [Topic] topic
+    # @param [UserTopicReadState, NullUserTopicReadState, nil] read_state
+    # @param [#destroy?] policy
     def initialize(topic, read_state, follow, policy)
       super(topic, read_state, policy)
       @follow = follow
@@ -34,7 +34,7 @@ module Thredded
 
     # @return [Boolean] whether the topic is followed by the current user.
     def followed?
-      @follow
+      !!@follow # rubocop:disable Style/DoubleNegation
     end
 
     def follow_reason

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

@@ -0,0 +1,2 @@
+<%# Ensures that cells in incomplete rows are sized correctly (up to 5 missing cells). %>
+<i class="thredded--grid-sizer"></i><i class="thredded--grid-sizer"></i><i class="thredded--grid-sizer"></i>

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

@@ -2,10 +2,7 @@
 <% 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>
+  <%= define_svg_icons('thredded/follow.svg', 'thredded/lock.svg') %>
   <%= 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 %>
@@ -18,6 +15,7 @@
               <%= render partial: 'thredded/messageboards/messageboard',
                          collection: group.messageboards %>
             <% end %>
+            <%= render partial: 'thredded/messageboards/grid_sizers' %>
           </div>
         <% end %>
       <% end %>

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

@@ -2,7 +2,7 @@
   <% 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>
+      <%= shared_inline_svg "thredded/lock.svg", class:"thredded--messageboard--meta--icon", role: "img"%>
     </span>
   <% end %>
   <h3 class="thredded--messageboard--meta--counts">

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

@@ -1,6 +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>
+    <%= shared_inline_svg "thredded/follow.svg", class: "thredded--messageboard--unread-followed-icon", role: "img"%>
     <%= number_with_delimiter messageboard.unread_followed_topics_count %>
   </span>
 <% end %>

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

@@ -4,8 +4,9 @@
 
 <%= thredded_page do %>
   <%= content_tag :section,
-    class: 'thredded--main-section thredded--private-topics',
-    'data-thredded-topics' => true do %>
+                  class: 'thredded--main-section thredded--private-topics',
+                  'data-thredded-topics' => 'private',
+                  'data-thredded-topic-posts-per-page' => Thredded.posts_per_page do %>
 
     <% if @private_topics.empty? -%>
       <%= render 'thredded/private_topics/no_private_topics' %>

data/app/views/thredded/shared/nav/_unread_topics.html.erb

@@ -2,10 +2,11 @@
 <% if unread_topics_count > 0 || current %>
   <li class="thredded--user-navigation--unread-topics thredded--user-navigation--item<%= ' thredded--is-current' if current %>">
     <%= link_to current ? nav_back_path(messageboard) : unread_topics_path(messageboard: messageboard), rel: 'nofollow' do %>
-      <%= inline_svg 'thredded/follow.svg', class: 'thredded--icon' %>
       <span class="thredded--nav-text"><%= t('thredded.nav.unread_topics') %></span>
       <% if unread_followed_topics_count > 0 -%>
-        <span class="thredded--user-navigation--unread-topics--followed-count"><%= unread_followed_topics_count %></span>
+        <%= define_svg_icons 'thredded/follow.svg' %>
+        <span class="thredded--user-navigation--unread-topics--followed-count"><%=shared_inline_svg "thredded/follow.svg", class: "thredded--unread-topics--followed-icon", role:"img" %>
+          <span data-unread-followed-count><%= unread_followed_topics_count %></span></span>
       <% end -%>
     <% end %>
   </li>

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

@@ -9,10 +9,7 @@
 <%= thredded_page do %>
   <%= render 'section_title', label: 'messageboards#index', href: messageboards_path %>
   <%= content_tag :section, class: 'thredded--thredded--main-section thredded--messageboards' 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>
+    <%= define_svg_icons('thredded/follow.svg', 'thredded/lock.svg') %>
     <div class="thredded--messageboards-group">
       <%= render partial: 'thredded/messageboards/messageboard', collection: @messageboard_views %>
     </div>

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

@@ -7,6 +7,8 @@
                  'data-autocomplete-min-length' => Thredded.autocomplete_min_length,
                  'data-thredded-submit-hotkey' => true,
              } do |form| %>
+  <%= hidden_field_tag("next_page", params[:next_page]) %>
+
   <ul class="thredded--form-list on-top">
     <li class="title">
       <%= form.label :title, t('thredded.topics.form.title_label') %>

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

@@ -1,17 +1,20 @@
 <%= content_tag :article,
                 id:    dom_id(topic),
                 class: ['thredded--topics--topic', topic_css_classes(topic)],
-                data: {topic: topic.id, messageboard: topic.messageboard_id} do %>
+                data: {
+                    topic: topic.id,
+                    messageboard: topic.messageboard_id,
+                    unread: !topic.read? || nil,
+                    followed: topic.followed? || nil
+                } do %>
   <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" role="img">
-      <% if topic.followed? %>
-        <use xlink:href="#thredded-follow-icon"></use>
-      <% else %>
-        <use xlink:href="#thredded-unfollow-icon"></use>
-      <% end %>
-    </svg>
+    <% if topic.followed? %>
+      <%= shared_inline_svg "thredded/follow.svg", class: "thredded--topics--follow-icon", role: "img" %>
+    <% else %>
+      <%= shared_inline_svg "thredded/unfollow.svg", class: "thredded--topics--follow-icon", role: "img" %>
+    <% end %>
   </div>
 
   <h1 class="thredded--topics--title">

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

@@ -3,12 +3,12 @@
 <% 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/unfollow.svg', id: 'thredded-unfollow-icon' %>
-  </div>
+  <%= define_svg_icons('thredded/follow.svg', 'thredded/unfollow.svg') %>
 
-  <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
+  <%= content_tag :section,
+                  class: 'thredded--main-section thredded--topics',
+                  'data-thredded-topics' => true,
+                  'data-thredded-topic-posts-per-page' => Thredded.posts_per_page do %>
     <%= render 'thredded/topics/form',
                topic: @new_topic,
                css_class: 'thredded--is-compact',
@@ -16,8 +16,8 @@
     <%= render partial: 'thredded/topics/topic',
                collection: @topics,
                locals: {
-                 sticky_topics_divider: true,
-                 topics: @topics
+                   sticky_topics_divider: true,
+                   topics: @topics
                } %>
   <% end %>
 

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

@@ -7,11 +7,11 @@
 
 <%= thredded_page do %>
   <% if @topics.present? %>
-    <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>
-    <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
+    <%= define_svg_icons('thredded/follow.svg', 'thredded/unfollow.svg') %>
+    <%= content_tag :section,
+                    class: 'thredded--main-section thredded--topics',
+                    'data-thredded-topics' => true,
+                    'data-thredded-topic-posts-per-page' => Thredded.posts_per_page do %>
       <%= render 'thredded/topics/form',
                  topic: @new_topic,
                  css_class: 'thredded--is-compact',

data/db/migrate/20160329231848_create_thredded.rb

@@ -85,7 +85,7 @@ class CreateThredded < Thredded::BaseMigration
 
     create_table :thredded_private_topics do |t|
       t.references :user, type: user_id_type, index: false
-      t.references :last_user, index: false
+      t.references :last_user, type: user_id_type, index: false
       t.text :title, null: false
       t.text :slug, null: false
       t.integer :posts_count, default: 0
@@ -117,7 +117,7 @@ class CreateThredded < Thredded::BaseMigration
 
     create_table :thredded_topics do |t|
       t.references :user, type: user_id_type, index: false
-      t.references :last_user, index: false
+      t.references :last_user, type: user_id_type, index: false
       t.text :title, null: false
       t.text :slug, null: false
       t.references :messageboard, null: false, index: false

data/lib/generators/thredded/install/templates/initializer.rb

@@ -128,9 +128,15 @@ Thredded.layout = 'thredded/application'
 #
 # Rails.application.config.to_prepare do
 #   Thredded::ApplicationController.module_eval do
+#     # Render sign in page:
 #     rescue_from Thredded::Errors::LoginRequired do |exception|
-#       @message = exception.message
-#       render template: 'sessions/new', status: :forbidden
+#       flash.now[:notice] = exception.message
+#       controller = Users::SessionsController.new
+#       controller.request = request
+#       controller.request.env['devise.mapping'] = Devise.mappings[:user]
+#       controller.response = response
+#       controller.response_options = { status: :forbidden }
+#       controller.process(:new)
 #     end
 #   end
 # end

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -792,6 +792,7 @@ files:
 - app/forms/thredded/topic_form.rb
 - app/forms/thredded/user_preferences_form.rb
 - app/helpers/thredded/application_helper.rb
+- app/helpers/thredded/icon_helper.rb
 - app/helpers/thredded/nav_helper.rb
 - app/helpers/thredded/render_helper.rb
 - app/helpers/thredded/urls_helper.rb
@@ -878,6 +879,7 @@ files:
 - app/views/thredded/kaminari/_prev_page.html.erb
 - app/views/thredded/messageboard_groups/new.html.erb
 - app/views/thredded/messageboards/_form.html.erb
+- app/views/thredded/messageboards/_grid_sizers.html.erb
 - app/views/thredded/messageboards/_messageboard.html.erb
 - app/views/thredded/messageboards/_messageboard_actions.html.erb
 - app/views/thredded/messageboards/edit.html.erb