thredded 0.5.1 → 0.6.0

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

@@ -1,16 +1,9 @@
 <% content_for :thredded_page_title, t('thredded.nav.moderation') %>
 <% 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>
-  </ul>
-<% end %>
+<%= render 'nav' %>
 
 <%= thredded_page do %>
   <%= content_tag :section, class: 'thredded--main-section' do %>
-    <%= link_to t('thredded.nav.moderation_history'), moderation_history_path,
-                class: 'thredded--link thredded--moderation--history-link' %>
     <% if @last_moderated_record %>
       <div class="thredded--moderated-notice">
         <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
@@ -21,8 +14,8 @@
       <%= paginate @posts %>
     <% else %>
       <div class="thredded--empty">
-        <h3 class="thredded--empty--title"><%= t 'thredded.moderation.pending_empty.title' %></h3>
-        <p><%= t 'thredded.moderation.pending_empty.content' %></p>
+        <h3 class="thredded--empty--title"><%= t 'thredded.moderation.pending.empty.title' %></h3>
+        <p><%= t 'thredded.moderation.pending.empty.content' %></p>
       </div>
     <% end %>
   <% end %>

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

@@ -0,0 +1,42 @@
+<%
+  user = @user
+  user_detail = user.thredded_user_detail
+%>
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% 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 %>
+  </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>
+  <% if @posts.present? %>
+    <h2><%= t 'thredded.users.recent_activity' %></h2>
+    <%= render partial: 'user_post', collection: @posts, as: :post %>
+    <%= paginate @posts %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,38 @@
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--moderation-users' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <% if @users.present? %>
+    <% if @query.present? %>
+      <p class="thredded--alert thredded--alert-success">
+        <%= t 'thredded.moderation.search_users.results_message', query: "'#{@query}'" %>
+      </p>
+    <% end %>
+    <table class="thredded--moderation--users-table thredded--table">
+      <thead>
+      <tr>
+        <th>User</th>
+        <th>Moderation state</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @users.each do |user| %>
+        <tr>
+          <td>
+            <%= link_to user, user_moderation_path(user.id), class: 'thredded--link' %>
+          </td>
+          <td>
+            <%= render 'user_moderation_state', user: user %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+    <%= paginate @users %>
+  <% else %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= t 'thredded.moderation.search_users.no_results_message', query: "'#{@query}'" %>
+    </p>
+  <% end %>
+<% end %>

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

@@ -5,6 +5,10 @@
     <%= render 'thredded/posts_common/actions', post: post %>
     <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>
       <p class="thredded--alert thredded--alert-warning"><%= t 'thredded.posts.pending_moderation_notice' %></p>
+    <% elsif post.blocked? && post.can_moderate? %>
+      <p class="thredded--alert thredded--alert-danger">
+        <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+      </p>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,3 +1,4 @@
+<%# @param post [Thredded::PostView] %>
 <header>
   <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
   <h2 class="thredded--post--user"><%= user_link post.user %></h2>

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

@@ -0,0 +1,15 @@
+<%# @param post [Thredded::PostView] %>
+<% topic = post.to_model.postable %>
+<header>
+  <h2 class="thredded--post--topic">
+    <%=
+      topic_link = link_to(topic.title, post.permalink_path)
+      if topic.first_post == post.to_model
+        t 'thredded.users.started_topic_html', topic_link: topic_link
+      else
+        t 'thredded.users.posted_in_topic_html', topic_link: topic_link
+      end
+    %>
+  </h2>
+  <p class="thredded--post--created-at"><%= time_ago post.created_at %></p>
+</header>

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

@@ -0,0 +1,18 @@
+<%# @param post [Thredded::PostView] %>
+<%# @param post_user_link [String] optional %>
+<% topic = post.to_model.postable %>
+<% post_user_link ||= user_link(post.user) %>
+<header>
+  <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
+  <h2 class="thredded--post--user-and-topic">
+    <%=
+      topic_link = link_to(topic.title, post.permalink_path)
+      if topic.first_post == post.to_model
+        t 'thredded.users.user_started_topic_html', user_link: post_user_link, topic_link: topic_link
+      else
+        t 'thredded.users.user_posted_in_topic_html', user_link: post_user_link, topic_link: topic_link
+      end
+    %>
+  </h2>
+  <p class="thredded--post--created-at"><%= time_ago post.created_at %></p>
+</header>

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

