thredded 0.7.0 → 0.8.2

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -84,7 +84,6 @@ MARKDOWN
           name:         'A test messageboard',
           slug:         'a-test-messageboard',
           description:  'Test messageboard description',
-          closed:       false,
           created_at:   1.month.ago,
           id:           1 + rand(1334),
           posts_count:  rand(1337),

data/app/mailers/thredded/post_mailer.rb

@@ -10,7 +10,6 @@ module Thredded
       mail from:     email_details.no_reply,
            to:       email_details.no_reply,
            bcc:      emails,
-           reply_to: email_details.reply_to,
            subject:  email_details.subject
     end
   end

data/app/mailers/thredded/private_topic_mailer.rb

@@ -10,7 +10,6 @@ module Thredded
       mail from:     email_details.no_reply,
            to:       email_details.no_reply,
            bcc:      emails,
-           reply_to: email_details.reply_to,
            subject:  email_details.subject
     end
   end

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

@@ -23,8 +23,8 @@ module Thredded
         # 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.updated_at
-        state.update!(read_at: post.updated_at, page: post_page)
+        return unless !state.read_at? || state.read_at < post.created_at
+        state.update!(read_at: post.created_at, page: post_page)
       end
 
       def read_on_first_post!(user, topic)

data/app/models/thredded/messageboard.rb

@@ -56,7 +56,6 @@ module Thredded
 
     has_many :post_moderation_records, inverse_of: :messageboard, dependent: :delete_all
 
-    default_scope { where(closed: false) }
     # rubocop:disable Style/Lambda
     scope :top_level_messageboards, -> { where(group: nil) }
     scope :by_messageboard_group, ->(group) { where(group: group.id) }

data/app/models/thredded/null_preference.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 module Thredded
   class NullPreference
-    def notify_on_mention
+    def follow_topics_on_mention
       true
     end
 
     def notify_on_message
       true
     end
+
+    def followed_topic_emails
+      true
+    end
   end
 end

data/app/models/thredded/private_post.rb

@@ -43,13 +43,13 @@ module Thredded
     def update_parent_last_user_and_timestamp
       return if postable.destroyed?
       last_post = if destroyed?
-                    postable.posts.order_oldest_first.select(:user_id, :updated_at).last
+                    postable.posts.order_oldest_first.select(:user_id, :created_at).last
                   else
                     self
                   end
       postable.update_columns(
         last_user_id: last_post.user_id,
-        last_post_at: last_post.updated_at,
+        last_post_at: last_post.created_at,
         updated_at: Time.zone.now
       )
     end

data/app/policies/thredded/messageboard_group_policy.rb

@@ -2,7 +2,7 @@
 module Thredded
   class MessageboardGroupPolicy
     # @param user [Thredded.user_class]
-    # @param messageboard_group [Thredded::MessageboardGroup]
+    # @param group [Thredded::MessageboardGroup]
     def initialize(user, group)
       @user = user
       @group = group

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+require_dependency 'thredded/view_hooks/config'
+require_dependency 'thredded/view_hooks/renderer'
+
+module Thredded
+  class AllViewHooks
+    # @return [PostForm]
+    attr_reader :post_form
+    # @return [ModerationUserPage]
+    attr_reader :moderation_user_page
+
+    @instance = nil
+    class << self
+      # @return [Thredded::AllViewHooks]
+      attr_reader :instance
+
+      # Called when the class is reloaded so that server restart is not required
+      # when changing view hooks in development.
+      def reset_instance!
+        @instance = Thredded::AllViewHooks.new
+      end
+    end
+
+    def initialize
+      @post_form = PostForm.new
+      @moderation_user_page = ModerationUserPage.new
+    end
+
+    class PostForm
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :content_text_area
+
+      def initialize
+        @content_text_area = ViewHook.new
+      end
+    end
+
+    class ModerationUserPage
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :user_title
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :user_info
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :user_moderation_actions
+
+      def initialize
+        @user_title = ViewHook.new
+        @user_info = ViewHook.new
+        @user_moderation_actions = ViewHook.new
+      end
+    end
+
+    # Contains the view hook content and can render a view hook.
+    class ViewHook
+      # @return [Thredded::ViewHooks::Config]
+      attr_reader :config
+
+      def initialize
+        @config = Thredded::ViewHooks::Config.new
+      end
+
+      # @return [String]
+      def render(view_context, **args, &block)
+        Thredded::ViewHooks::Renderer.new(view_context, @config).render(**args, &block)
+      end
+    end
+  end
+end

