thredded 0.6.3 → 0.7.0

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

@@ -1,6 +1,6 @@
-<div id="thredded--container" class="thredded--main-container <%= yield(:thredded_page_id) %><%= ' thredded--is-moderator' if moderatable_messageboards_ids.present? %>" data-thredded-page-id="<%= yield(:thredded_page_id) %>">
+<%= content_tag(:div, id: "thredded--container", class: thredded_container_classes, data: thredded_container_data) do %>
   <%= render 'thredded/shared/header' %>
   <%= render 'thredded/shared/flash_messages' %>
   <%= yield :thredded_page_content %>
   <%= render 'thredded/shared/currently_online' %>
-</div>
+<%- end %>

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

@@ -0,0 +1,12 @@
+<% if Thredded.show_topic_followers %>
+  <div class="thredded--topic-followers">
+    <% if topic.followers.present? %>
+      <%= t('thredded.topics.followed_by')%>
+      <% topic.followers.each do |user| %>
+        <%= user_mention(user) %>
+      <% end %>
+    <% else %>
+      <%= t('thredded.topics.followed_by_noone')%>
+    <% end %>
+  </div>
+<% end %>

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

@@ -9,19 +9,20 @@
     <%= link_to t('thredded.topics.edit'), topic.edit_path,
                 class: 'thredded--topic-header--edit-topic' %>
   <% end %>
-  <% if current_user %>
-    <% if follow = current_user.following?(topic)%>
-      <div class="thredded--topic-follow-info thredded--following">
-        <p>
-          <% # i18n-tasks-use t('thredded.topics.following.manual') t('thredded.topics.following.posted') t('thredded.topics.following.mentioned') %>
-          <%= t("thredded.topics.following.#{follow.reason}") %></p>
-        <%= t('thredded.topics.following_will_receive_emails') %>
-        <%= button_to 'Stop following', topic.unfollow_path %>
+  <% if thredded_current_user %>
+    <% if topic.followed? %>
+      <div class="thredded--topic-header--follow-info">
+        <%= inline_svg 'thredded/follow.svg', class: 'thredded--topic-header--follow-icon' %>
+        <div>
+          <%= topic_follow_reason_text topic.follow_reason %>
+          <%= button_to 'Stop following', topic.unfollow_path %>
+        </div>
       </div>
     <% else %>
-      <div class="thredded--topic-follow-info thredded--notfollowing">
+      <div class="thredded--topic-header--follow-info">
         <%= button_to 'Follow this topic', topic.follow_path %>
       </div>
     <% end %>
   <% end %>
+  <%= render partial: 'thredded/topics/followers', locals: {topic: topic} %>
 </header>

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

@@ -1,8 +1,19 @@
 <%= content_tag :article,
                 id:    dom_id(topic),
-                class: ['thredded--topics--topic', topic_css_classes(topic)] do %>
+                class: ['thredded--topics--topic', topic_css_classes(topic)],
+                data: {topic: topic.id, messageboard: topic.messageboard_id} 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" viewBox="0 0 116 121" role="img">
+      <% if topic.followed? %>
+        <use xlink:href="#thredded-follow-icon"/>
+      <% else %>
+        <use xlink:href="#thredded-unfollow-icon"/>
+      <% end %>
+    </svg>
+  </div>
+
   <h1 class="thredded--topics--title">
     <%= link_to topic.title, topic.path %>
   </h1>
@@ -14,7 +25,7 @@
   <% end %>
 
   <cite class="thredded--topics--updated-by">
-    <%= time_ago topic.updated_at %>
+    <%= time_ago topic.last_post_at %>
     <%= user_link topic.last_user %>
   </cite>
 

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

@@ -3,6 +3,11 @@
 <% 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>
+
   <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
     <%= render 'thredded/topics/form',
                messageboard: messageboard,

data/app/views/thredded/users/_link.html.erb

@@ -1,8 +1,8 @@
 <% if user %>
   <% if !user.thredded_anonymous? %>
-<a href="<%= user_path(user) %>"><%= user.to_s %></a>
+<a href="<%= user_path(user) %>"><%= user.thredded_display_name %></a>
   <% else %>
-<%= user.to_s %>
+<%= user.thredded_display_name %>
   <% end %>
 <% else %>
 <em><%= t 'thredded.null_user_name' %></em>

data/config/locales/en.yml

@@ -1,7 +1,9 @@
 ---
 en:
   thredded:
-    recent_activity: Recent activity
+    content_moderation_states:
+      content_blocked_notice: Blocked
+      content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
@@ -9,9 +11,6 @@ en:
       private_topic_not_found: This private topic does not exist.
     form:
       update: Update
-    content_moderation_states:
-      content_blocked_notice: Blocked
-      content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
     messageboard:
       create: Create a New Messageboard
       form:
