thredded 0.5.1 → 0.6.0

data/app/helpers/thredded/application_helper.rb

@@ -18,12 +18,14 @@ module Thredded
     end
 
     # @param datetime [DateTime]
+    # @param default [String] a string to return if time is nil.
     # @return [String] html_safe datetime presentation
-    def time_ago(datetime)
+    def time_ago(datetime, default: '-')
       timeago_tag datetime,
                   lang: I18n.locale.to_s.downcase,
                   format: -> (t, _opts) { t.year == Time.current.year ? :short : :long },
-                  nojs: true
+                  nojs: true,
+                  default: default
     end
 
     def paginate(collection, args = {})

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

@@ -14,19 +14,24 @@ module Thredded
         # @type [Arel::Table]
         table = arel_table
         # @type [Arel::Nodes::Node]
-        visible_to_all =
+        visible =
           if Thredded.content_visible_while_pending_moderation
+            # All non-blocked content
             table[:moderation_state].not_eq(moderation_states[:blocked])
           else
+            # Only approved content
             table[:moderation_state].eq(moderation_states[:approved])
           end
-        where(
-          if user && !user.thredded_anonymous?
-            visible_to_all.or(table[:user_id].eq(user.id))
-          else
-            visible_to_all
+        if user && !user.thredded_anonymous?
+          # Own content
+          visible = visible.or(table[:user_id].eq(user.id))
+          # Content that one can moderate
+          moderatable_messageboard_ids = user.thredded_can_moderate_messageboards.map(&:id)
+          if moderatable_messageboard_ids.present?
+            visible = visible.or(table[:messageboard_id].in(moderatable_messageboard_ids))
           end
-        )
+        end
+        where(visible)
       end)
     end
 
@@ -41,7 +46,9 @@ module Thredded
 
     # Whether this is visible to the given user based on the moderation state.
     def moderation_state_visible_to_user?(user)
-      moderation_state_visible_to_all? || (!user.thredded_anonymous? && user_id == user.id)
+      moderation_state_visible_to_all? ||
+        (!user.thredded_anonymous? &&
+          (user_id == user.id || user.thredded_can_moderate_messageboards.map(&:id).include?(messageboard_id)))
     end
 
     private

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

@@ -14,6 +14,7 @@ module Thredded
       validates :content, presence: true
 
       scope :order_oldest_first, -> { order(id: :asc) }
+      scope :order_newest_first, -> { order(id: :desc) }
 
       after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
     end

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

@@ -13,7 +13,6 @@ module Thredded
       scope :on_page, -> (page_num) { page(page_num).per(30) }
 
       validates :hash_id, presence: true, uniqueness: true
-      validates :last_user_id, presence: true
       validates :posts_count, numericality: true
 
       before_validation do

data/app/models/thredded/messageboard.rb

@@ -25,8 +25,8 @@ module Thredded
     has_many :user_messageboard_preferences, dependent: :destroy
     has_many :posts, dependent: :destroy
     has_many :topics, dependent: :destroy, inverse_of: :messageboard
-    has_one :latest_topic, -> { order_recently_updated_first },
-            class_name: 'Thredded::Topic'
+
+    belongs_to :last_topic, class_name: 'Thredded::Topic'
 
     has_many :user_details, through: :posts
     has_many :messageboard_users,
@@ -54,8 +54,8 @@ module Thredded
     scope :top_level_messageboards, -> { where(group: nil) }
     scope :by_messageboard_group, ->(group) { where(group: group.id) }
 
-    def latest_user
-      latest_topic.last_user
+    def last_user
+      last_topic.try(:last_user)
     end
 
     def slug_candidates

data/app/models/thredded/post.rb

@@ -21,6 +21,8 @@ module Thredded
     has_many :moderation_records,
              class_name: 'Thredded::PostModerationRecord',
              dependent: :nullify
+    has_one :last_moderation_record, -> { order_newest_first },
+            class_name: 'Thredded::PostModerationRecord'
 
     validates :messageboard_id, presence: true
 

data/app/models/thredded/post_moderation_record.rb

@@ -8,6 +8,8 @@ module Thredded
     end
     validates :previous_moderation_state, presence: true
 