@@ -1,4 +1,6 @@
-<%= form_tag search_path(messageboard), class: 'thredded--form thredded--navigation--search', method: 'get' do %>
+<%= form_tag search_path(messageboard),
+             method: 'get',
+             class: 'thredded--form thredded--navigation--search thredded--navigation--search-topics' do %>
   <%= label_tag :q, t('thredded.search.form.label') %>
   <%= text_field_tag :q, @query,
                      type:        'search',

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

@@ -0,0 +1,8 @@
+<% # @param moderation_record [Thredded::PostModerationRecord, nil] %>
+<% if moderation_record %>
+  <%= t 'thredded.content_moderation_states.content_blocked_notice_with_record_html',
+        moderator: user_link(moderation_record.moderator),
+        time_ago: time_ago(moderation_record.created_at) %>
+<% else %>
+  <%= t 'thredded.content_moderation_states.content_blocked_notice' %>
+<% end %>

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

@@ -14,8 +14,12 @@
       <%= render 'thredded/shared/nav/standalone' %>
     <% end %>
   </ul>
-  <div class="thredded--main-navigation">
-    <%= yield :thredded_breadcrumbs %>
-    <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
-  </div>
+  <% if content_for? :thredded_main_navigation %>
+    <%= yield :thredded_main_navigation %>
+  <% else %>
+    <div class="thredded--main-navigation">
+      <%= yield :thredded_breadcrumbs %>
+      <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
+    </div>
+  <% end %>
 </nav>

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

@@ -22,4 +22,10 @@
     <%= time_ago topic.created_at %>
     <%= user_link topic.user %>
   </cite>
+
+  <% if topic.blocked? && topic.can_moderate? %>
+    <span class="thredded--topics--moderation-state thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: topic.last_moderation_record %>
+    </span>
+  <% end %>
 <% end %>

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

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

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

@@ -0,0 +1,7 @@
+<%#
+  This partial can be called from the parent app to render the user's posts.
+  The parent view context that renders this partial must include Thredded::ApplicationHelper.
+  TODO: Use a Cell instead. https://github.com/apotonick/cells
+%>
+<%# @param posts [Thredded::PostsPageView] %>
+<%= render partial: 'thredded/users/post', collection: posts %>

data/config/locales/en.yml

@@ -8,6 +8,9 @@ en:
       private_topic_not_found: This private topic does not exist.
     form:
       update: Update
+    content_moderation_states:
+      content_blocked_notice: Blocked by a moderator
+      content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
     messageboard:
       create: Create a New Messageboard
       form:
@@ -23,15 +26,21 @@ en:
     moderation:
       approve_btn: Approve
       block_btn: Block
-      pending_empty:
-        content: All posts have been moderated.
-        title: Good job!
+      pending:
+        empty:
+          content: All posts have been moderated.
+          title: Good job!
       post_approved_html: Post approved by %{moderator} %{time_ago}.
       post_blocked_html: Post blocked by %{moderator} %{time_ago}.
       post_deleted_notice: This post has been deleted.
       posts_content_changed_since_moderation_html: >-
         The <a href="%{post_url}">post's</a> content change since it was moderated. Below is the content at the
         time it was moderated.
+      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}
     nav:
       all_messageboards: All Messageboards
       edit_messageboard: Edit Messageboard
@@ -40,6 +49,8 @@ en:
       edit_topic: Edit
       moderation: Moderation
       moderation_history: History
+      moderation_pending: Pending
+      moderation_users: Users
       private_topics: Private Messages
       settings: Notification Settings
     null_user_name: Deleted user
@@ -126,3 +137,18 @@ en:
       started_by_html: Started %{time_ago} by %{user}
       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}"
+      recent_activity: Recent activity
+      started_topic_html: "Started %{topic_link}"
+      user_posted_in_topic_html: "%{user_link} posted in %{topic_link}"
+      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

@@ -1,6 +1,9 @@
 ---
 pt-BR:
   thredded:
+    content_moderation_states:
+      content_blocked_notice: Bloqueado por um moderador
+      content_blocked_notice_with_record_html: Bloqueados por %{moderator} %{time_ago}
     errors:
       login_required: Por favor, autentique-se primeiro.
       not_authorized: Você não está autorizado a acessar esta página.