@@ -24,7 +23,7 @@ en:
       updated_notice: Messageboard has been updated
     messageboard_group:
       create: Create a New Messageboard Group
-      created_notice: Messageboard group has been created
+      saved: Messageboard Group %{name} created
     moderation:
       approve_btn: Approve
       block_btn: Block
@@ -41,8 +40,8 @@ en:
       search_users:
         form_label: Search users
         form_placeholder: :thredded.moderation.search_users.form_label
-        results_message: Users with names starting with %{query}
         no_results_message: No users with name starting with %{query}
+        results_message: Users with names starting with %{query}
     nav:
       all_messageboards: All Messageboards
       edit_messageboard: Edit Messageboard
@@ -51,10 +50,10 @@ en:
       edit_topic: Edit
       mark_all_read: Mark All As Read
       moderation: Moderation
+      moderation_activity: Activity
       moderation_history: History
       moderation_pending: Pending
       moderation_users: Users
-      moderation_activity: Activity
       private_topics: Private Messages
       settings: Notification Settings
     null_user_name: Deleted user
@@ -111,6 +110,7 @@ en:
         create_btn: Start your first private conversation
         title: You have no private messages.
       updated_notice: Title updated
+    recent_activity: Recent activity
     search:
       form:
         btn_submit: :thredded.search.form.label
@@ -121,12 +121,13 @@ en:
       delete_topic: Delete Topic
       deleted_notice: Topic deleted
       edit: Edit Topic
+      followed_by: 'Followed by:'
+      followed_by_noone: No one is following this topic
       followed_notice: You are now following this topic
       following:
         manual: You are following this topic.
         mentioned: You are following this topic because you were mentioned on it.
         posted: You are following this topic because you posted to it.
-      following_will_receive_emails: You will receive email updates.
       form:
         categories_placeholder: Categories
         content_label: :thredded.posts.form.content_label
@@ -134,6 +135,7 @@ en:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Start a New Topic
         update_btn: Update Topic
+      not_following: You are not following this topic.
       search:
         no_results_message: There are no results for your search - %{query}
         page_title: Topics Search Results
@@ -142,16 +144,16 @@ en:
       unfollowed_notice: You are no longer following this topic
       updated_notice: Topic updated
     users:
-      last_active_html: "Last active %{time_ago}"
-      posted_in_topic_html: "Posted in %{topic_link}"
+      last_active_html: Last active %{time_ago}
+      posted_in_topic_html: Posted in %{topic_link}
+      posts_count:
+        one: Posted once
+        other: Posted %{count} times
       recent_activity: :thredded.recent_activity
-      started_topic_html: "Started %{topic_link}"
+      started_topic_html: Started %{topic_link}
+      started_topics_count:
+        one: Started one topic
+        other: Started %{count} topics
       user_posted_in_topic_html: "%{user_link} posted in %{topic_link}"
-      user_since_html: "User since %{time_ago}"
+      user_since_html: User since %{time_ago}
       user_started_topic_html: "%{user_link} started %{topic_link}"
-      started_topics_count:
-        one: "Started one topic"
-        other: "Started %{count} topics"
-      posts_count:
-        one: "Posted once"
-        other: "Posted %{count} times"

data/config/locales/pt-BR.yml

@@ -23,7 +23,7 @@ pt-BR:
       updated_notice: Fórum de mensagem foi atualizado
     messageboard_group:
       create: Criar um novo grupo de mensagens
-      created_notice: Grupo de mensagens foi criado
+      saved: Groupo de mensagens %{name} salvou
     moderation:
       approve_btn: Aprovar
       block_btn: Quadra
@@ -34,8 +34,9 @@ pt-BR:
       post_approved_html: Pós aprovado por %{moderator} %{time_ago}.
       post_blocked_html: Pós bloqueado por %{moderator} %{time_ago}.
       post_deleted_notice: Este post foi apagado.
-      posts_content_changed_since_moderation_html: O <a href="%{post_url}">de pós</a> alteração de conteúdo, uma
-        vez que foi moderado. Abaixo está o conteúdo no momento em que foi moderado.
+      posts_content_changed_since_moderation_html: >-
+        O <a href="%{post_url}">de pós</a> alteração de conteúdo, uma vez que foi moderado. Abaixo está o conteúdo
+        no momento em que foi moderado.
       search_users:
         form_label: Buscar usuários
         form_placeholder: :thredded.moderation.search_users.form_label
@@ -72,13 +73,15 @@ pt-BR:
       form:
         global_preferences_label: Configurações Globais
         messageboard_notify_on_mention:
-          hint: 'Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você
-            irá receber um e-mail com o conteúdo deste post.'
+          hint: >-
+            Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você irá receber
+            um e-mail com o conteúdo deste post.
           label: :thredded.preferences.form.notify_on_mention.label
         messageboard_preferences_label_html: Configurações de Notificação para <em>%{messageboard}</em>
         notify_on_mention:
-          hint: 'Quando alguém mencionar você através do seu usuário (ex.: @sam) você irá receber um e-mail com
-            o conteúdo deste post.'
+          hint: >-
+            Quando alguém mencionar você através do seu usuário (ex.: @sam) você irá receber um e-mail com o conteúdo
+            deste post.
           label: "@ Notificações"
         notify_on_message:
           hint: Quando você for adicionado a uma conversa privada, você receberá um e-mail com o conteúdo desta
@@ -119,12 +122,13 @@ pt-BR:
       delete_topic: Remover Tópico
       deleted_notice: Tópico removido
       edit: Editar Tópico
+      followed_by: 'Seguido por:'
+      followed_by_noone: Ninguém está seguindo este tópico
       followed_notice: Você agora está acompanhando este tópico
       following:
         manual: Você está acompanhando este tópico.
         mentioned: Você está acompanhando este tópico porque você foi mencionado nele.
         posted: Você está acompanhando este tópico porque foi você que o publicou.
-      following_will_receive_emails: Você irá receber e-mail com atualizações.
       form:
         categories_placeholder: Categorias
         content_label: :thredded.posts.form.content_label
@@ -132,6 +136,7 @@ pt-BR:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Iniciar um novo tópico
         update_btn: Atualizar Tópico
+      not_following: Você não está seguindo este tema.
       search:
         no_results_message: Nenhum resultado encontrado para sua busca - %{query}
         page_title: Tópicos dos Resultados da Busca
@@ -140,7 +145,7 @@ pt-BR:
       unfollowed_notice: Você não está mais acompanhando este tópico
       updated_notice: Tópico atualizado
     users:
-      last_active_html: "Última %{time_ago} ativa"
+      last_active_html: Última %{time_ago} ativa
       posted_in_topic_html: Postou em %{topic_link}
       posts_count:
         one: Postado uma vez

data/db/migrate/20160329231848_create_thredded.rb

@@ -37,6 +37,7 @@ class CreateThredded < ActiveRecord::Migration
       t.text :description
       t.integer :topics_count, default: 0
       t.integer :posts_count, default: 0
+      t.integer :position, null: false
       t.boolean :closed, default: false, null: false
       t.references :last_topic
       t.references :messageboard_group
@@ -88,6 +89,7 @@ class CreateThredded < ActiveRecord::Migration
       t.string :slug, limit: 191, null: false
       t.integer :posts_count, default: 0
       t.string :hash_id, limit: 191, null: false
+      t.datetime :last_post_at
       t.timestamps null: false
       t.index [:hash_id], name: :index_thredded_private_topics_on_hash_id
       t.index [:slug], name: :index_thredded_private_topics_on_slug
@@ -120,6 +122,7 @@ class CreateThredded < ActiveRecord::Migration
       t.string :hash_id, limit: 191, null: false
       t.string :type, limit: 191
       t.integer :moderation_state, null: false
+      t.datetime :last_post_at
       t.timestamps null: false
       t.index %i(moderation_state sticky updated_at),
               order: { sticky: :desc, updated_at: :desc },
@@ -188,6 +191,7 @@ class CreateThredded < ActiveRecord::Migration
 
     create_table :thredded_messageboard_groups do |t|
       t.string :name
+      t.integer :position, null: false
       t.timestamps null: false
     end
 

data/db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb

@@ -4,7 +4,7 @@ class UpgradeV05ToV06 < ActiveRecord::Migration
     add_column :thredded_messageboards, :last_topic_id, :integer
     Thredded::Messageboard.reset_column_information
     Thredded::Messageboard.all.each do |messageboard|
-      messageboard.update!(last_topic_id: messageboard.topics.order_recently_updated_first.first.try(:id))
+      messageboard.update!(last_topic_id: messageboard.topics.order(updated_at: :desc, id: :desc).first.try(:id))
     end
     change_column_null :thredded_posts, :postable_id, false
     # Allow null on user_id and last_user_id because users can get deleted.