+    scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
+
     belongs_to :messageboard, inverse_of: :post_moderation_records
     validates :messageboard_id, presence: true
     belongs_to :post, inverse_of: :moderation_records
@@ -37,7 +39,7 @@ module Thredded
         post:                      post,
         post_content:              post.content,
         post_user:                 post.user,
-        post_user_name:            post.user.send(Thredded.user_name_column),
+        post_user_name:            post.user.try(:send, Thredded.user_name_column),
         messageboard_id:           post.messageboard_id,
       )
     end

data/app/models/thredded/topic.rb

@@ -63,6 +63,8 @@ module Thredded
              source: :user,
              through: :user_follows
 
+    after_commit :update_messageboard_last_topic, on: [:create, :destroy]
+
     def self.find_by_slug!(slug)
       friendly.find(slug)
     rescue ActiveRecord::RecordNotFound
@@ -107,6 +109,11 @@ module Thredded
       title_changed?
     end
 
+    # @return [Thredded::PostModerationRecord, nil]
+    def last_moderation_record
+      first_post.try(:last_moderation_record)
+    end
+
     private
 
     def slug_candidates
@@ -115,5 +122,15 @@ module Thredded
         [:title, '-topic'],
       ]
     end
+
+    def update_messageboard_last_topic
+      return if messageboard.destroyed?
+      last_topic = if destroyed?
+                     messageboard.topics.order_recently_updated_first.select(:id).first
+                   else
+                     self
+                   end
+      messageboard.update!(last_topic_id: last_topic.try(:id))
+    end
   end
 end

data/app/models/thredded/user_extender.rb

@@ -41,6 +41,13 @@ module Thredded
         opt.has_many :thredded_post_moderation_records, foreign_key: 'post_user_id', inverse_of: :post_user
         opt.has_many :thredded_post_moderated_records, foreign_key: 'moderator_id', inverse_of: :moderator
       end
+
+      scope :left_join_thredded_user_details, (lambda do
+        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)
     end
 
     def thredded_user_preference

data/app/policies/thredded/post_policy.rb

@@ -41,6 +41,8 @@ module Thredded
       @post.postable.first_post != @post && update?
     end
 
+    delegate :moderate?, to: :messageboard_policy
+
     private
 
     def messageboard_policy

data/app/policies/thredded/topic_policy.rb

@@ -21,17 +21,17 @@ module Thredded
     # @param user [Thredded.user_class]
     # @param topic [Thredded::Topic]
     def initialize(user, topic)
-      @user = user
-      @topic = topic
-      @messageboard_user_permission = MessageboardPolicy.new(user, topic.messageboard)
+      @user                = user
+      @topic               = topic
+      @messageboard_policy = MessageboardPolicy.new(user, topic.messageboard)
     end
 
     def create?
-      @messageboard_user_permission.post?
+      @messageboard_policy.post?
     end
 
     def read?
-      @messageboard_user_permission.read? && @topic.moderation_state_visible_to_user?(@user)
+      @messageboard_policy.read? && @topic.moderation_state_visible_to_user?(@user)
     end
 
     def update?
@@ -43,7 +43,7 @@ module Thredded
     end
 
     def moderate?
-      @messageboard_user_permission.moderate?
+      @messageboard_policy.moderate?
     end
   end
 end

data/app/view_models/thredded/post_view.rb

@@ -11,6 +11,7 @@ module Thredded
              :pending_moderation?,
              :approved?,
              :blocked?,
+             :last_moderation_record,
              to: :@post
 
     # @param post [Thredded::PostCommon]
@@ -28,6 +29,10 @@ module Thredded
       @can_destroy ||= @policy.destroy?
     end
 
+    def can_moderate?
+      @can_moderate ||= @policy.moderate?
+    end
+
     def edit_path
       Thredded::UrlsHelper.edit_post_path(@post)
     end
@@ -36,17 +41,30 @@ module Thredded
       Thredded::UrlsHelper.delete_post_path(@post)
     end
 
+    def permalink_path
+      Thredded::UrlsHelper.post_permalink_path(@post.id)
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
     def cache_key