data/app/view_models/thredded/post_view.rb

@@ -56,14 +56,14 @@ module Thredded
                          end
       [
         I18n.locale,
-        @post,
-        @post.user,
+        @post.cache_key,
+        @post.user ? @post.user.cache_key : 'users/nil',
         moderation_state || '+',
         [
           can_update?,
           can_destroy?
         ].map { |p| p ? '+' : '-' } * ''
-      ]
+      ].join('/')
     end
     # rubocop:enable Metrics/CyclomaticComplexity
   end

data/app/view_models/thredded/topic_email_view.rb

@@ -14,10 +14,6 @@ module Thredded
       "#{Thredded.email_outgoing_prefix} #{@topic.title}"
     end
 
-    def reply_to
-      Thredded.email_reply_to.call(@topic)
-    end
-
     def no_reply
       Thredded.email_from
     end

data/app/view_models/thredded/topics_page_view.rb

@@ -16,10 +16,21 @@ module Thredded
     # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>]
     # @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
+      @topics_page_scope = refine_scope(topics_page_scope)
       @topic_views = @topics_page_scope.with_read_and_follow_states(user).map do |(topic, read_state, follow)|
         topic_view_class.new(topic, read_state, follow, Pundit.policy!(user, topic))
       end
     end
+
+    protected
+
+    def refine_scope(topics_page_scope)
+      scope = topics_page_scope.includes(:categories, :last_user, :user)
+      if Thredded.show_topic_followers
+        scope.includes(:followers)
+      else
+        scope
+      end
+    end
   end
 end

data/app/views/layouts/thredded/application.html.erb

@@ -3,9 +3,12 @@
   <head>
     <title>Thredded | <%= yield :thredded_page_title %></title>
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
-    <%= stylesheet_link_tag 'thredded' %>
+    <%= stylesheet_link_tag 'thredded', 'data-turbolinks-track': 'reload' %>
     <%= csrf_meta_tag %>
-    <%= javascript_include_tag 'thredded' %>
+    <%= javascript_include_tag 'thredded',
+                               async: !Rails.application.config.assets.debug,
+                               defer: true,
+                               'data-turbolinks-track': 'reload'%>
     <%== Gravatar.prefetch_dns %>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
   </head>

data/app/views/thredded/messageboard_groups/new.html.erb

@@ -2,7 +2,9 @@
 <% content_for :thredded_page_id, 'thredded--messageboard-groups-new' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= t('thredded.messageboard_group.create') %></li>
+    <li class="thredded--navigation-breadcrumbs--item-no-link">
+      <%= t('thredded.messageboard_group.create') %>
+    </li>
   </ul>
 <% end %>
 

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

@@ -2,7 +2,9 @@
 <% content_for :thredded_page_id, 'thredded--messageboard-edit' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= t('thredded.nav.edit_messageboard') %></li>
+    <li class="thredded--navigation-breadcrumbs--item-no-link">
+      <%= t('thredded.nav.edit_messageboard') %>
+    </li>
   </ul>
 <% end %>
 

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

@@ -2,7 +2,9 @@
 <% content_for :thredded_page_id, 'thredded--messageboards-new' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= t('thredded.messageboard.create') %></li>
+    <li class="thredded--navigation-breadcrumbs--item-no-link">
+      <%= t('thredded.messageboard.create') %>
+    </li>
   </ul>
 <% end %>
 

data/app/views/thredded/moderation/_users_search_form.html.erb

@@ -1,4 +1,7 @@
-<%= form_tag users_moderation_path, class: 'thredded--form thredded--navigation--search', method: 'get' do %>
+<%= form_tag users_moderation_path,
+             method: 'get',
+             class: 'thredded--form thredded--navigation--search',
+             'data-thredded-turboform' => true do %>
   <%= label_tag :q, t('thredded.moderation.search_users.form_label') %>
   <%= text_field_tag :q, @query,
                      type:        'search',

data/app/views/thredded/moderation/user.html.erb

@@ -6,34 +6,40 @@
 <% content_for :thredded_page_id, 'thredded--moderation-user' %>
 <%= render 'nav' %>
 <%= thredded_page do %>