data/db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+class UpgradeV06ToV07 < ActiveRecord::Migration
+  def up
+    Thredded::MessageboardGroup.transaction do
+      Thredded::MessageboardGroup.where(
+        name: Thredded::MessageboardGroup.group(:name).having('count(id) > 1').select(:name)
+      ).group_by(&:name).each_value do |messageboard_groups|
+        messageboard_groups.from(1).each_with_index do |messageboard_group, i|
+          messageboard_group.update!(name: "#{messageboard_group.name}-#{i + 1}")
+        end
+      end
+    end
+
+    add_index :thredded_messageboard_groups,
+              :name,
+              unique: true,
+              name: :index_thredded_messageboard_group_on_name
+
+    add_column :thredded_topics, :last_post_at, :datetime
+    add_column :thredded_private_topics, :last_post_at, :datetime
+    # update existing values to pretty accurate match
+    Thredded::Topic.update_all('last_post_at = updated_at')
+    Thredded::PrivateTopic.update_all('last_post_at = updated_at')
+
+    add_column :thredded_messageboards, :position, :integer
+    Thredded::Messageboard.reset_column_information
+    Thredded::Messageboard.all.each { |m| m.update_column(:position, m.created_at.to_i) }
+    change_column :thredded_messageboards, :position, :integer, null: false
+
+    add_column :thredded_messageboard_groups, :position, :integer
+    Thredded::MessageboardGroup.reset_column_information
+    Thredded::MessageboardGroup.all.each { |mg| mg.update_column(:position, mg.created_at.to_i) }
+    change_column :thredded_messageboard_groups, :position, :integer, null: false
+  end
+
+  def down
+    remove_index :thredded_messageboard_groups, name: :index_thredded_messageboard_group_on_name
+    remove_column :thredded_topics, :last_post_at
+    remove_column :thredded_private_topics, :last_post_at
+    remove_column :thredded_messageboards, :position
+    remove_column :thredded_messageboard_groups, :position
+  end
+end

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

@@ -11,6 +11,10 @@ Thredded.user_class = 'User'
 # This is the column used to search for users' names if/when someone is @ mentioned.
 Thredded.user_name_column = :name
 
+# User display name method, by default thredded uses the user_name_column defined above
+# You may want to use :to_s or some more elaborate method
+# Thredded.user_display_name_method = :to_s
+
 # The path (or URL) you will use to link to your users' profiles.
 # When linking to a user, Thredded will use this lambda to spit out
 # the path or url to your user. This lambda is evaluated in the view context.
@@ -37,9 +41,20 @@ Thredded.admin_column = :admin
 # Whether posts and topics pending moderation are visible to regular users.
 Thredded.content_visible_while_pending_moderation = true
 
+# Whether users that are following a topic are listed on topic page.
+Thredded.show_topic_followers = false
+
 # This model can be customized further by overriding a handful of methods on the User model.
 # For more information, see app/models/thredded/user_extender.rb.
 
+# ==> Ordering configuration
+
+# How to calculate the position of messageboards in a list:
+# :position            (default) set the position manually (new messageboards go to the bottom, by creation timestamp)
+# :last_post_at_desc   most recent post first
+# :topics_count_desc   most topics first
+Thredded.messageboards_order = :position
+
 # ==> Email Configuration
 # Email "From:" field will use the following
 # Thredded.email_from = 'no-reply@example.com'

data/lib/html/pipeline/at_mention_filter.rb

@@ -44,7 +44,7 @@ module HTML
         names = mentioned_names(text_node_html)
         return unless names.present?
         @users_provider.call(names).each do |user|
-          name = user.to_s
+          name = user.thredded_display_name
           maybe_quoted_name = name.include?(' ') ? %("#{name}") : name
           url = Thredded.user_path(@view_context, user)
           text_node_html.gsub!(

data/lib/thredded.rb

@@ -33,7 +33,9 @@ module Thredded
     :email_outgoing_prefix,
     :email_reply_to,
     :layout,
+    :messageboards_order,
     :user_class,
+    :user_display_name_method,
     :user_name_column,
     :user_path
 
@@ -49,6 +51,12 @@ module Thredded
   # @return [Boolean] Whether posts that are pending moderation are visible to regular users.
   mattr_accessor :content_visible_while_pending_moderation
 
+  # @return [Boolean] Whether users that are following a topic are listed on topic page.
+  mattr_accessor :show_topic_followers
+
+  # @return [Symbol] The name of the method used by Thredded to display users
+  mattr_accessor :user_display_name_method
+
   self.active_user_threshold = 5.minutes
   self.admin_column = :admin
   self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
@@ -57,6 +65,22 @@ module Thredded
   self.moderator_column = :admin
   self.user_name_column = :name
   self.content_visible_while_pending_moderation = true
+  self.show_topic_followers = false
+  self.messageboards_order = :position
+
+  def self.user_display_name_method
+    @@user_display_name_method || user_name_column
+  end
+
+  # @param value [:position, :topics_count_desc, :last_post_at_desc]
+  def self.messageboards_order=(value)
+    case value
+    when :position, :topics_count_desc, :last_post_at_desc
+      @@messageboards_order = value # rubocop:disable Style/ClassVars
+    else
+      fail ArgumentError, "Unexpected value for Thredded.messageboards_order: #{value}"
+    end
+  end
 
   # @return [Class<Thredded::UserExtender>] the user class from the host application.
   def self.user_class