+      moderation_state = unless @post.private_topic_post?
+                           if @post.pending_moderation? && !Thredded.content_visible_while_pending_moderation
+                             'p'
+                           elsif @post.blocked?
+                             '-'
+                           end
+                         end
       [
         I18n.locale,
         @post,
         @post.user,
+        moderation_state || '+',
         [
-          !@post.private_topic_post? && @post.pending_moderation? && !Thredded.content_visible_while_pending_moderation,
           can_update?,
           can_destroy?
         ].map { |p| p ? '+' : '-' } * ''
       ]
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
   end
 end

data/app/view_models/thredded/posts_page_view.rb

@@ -6,6 +6,7 @@ module Thredded
   # A view model for a page of PostViews.
   class PostsPageView
     delegate :to_ary,
+             :present?,
              to: :@post_views
     delegate :total_pages,
              :current_page,

data/app/view_models/thredded/topic_view.rb

@@ -2,7 +2,7 @@
 module Thredded
   # A view model for Topic.
   class TopicView < BaseTopicView
-    delegate :categories, :id,
+    delegate :categories, :id, :blocked?, :last_moderation_record,
              to: :@topic
 
     # @param topic [TopicCommon]
@@ -30,6 +30,10 @@ module Thredded
       ].compact
     end
 
+    def can_moderate?
+      @policy.moderate?
+    end
+
     def edit_path
       Thredded::UrlsHelper.edit_messageboard_topic_path(@topic.messageboard, @topic)
     end

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

@@ -11,11 +11,11 @@
 
     <p class="thredded--messageboard--description"><%= messageboard.description %></p>
 
-    <% if messageboard.latest_topic %>
+    <% if messageboard.last_topic %>
       <p class="thredded--messageboard--byline">
         <%= t 'thredded.messageboard.last_updated_by_html',
-              time_ago: time_ago(messageboard.latest_topic.updated_at),
-              user:     messageboard.latest_user %>
+              time_ago: time_ago(messageboard.last_topic.updated_at),
+              user:     messageboard.last_user %>
       </p>
     <% end %>
   <% end %>

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

@@ -0,0 +1,16 @@
+<% content_for :thredded_main_navigation do %>
+  <nav class="thredded--moderation-navigation">
+    <ul class="thredded--moderation-navigation--items">
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--pending">
+        <%= link_to t('thredded.nav.moderation_pending'), pending_moderation_path %>
+      </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--history">
+        <%= link_to t('thredded.nav.moderation_history'), moderation_history_path %>
+      </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--users">
+        <%= link_to t('thredded.nav.moderation_users'), users_moderation_path %>
+      </li>
+    </ul>
+    <%= render 'users_search_form' %>
+  </nav>
+<% end %>

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

@@ -1,6 +1,13 @@
 <%# @param post [Thredded::PostView] %>
-<%= content_tag :article, id: dom_id(post), class: 'thredded--post' do %>
-  <%= render 'thredded/posts_common/header', post: post %>
+<%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
+  <%= render 'thredded/posts_common/header_with_user_and_topic',
+             post:           post,
+             post_user_link: if post.user
+                               link_to(post.user, user_moderation_path(post.user.id))
+                             else
+                               content_tag :em, t('thredded.null_user_name')
+                             end
+  %>
   <%= render 'thredded/posts_common/content', post: post %>
   <%= render 'thredded/posts_common/actions', post: post %>
   <%= render 'post_moderation_actions', post: post %>

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

@@ -1,20 +1,24 @@
 <%
-  post = post_moderation_record.post
+  record = post_moderation_record
+  post = record.post
+  if post
+    post_view = Thredded::PostView.new(post, policy(post))
+  end
   moderation_state_notice_args = {
-      moderator: user_link(post_moderation_record.moderator),
-      time_ago:  time_ago(post_moderation_record.created_at)
+      moderator: user_link(record.moderator),
+      time_ago:  time_ago(record.created_at)
   }
 %>
-<article class="thredded--post-moderation-record thredded--post-moderation-record-<%= post_moderation_record.moderation_state %>">
+<article class="thredded--post-moderation-record thredded--post-moderation-record-<%= record.moderation_state %>">
   <header class="thredded--post-moderation-record--header">
     <p class="thredded--post-moderation-record--moderation-state-notice">
-      <% if post_moderation_record.approved? %>
+      <% if record.approved? %>
         <%= t('thredded.moderation.post_approved_html', moderation_state_notice_args) %>