-  <h1 class="thredded--moderation--user--title">
-    <%= image_tag Thredded.avatar_url.call(user), class: 'thredded--user--avatar' %><%= user.thredded_display_name %>
-  </h1>
-  <ul class="thredded--moderation--user--info">
-    <li><%= t 'thredded.users.user_since_html', time_ago: time_ago(user.created_at) %></li>
-    <% if user_detail.last_seen_at %>
-      <li><%= t 'thredded.users.last_active_html', time_ago: time_ago(user_detail.last_seen_at) %></li>
-    <% end %>
-    <% if user_detail.topics_count > 0 %>
-      <li><%= t 'thredded.users.started_topics_count', count: user_detail.topics_count %></li>
-    <% end %>
-    <% if user_detail.posts_count > 0 %>
-      <li><%= t 'thredded.users.posts_count', count: user_detail.posts_count %></li>
-    <% end %>
-    <li><%= render 'user_moderation_state', user: @user %></li>
-  </ul>
-  <div class="thredded--user--moderation-actions">
-    <% unless user_detail.approved? %>
-      <%= button_to t('thredded.moderation.approve_btn'), moderate_user_path,
-                    class:  'thredded--button',
-                    params: { id: user.to_model.id, moderation_state: 'approved' } %>
-    <% end %>
-    <% unless user_detail.blocked? %>
-      <%= button_to t('thredded.moderation.block_btn'), moderate_user_path,
-                    class:  'thredded--button',
-                    params: { id: user.to_model.id, moderation_state: 'blocked' } %>
-    <% end %>
-  </div>
+  <%= view_hooks.moderation_user_page.user_title.render self, user: user do %>
+    <h1 class="thredded--moderation--user--title">
+      <%= image_tag Thredded.avatar_url.call(user), class: 'thredded--user--avatar' %><%= user.thredded_display_name %>
+    </h1>
+  <% end %>
+  <%= view_hooks.moderation_user_page.user_info.render self, user: user do %>
+    <ul class="thredded--moderation--user--info">
+      <li><%= t 'thredded.users.user_since_html', time_ago: time_ago(user.created_at) %></li>
+      <% if user_detail.last_seen_at %>
+        <li><%= t 'thredded.users.last_active_html', time_ago: time_ago(user_detail.last_seen_at) %></li>
+      <% end %>
+      <% if user_detail.topics_count > 0 %>
+        <li><%= t 'thredded.users.started_topics_count', count: user_detail.topics_count %></li>
+      <% end %>
+      <% if user_detail.posts_count > 0 %>
+        <li><%= t 'thredded.users.posts_count', count: user_detail.posts_count %></li>
+      <% end %>
+      <li><%= render 'user_moderation_state', user: @user %></li>
+    </ul>
+  <% end %>
+  <%= view_hooks.moderation_user_page.user_moderation_actions.render self, user: user do %>
+    <div class="thredded--user--moderation-actions">
+      <% unless user_detail.approved? %>
+        <%= button_to t('thredded.moderation.approve_btn'), moderate_user_path,
+                      class:  'thredded--button',
+                      params: { id: user.to_model.id, moderation_state: 'approved' } %>
+      <% end %>
+      <% unless user_detail.blocked? %>
+        <%= button_to t('thredded.moderation.block_btn'), moderate_user_path,
+                      class:  'thredded--button',
+                      params: { id: user.to_model.id, moderation_state: 'blocked' } %>
+      <% end %>
+    </div>
+  <% end %>
   <% if @posts.present? %>
     <h2><%= t 'thredded.users.recent_activity' %></h2>
     <%= render partial: 'user_post', collection: @posts, as: :post %>

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

@@ -1,5 +1,10 @@
 <%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
-             html: { class: 'thredded--form thredded--post-form', 'data-thredded-post-form' => true } do |form| %>
+             html: {
+                 class: 'thredded--form thredded--post-form',
+                 'data-thredded-post-form' => true,
+                 'data-autocomplete-url' => autocomplete_users_path,
+                 'data-autocomplete-min-length' => Thredded.autocomplete_min_length,
+             } do |form| %>
   <ul class="thredded--form-list">
     <%= render 'thredded/posts_common/form/content_field', form: form, content_label: content_label %>
 

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

@@ -1,6 +1,8 @@
 <li>
   <%= form.label :content, content_label %>