@@ -23,15 +26,21 @@ pt-BR:
     moderation:
       approve_btn: Aprovar
       block_btn: Quadra
-      pending_empty:
-        content: Todas as mensagens têm sido moderadas.
-        title: Bom trabalho!
+      pending:
+        empty:
+          content: Todas as mensagens têm sido moderadas.
+          title: Bom trabalho!
       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.
+      search_users:
+        form_label: Buscar usuários
+        form_placeholder: :thredded.moderation.search_users.form_label
+        no_results_message: Nenhum usuário com o nome começando com %{query}
+        results_message: Os usuários com nomes começando com %{query}
     nav:
       all_messageboards: Todos os Fóruns de Mensagens
       edit_messageboard: Editar Fórum de Mensagem
@@ -40,6 +49,8 @@ pt-BR:
       edit_topic: Editar
       moderation: Moderação
       moderation_history: História
+      moderation_pending: Pendente
+      moderation_users: Usuários
       private_topics: Mensagens Privadas
       settings: Configurações de Notificação
     null_user_name: Usuário deletado
@@ -107,12 +118,12 @@ pt-BR:
       delete_topic: Remover Tópico
       deleted_notice: Tópico removido
       edit: Editar Tópico
-      followed_notice: You are now following this topic
+      followed_notice: Você agora está acompanhando este tópico
       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.
+        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
@@ -125,5 +136,19 @@ pt-BR:
         page_title: Tópicos dos Resultados da Busca
         results_message: Resultados de Busca para %{query}
       started_by_html: Iniciado %{time_ago} por %{user}
-      unfollowed_notice: You are no longer following this topic
+      unfollowed_notice: Você não está mais acompanhando este tópico
       updated_notice: Tópico atualizado
+    users:
+      last_active_html: Última %{time_ago} ativa
+      posted_in_topic_html: Postou em %{topic_link}
+      posts_count:
+        one: Postado uma vez
+        other: vezes %{count} Publicado
+      recent_activity: Atividade recente
+      started_topic_html: Começou %{topic_link}
+      started_topics_count:
+        one: Começou um tópico
+        other: tópicos iniciados %{count}
+      user_posted_in_topic_html: "%{user_link} postou em %{topic_link}"
+      user_since_html: Utilizador desde %{time_ago}
+      user_started_topic_html: "%{user_link} começou %{topic_link}"

data/config/routes.rb

@@ -30,9 +30,14 @@ Thredded::Engine.routes.draw do
   scope path: 'admin' do
     resources :messageboard_groups, only: [:new, :create]
     scope controller: :moderation, path: 'moderation' do
-      get '(/page-:page)', action: :pending, as: :pending_moderation, constraints: page_constraint
+      scope constraints: page_constraint do
+        get '(/page-:page)', action: :pending, as: :pending_moderation
+        get '/history(/page-:page)', action: :history, as: :moderation_history
+        get '/users(/page-:page)', action: :users, as: :users_moderation
+        get '/users/:id(/page-:page)', action: :user, as: :user_moderation
+      end
       post '', action: :moderate_post, as: :moderate_post
-      get '/history(/page-:page)', action: :history, as: :moderation_history, constraints: page_constraint
+      post '/user/:id', action: :moderate_user, as: :moderate_user
     end
   end
 

data/db/migrate/20160329231848_create_thredded.rb

@@ -21,7 +21,7 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_categories do |t|
-      t.integer :messageboard_id, null: false
+      t.references :messageboard, null: false
       t.string :name, limit: 191, null: false
       t.string :description, limit: 255
       t.timestamps null: false
@@ -38,6 +38,7 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :topics_count, default: 0
       t.integer :posts_count, default: 0
       t.boolean :closed, default: false, null: false
+      t.references :last_topic
       t.references :messageboard_group
       t.timestamps null: false
       t.index [:messageboard_group_id], name: :index_thredded_messageboards_on_messageboard_group_id
@@ -47,7 +48,7 @@ class CreateThredded < ActiveRecord::Migration
 
     create_table :thredded_post_notifications do |t|
       t.string :email, limit: 191, null: false