-      <% elsif post_moderation_record.blocked? %>
+      <% elsif record.blocked? %>
         <%= t('thredded.moderation.post_blocked_html', moderation_state_notice_args) %>
       <% end %>
     </p>
-    <% if post && post.content != post_moderation_record.post_content %>
+    <% if post && post.content != record.post_content %>
       <p class="thredded--post-moderation-record--content-changed-notice">
         <%= t('thredded.moderation.posts_content_changed_since_moderation_html', post_url: post_permalink_path(post)) %>
       </p>
@@ -22,21 +26,20 @@
     <%= t 'thredded.moderation.post_deleted_notice' unless post %>
   </header>
   <article class="thredded--post">
-    <header>
-      <% if post_moderation_record.post_user %>
-        <%= image_tag Thredded.avatar_url.call(post_moderation_record.post_user), class: 'thredded--post--avatar' %>
-        <h2 class="thredded--post--user"><%= user_link post_moderation_record.post_user %></h2>
+    <% post_user_link = capture do %>
+      <% if post.user %>
+        <%= link_to post.user, user_moderation_path(post.user.id) %>
       <% else %>
-        <h2 class="thredded--post--user">
-          <%= post_moderation_record.post_user_name %>, <em><%= t 'thredded.null_user_name' %></em>
-        </h2>
+        <%= safe_join [record.post_user_name, content_tag(:em, t('thredded.null_user_name'))].compact, ', ' %>
       <% end %>
-      <% if post %>
-        <p class="thredded--post--created-at"><%= time_ago post.created_at %></p>
-      <% end %>
-    </header>
+    <% end %>
+    <% if post %>
+      <%= render 'thredded/posts_common/header_with_user_and_topic', post: post_view, post_user_link: post_user_link %>
+    <% else %>
+      <header><h2 class="thredded--post--user"><%= post_user_link %></h2></header>
+    <% end %>
     <div class="thredded--post--content">
-      <%= Thredded::ContentFormatter.new(self).format_content(post_moderation_record.post_content) %>
+      <%= Thredded::ContentFormatter.new(self).format_content(record.post_content) %>
     </div>
   </article>
   <%= render 'post_moderation_actions', post: post if post %>

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

@@ -0,0 +1,3 @@
+<% user_detail = user.thredded_user_detail %>
+<%= user_detail.moderation_state.to_s.humanize %>
+<%= time_ago user_detail.moderation_state_changed_at, default: '' %>

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

@@ -0,0 +1,7 @@
+<%# @param post [Thredded::PostView] %>
+<%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
+  <%= render 'thredded/posts_common/header_with_topic', post: post %>
+  <%= render 'thredded/posts_common/content', post: post %>
+  <%= render 'thredded/posts_common/actions', post: post %>
+  <%= render 'post_moderation_actions', post: post %>
+<% end %>

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

@@ -0,0 +1,10 @@
+<%= form_tag users_moderation_path, class: 'thredded--form thredded--navigation--search', method: 'get' do %>
+  <%= label_tag :q, t('thredded.moderation.search_users.form_label') %>
+  <%= text_field_tag :q, @query,
+                     type:        'search',
+                     required:    true,
+                     # If there are no results the user will likely want to change the query, so auto-focus.
+                     autofocus:   @query.presence && !@users.presence,
+                     placeholder: t('thredded.moderation.search_users.form_placeholder') %>
+  <button type="submit"><%= t 'thredded.search.form.btn_submit' %></button>
+<% end %>

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

@@ -1,13 +1,7 @@
 <% content_for :thredded_page_title,
                safe_join([t('thredded.nav.moderation'), t('thredded.nav.moderation_history')], ': ') %>
-<% content_for :thredded_page_id, 'thredded--pending-moderation' %>
-<% content_for :thredded_breadcrumbs do %>
-  <ul class="thredded--navigation-breadcrumbs">
-    <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
-    <li><%= link_to t('thredded.nav.moderation'), pending_moderation_path %></li>
-    <li><%= link_to t('thredded.nav.moderation_history'), moderation_history_path %></li>
-  </ul>
-<% end %>
+<% content_for :thredded_page_id, 'thredded--moderation-history' %>
+<%= render 'nav' %>
 
 <%= thredded_page do %>
   <%= content_tag :section, class: 'thredded--main-section' do %>