-  <%= render 'thredded/posts_common/form/before_content', form: form %>
-  <%= form.text_area :content, { rows: 5, required: true }  %>
-  <%= render 'thredded/posts_common/form/after_content', form: form %>
+  <%= view_hooks.post_form.content_text_area.render self, form: form, content_label: content_label do %>
+      <%= render 'thredded/posts_common/form/before_content', form: form %>
+      <%= form.text_area :content, {rows: 5, required: true} %>
+      <%= render 'thredded/posts_common/form/after_content', form: form %>
+  <% end %>
 </li>

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

@@ -10,20 +10,29 @@
   <h3><%= t 'thredded.preferences.form.global_preferences_label' %></h3>
   <ul class="thredded--form-list">
     <li>
-      <%= f.label :notify_on_message do %>
-        <%= f.check_box :notify_on_message %>
-        <%= t 'thredded.preferences.form.notify_on_message.label' %>
+      <%= f.label :follow_topics_on_mention do %>
+        <%= f.check_box :follow_topics_on_mention %>
+        <%= t 'thredded.preferences.form.follow_topics_on_mention.label' %>
         <p class="thredded--form-list--hint">
-          <%= t 'thredded.preferences.form.notify_on_message.hint' %>
+          <%= t 'thredded.preferences.form.follow_topics_on_mention.hint' %>
+        </p>
+      <% end %>
+    </li>
+    <li>
+      <%= f.label :followed_topic_emails do %>
+        <%= f.check_box :followed_topic_emails %>
+        <%= t 'thredded.preferences.form.followed_topic_emails.label' %>
+        <p class="thredded--form-list--hint">
+          <%= t 'thredded.preferences.form.followed_topic_emails.hint' %>
         </p>
       <% end %>
     </li>
     <li>
-      <%= f.label :notify_on_mention do %>
-        <%= f.check_box :notify_on_mention %>
-        <%= t 'thredded.preferences.form.notify_on_mention.label' %>
+      <%= f.label :notify_on_message do %>
+        <%= f.check_box :notify_on_message %>
+        <%= t 'thredded.preferences.form.notify_on_message.label' %>
         <p class="thredded--form-list--hint">
-          <%= t 'thredded.preferences.form.notify_on_mention.hint' %>
+          <%= t 'thredded.preferences.form.notify_on_message.hint' %>
         </p>
       <% end %>
     </li>
@@ -34,11 +43,20 @@
     </h3>
     <ul class="thredded--form-list" data-thredded-user-preferences-form-messageboard-fields>
       <li>
-        <%= f.label :messageboard_notify_on_mention do %>
-          <%= f.check_box :messageboard_notify_on_mention %>
-          <%= t 'thredded.preferences.form.messageboard_notify_on_mention.label' %>
+        <%= f.label :messageboard_follow_topics_on_mention do %>
+          <%= f.check_box :messageboard_follow_topics_on_mention %>
+          <%= t 'thredded.preferences.form.messageboard_follow_topics_on_mention.label' %>
+          <p class="thredded--form-list--hint">
+            <%= t 'thredded.preferences.form.messageboard_follow_topics_on_mention.hint' %>
+          </p>
+        <% end %>
+      </li>
+      <li>
+        <%= f.label :messageboard_followed_topic_emails do %>
+          <%= f.check_box :messageboard_followed_topic_emails %>
+          <%= t 'thredded.preferences.form.messageboard_followed_topic_emails.label' %>
           <p class="thredded--form-list--hint">
-            <%= t 'thredded.preferences.form.messageboard_notify_on_mention.hint' %>
+            <%= t 'thredded.preferences.form.messageboard_followed_topic_emails.hint' %>
           </p>
         <% end %>
       </li>

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

@@ -10,9 +10,10 @@
     <li>
       <%= form.label :user_ids, t('thredded.private_topics.form.users_label') %>
       <%= form.text_field :user_ids,
-                          placeholder:                 t('thredded.private_topics.form.users_placeholder'),
-                          'data-thredded-users-select' => true,
-                          'data-autocomplete-url'      => autocomplete_users_path %>
+                          placeholder:                   t('thredded.private_topics.form.users_placeholder'),
+                          'data-thredded-users-select'   => true,
+                          'data-autocomplete-url'        => autocomplete_users_path,
+                          'data-autocomplete-min-length' => Thredded.autocomplete_min_length %>
     </li>
 
     <%= render 'thredded/posts_common/form/content_field',