-      t.integer :post_id, null: false
+      t.references :post, null: false
       t.timestamps null: false
       t.string :post_type, limit: 191
       t.index [:post_id, :post_type], name: :index_thredded_post_notifications_on_post
@@ -58,8 +59,8 @@ class CreateThredded < ActiveRecord::Migration
       t.text :content, limit: 65_535
       t.string :ip, limit: 255
       t.string :source, limit: 255, default: 'web'
-      t.integer :postable_id, limit: 4
-      t.integer :messageboard_id, null: false
+      t.references :postable, null: false
+      t.references :messageboard, null: false
       t.integer :moderation_state, null: false
       t.timestamps null: false
       t.index [:moderation_state, :updated_at],
@@ -73,16 +74,16 @@ class CreateThredded < ActiveRecord::Migration
     DbTextSearch::FullText.add_index connection, :thredded_posts, :content, name: :thredded_posts_content_fts
 
     create_table :thredded_private_posts do |t|
-      t.integer :user_id, limit: 4
+      t.references :user
       t.text :content, limit: 65_535
+      t.references :postable, null: false
       t.string :ip, limit: 255
-      t.integer :postable_id, null: false
       t.timestamps null: false
     end
 
     create_table :thredded_private_topics do |t|
-      t.integer :user_id, null: false
-      t.integer :last_user_id, null: false
+      t.references :user
+      t.references :last_user
       t.string :title, limit: 255, null: false
       t.string :slug, limit: 191, null: false
       t.integer :posts_count, default: 0
@@ -93,26 +94,26 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_private_users do |t|
-      t.integer :private_topic_id, limit: 4
-      t.integer :user_id, limit: 4
+      t.references :private_topic, limit: 4
+      t.references :user, limit: 4
       t.timestamps null: false
       t.index [:private_topic_id], name: :index_thredded_private_users_on_private_topic_id
       t.index [:user_id], name: :index_thredded_private_users_on_user_id
     end
 
     create_table :thredded_topic_categories do |t|
-      t.integer :topic_id, null: false
-      t.integer :category_id, null: false
+      t.references :topic, null: false
+      t.references :category, null: false
       t.index [:category_id], name: :index_thredded_topic_categories_on_category_id
       t.index [:topic_id], name: :index_thredded_topic_categories_on_topic_id
     end
 
     create_table :thredded_topics do |t|
-      t.integer :user_id, null: false
-      t.integer :last_user_id, null: false
+      t.references :user
+      t.references :last_user
       t.string :title, limit: 255, null: false
       t.string :slug, limit: 191, null: false
-      t.integer :messageboard_id, null: false
+      t.references :messageboard, null: false
       t.integer :posts_count, default: 0, null: false
       t.boolean :sticky, default: false, null: false
       t.boolean :locked, default: false, null: false
@@ -131,7 +132,7 @@ class CreateThredded < ActiveRecord::Migration
     DbTextSearch::FullText.add_index connection, :thredded_topics, :title, name: :thredded_topics_title_fts
 
     create_table :thredded_user_details do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false
       t.datetime :latest_activity_at
       t.integer :posts_count, default: 0
       t.integer :topics_count, default: 0
@@ -157,7 +158,7 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_user_preferences do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false
       t.boolean :notify_on_mention, default: true, null: false
       t.boolean :notify_on_message, default: true, null: false
       t.timestamps null: false
@@ -165,8 +166,8 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_user_messageboard_preferences do |t|
-      t.integer :user_id, null: false
-      t.integer :messageboard_id, null: false
+      t.references :user, null: false
+      t.references :messageboard, null: false
       t.boolean :notify_on_mention, default: true, null: false
       t.timestamps null: false
       t.index [:user_id, :messageboard_id],
@@ -177,7 +178,7 @@ class CreateThredded < ActiveRecord::Migration
     %i(topic private_topic).each do |topics_table|
       table_name = :"thredded_user_#{topics_table}_read_states"
       create_table table_name do |t|
-        t.integer :user_id, null: false
+        t.references :user, null: false
         t.integer :postable_id, null: false
         t.integer :page, default: 1, null: false
         t.timestamp :read_at, null: false
@@ -191,7 +192,7 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_user_topic_follows do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false
       t.integer :topic_id, null: false
       t.datetime :created_at, null: false
       t.integer :reason, limit: 1