thredded 0.8.4 → 0.9.1

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

@@ -5,6 +5,10 @@
           time_ago: time_ago(topic.created_at),
           user:     user_link(topic.user) %>
   </cite>
+  <span class="thredded--topic-header--participants">
+    <%= render partial: 'thredded/private_topics/header/participant',
+               collection: (topic.users - [topic.user]) %>
+  </span>
   <% if topic.can_update? %>
     <%= link_to t('thredded.private_topics.edit'), topic.edit_path,
                 class: 'thredded--topic-header--edit-topic' %>

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

@@ -1,6 +1,6 @@
 <div class="thredded--empty">
   <h3 class="thredded--empty--title"><%= t 'thredded.private_topics.no_private_topics.title' %></h3>
-  <a class="thredded--button" href="<%= new_private_topic_path(messageboard) %>">
+  <a class="thredded--button" href="<%= new_private_topic_path %>">
     <%= t 'thredded.private_topics.no_private_topics.create_btn' %>
   </a>
 </div>

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

@@ -8,8 +8,11 @@
   </h1>
 
   <cite class="thredded--topics--updated-by">
-    <%= time_ago private_topic.last_post_at%>
-    <%= user_link private_topic.last_user %>
+    <%= time_ago private_topic.last_post_at %>
+    <span class="thredded--topics--participants">
+      <%= render partial: 'thredded/private_topics/private_topic/participant',
+                 collection: [private_topic.last_user, *(private_topic.users - [private_topic.last_user])] %>
+    </span>
   </cite>
 
   <cite class="thredded--topics--started-by">

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

@@ -23,7 +23,8 @@
                             required:    true %>
       </li>
       <li>
-        <button type="submit" class="thredded--form--submit">
+        <button type="submit" class="thredded--form--submit"
+                data-disable-with="<%= t 'thredded.private_topics.form.update_btn_submitting' %>">
           <%= t('thredded.private_topics.form.update_btn') %>
         </button>
       </li>

data/app/views/thredded/private_topics/header/_participant.html.erb

@@ -0,0 +1 @@
+<span class="thredded--topic-header--participants--participant"><%= user_link participant %></span>

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

@@ -11,17 +11,18 @@
       <%= render 'thredded/private_topics/no_private_topics' %>
     <% else -%>
       <%= render 'thredded/private_topics/form',
-        messageboard:  messageboard,
         private_topic: @new_private_topic,
         css_class:     'thredded--is-compact',
         placeholder:   t('thredded.private_topics.form.title_placeholder_start') %>
 
       <%= render @private_topics %>
 
-      <%= link_to t('thredded.nav.mark_all_read'),
-        mark_all_private_topics_read_path,
-        class: 'thredded--button thredded--button-light thredded--button-wide',
-        method: :put -%>
+      <% unless unread_private_topics_count.zero? %>
+        <%= link_to t('thredded.nav.mark_all_read'),
+                    mark_all_private_topics_read_path,
+                    class: 'thredded--button thredded--button-light thredded--button-wide',
+                    method: :put -%>
+      <% end %>
     <% end -%>
   <% end %>
 

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

@@ -5,7 +5,6 @@
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/private_topics/form',
-               messageboard:  messageboard,
                private_topic: @private_topic,
                placeholder:   t('thredded.private_topics.form.title_placeholder_new') if @private_topic %>
   </section>

data/app/views/thredded/private_topics/private_topic/_participant.html.erb

@@ -0,0 +1 @@
+<span class="thredded--topics--participants--participant"><%= user_link participant %></span>

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

@@ -9,11 +9,9 @@
                   class: ['thredded--main-section', 'thredded--topic', *topic_css_classes(private_topic)] do %>
     <%= render 'thredded/private_topics/header', topic: private_topic %>
     <%= render partial: 'thredded/private_posts/private_post', collection: @posts, cached: true %>
+    <%= paginate @posts %>
     <%= render 'thredded/private_posts/form',
                topic: private_topic,
                post:  @post %>
   <% end %>
-  <footer>
-    <%= paginate @posts %>
-  </footer>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%= form_for [messageboard, topic],
              html: {
-                 class: "thredded--form #{local_assigns[:css_class]}",
+                 class: "thredded--form thredded--new-topic-form #{local_assigns[:css_class]}",
                  'data-thredded-topic-form' => true,
                  'data-autocomplete-url' => autocomplete_users_path,
                  'data-autocomplete-min-length' => Thredded.autocomplete_min_length,

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

@@ -9,13 +9,16 @@
                   class: ['thredded--main-section', 'thredded--topic', *topic_css_classes(topic)] do %>
     <%= render 'thredded/topics/header', topic: topic %>
     <%= render partial: 'thredded/posts/post', collection: @posts, cached: true %>
+    <%= paginate @posts %>
+
     <% if policy(@new_post).create? %>
       <div class="thredded--post-form--wrapper">
         <h3 class="thredded--post-form--title">Add a post</h3>
         <%= render 'thredded/posts/form',
                    topic:       topic,
                    post:        @new_post,
-                   button_text: t('thredded.posts.form.create_btn') %>
+                   button_text: t('thredded.posts.form.create_btn'),
+                   button_submitting_text: t('thredded.posts.form.create_btn_submitting') %>
       </div>
     <% end %>
 
@@ -28,8 +31,4 @@
       </div>
     <% end %>
   <% end %>
-
-  <footer>
-    <%= paginate @posts %>
-  </footer>
 <% end %>

data/config/locales/en.yml

@@ -4,17 +4,23 @@ en:
     content_moderation_states:
       content_blocked_notice: Blocked
       content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
+    email_notifier:
+      by_email: by email
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
       private_topic_create_denied: You are not authorized to create private topics.
       private_topic_not_found: This private topic does not exist.
     form:
+      create_btn_submitting: Creating...
       update: Update
+      update_btn_submitting: Updating...
     messageboard:
       create: Create a New Messageboard
       form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
         no_group: No Group
+        update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Messageboards
       last_updated_by_html: Updated %{time_ago} <cite>by %{user}</cite>
@@ -23,6 +29,8 @@ en:
       updated_notice: Messageboard has been updated
     messageboard_group:
       create: Create a New Messageboard Group
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
       saved: Messageboard Group %{name} created
     moderation:
       approve_btn: Approve
@@ -65,7 +73,9 @@ en:
       form:
         content_label: Content
         create_btn: Submit Reply
+        create_btn_submitting: Posting...
         update_btn: Update Post
+        update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: Your post will be published when it has been reviewed by a moderator.
     preferences:
       edit:
@@ -74,28 +84,28 @@ en:
         follow_topics_on_mention:
           hint: 'When someone mentions you by your username (eg: @sam) you will follow the topic.'
           label: Follow topics you are mentioned in
-        followed_topic_emails:
-          hint: When there is a post in a topic you follow you will receive an email.
-          label: Email notifications for followed topics
         global_preferences_label: Global Settings
         messageboard_follow_topics_on_mention:
           hint: 'When someone mentions you by your username (eg: @sam) in this messageboard you will follow the
             topic.'
           label: :thredded.preferences.form.follow_topics_on_mention.label
-        messageboard_followed_topic_emails:
-          hint: When there is a post in a topic you follow on this messageboard you will be sent an email.
-          label: Email notifications for followed topics
+        messageboard_notifications_for_followed_topics:
+          label: :thredded.preferences.form.notifications_for_followed_topics.label
         messageboard_preferences_label_html: Notification Settings for <em>%{messageboard}</em>
-        notify_on_message:
-          hint: When you are added to a private conversation you will receive an email with its content.
-          label: Email notifications for private messages
+        notifications_for_followed_topics:
+          label: Notifications for followed topics
+        notifications_for_private_topics:
+          label: Notifications for private messages
         submit_btn: Update Settings
         title: Settings
+        update_btn_submitting: :thredded.form.update_btn_submitting
       updated_notice: Your settings have been updated.
     private_posts:
       form:
         content_label: Message
         create_btn: Send Message
+        create_btn_submitting: Sending...
+        update_btn_submitting: :thredded.form.update_btn_submitting
     private_topics:
       edit: Edit
       errors:
@@ -103,10 +113,12 @@ en:
       form:
         content_label: :thredded.private_posts.form.content_label
         create_btn: :thredded.private_posts.form.create_btn
+        create_btn_submitting: :thredded.private_posts.form.create_btn_submitting
         title_label: :thredded.topics.form.title_label
         title_placeholder_new: Write the subject of this conversation
         title_placeholder_start: Start a new conversation
         update_btn: Update
+        update_btn_submitting: :thredded.private_posts.form.update_btn_submitting
         users_label: Participants
         users_placeholder: Select users to participate in this conversation
       no_private_topics:
@@ -119,6 +131,7 @@ en:
         btn_submit: :thredded.search.form.label
         label: Search
         placeholder: Search Topics and Posts
+    time_ago: "%{time} ago"
     topics:
       delete_confirm: Are you sure you want to delete this topic? This CANNOT be undone.
       delete_topic: Delete Topic

data/config/locales/pt-BR.yml

@@ -4,17 +4,23 @@ pt-BR:
     content_moderation_states:
       content_blocked_notice: Bloqueado
       content_blocked_notice_with_record_html: Bloqueados por %{moderator} %{time_ago}
+    email_notifier:
+      by_email: de e-mail
     errors:
       login_required: Por favor, autentique-se primeiro.
       not_authorized: Você não está autorizado a acessar esta página.
       private_topic_create_denied: Você não está autorizado a criar tópicos privados.
       private_topic_not_found: Este tópico privado não existe.
     form:
+      create_btn_submitting: Criando...
       update: Atualizar
+      update_btn_submitting: Atualizando...
     messageboard:
       create: Criar um novo Fórum de Mensagem
       form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
         no_group: Sem Grupo
+        update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Fóruns de Mensagens
       last_updated_by_html: Atualizado %{time_ago} <cite>por %{user}</cite>
@@ -23,6 +29,8 @@ pt-BR:
       updated_notice: Fórum de mensagem foi atualizado
     messageboard_group:
       create: Criar um novo grupo de mensagens
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
       saved: Groupo de mensagens %{name} salvou
     moderation:
       approve_btn: Aprovar
@@ -65,7 +73,9 @@ pt-BR:
       form:
         content_label: Conteúdo
         create_btn: Enviar Resposta
+        create_btn_submitting: Postando...
         update_btn: Atualizar Post
+        update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: O envio da mensagem será publicada quando foi revisado por um moderador.
     preferences:
       edit:
@@ -76,30 +86,29 @@ pt-BR:
             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: Siga os tópicos que são mencionados na
-        followed_topic_emails:
-          hint: Quando há um post em um tópico que você siga, você receberá um e-mail.
-          label: Notificações de e-mail para tópicos seguido
         global_preferences_label: Configurações Globais
         messageboard_follow_topics_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.
           label: :thredded.preferences.form.follow_topics_on_mention.label
-        messageboard_followed_topic_emails:
-          hint: Quando há um post em um tópico que você siga nesta messageboard será enviado um e-mail.
-          label: Notificações de e-mail para tópicos seguido
+        messageboard_notifications_for_followed_topics:
+          label: :thredded.preferences.form.notifications_for_followed_topics.label
         messageboard_preferences_label_html: Configurações de Notificação para <em>%{messageboard}</em>
-        notify_on_message:
-          hint: Quando você for adicionado a uma conversa privada, você receberá um e-mail com o conteúdo desta
-            conversa.
-          label: E-mail notificações de mensagens privadas
+        notifications_for_followed_topics:
+          label: Notificações para tópicos seguido
+        notifications_for_private_topics:
+          label: Notificações de mensagens privadas
         submit_btn: Atualizar Configurações
         title: Configurações
+        update_btn_submitting: :thredded.form.update_btn_submitting
       updated_notice: Suas configurações foram atualizadas.
     private_posts:
       form:
         content_label: Mensagem
         create_btn: Enviar Mensagem
+        create_btn_submitting: Enviando...
+        update_btn_submitting: :thredded.form.update_btn_submitting
     private_topics:
       edit: Editar
       errors:
@@ -107,10 +116,12 @@ pt-BR:
       form:
         content_label: :thredded.private_posts.form.content_label
         create_btn: :thredded.private_posts.form.create_btn
+        create_btn_submitting: :thredded.private_posts.form.create_btn_submitting
         title_label: :thredded.topics.form.title_label
         title_placeholder_new: Escreva o assunto desta conversa
         title_placeholder_start: Iniciar uma nova conversa
         update_btn: Atualizar
+        update_btn_submitting: :thredded.private_posts.form.update_btn_submitting
         users_label: Participantes
         users_placeholder: Selecione usuários para participar desta conversa
       no_private_topics:
@@ -123,6 +134,7 @@ pt-BR:
         btn_submit: :thredded.search.form.label
         label: Buscar
         placeholder: Buscar Tópicos e Posts
+    time_ago: há %{time}
     topics:
       delete_confirm: Você tem certeza que deseja remover este tópico? Isto não pode ser desfeito.
       delete_topic: Remover Tópico

data/config/routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Thredded::Engine.routes.draw do
+Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
   resource :theme_preview, only: [:show], path: 'theme-preview' if %w(development test).include? Rails.env
 
   positive_int = /[1-9]\d*/

data/db/migrate/20160329231848_create_thredded.rb

@@ -161,8 +161,6 @@ class CreateThredded < ActiveRecord::Migration
     create_table :thredded_user_preferences do |t|
       t.references :user, null: false
       t.boolean :follow_topics_on_mention, default: true, null: false
-      t.boolean :notify_on_message, default: true, null: false
-      t.boolean :followed_topic_emails, default: true, null: false
       t.timestamps null: false
       t.index [:user_id], name: :index_thredded_user_preferences_on_user_id
     end
@@ -171,7 +169,6 @@ class CreateThredded < ActiveRecord::Migration
       t.references :user, null: false
       t.references :messageboard, null: false
       t.boolean :follow_topics_on_mention, default: true, null: false
-      t.boolean :followed_topic_emails, default: true, null: false
       t.timestamps null: false
       t.index [:user_id, :messageboard_id],
               name: :thredded_user_messageboard_preferences_user_id_messageboard_id,
@@ -217,6 +214,29 @@ class CreateThredded < ActiveRecord::Migration
               order: { created_at: :desc },
               name:  :index_thredded_moderation_records_for_display
     end
+
+    create_table :thredded_notifications_for_private_topics do |t|
+      t.integer :user_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :notifier_key],
+              name: 'thredded_notifications_for_private_topics_unique', unique: true
+    end
+    create_table :thredded_notifications_for_followed_topics do |t|
+      t.integer :user_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :notifier_key],
+              name: 'thredded_notifications_for_followed_topics_unique', unique: true
+    end
+    create_table :thredded_messageboard_notifications_for_followed_topics do |t|
+      t.integer :user_id, null: false
+      t.integer :messageboard_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :messageboard_id, :notifier_key],
+              name: 'thredded_messageboard_notifications_for_followed_topics_unique', unique: true
+    end
   end
 end
 # rubocop:enable Metrics/MethodLength

data/db/upgrade_migrations/20160410111522_upgrade_v0_2_to_v0_3.rb

@@ -6,7 +6,7 @@ class UpgradeV02ToV03 < ActiveRecord::Migration
     remove_index :thredded_notification_preferences, name: :index_thredded_notification_preferences_on_messageboard_id
     remove_index :thredded_notification_preferences, name: :index_thredded_notification_preferences_on_user_id
     rename_table :thredded_notification_preferences, :thredded_user_messageboard_preferences
-    remove_column :thredded_user_messageboard_preferences, :notify_on_message
+    remove_column :thredded_user_messageboard_preferences, :notifications_for_private_topics
     change_column_null :thredded_user_messageboard_preferences, :notify_on_mention, false
     add_column :thredded_user_preferences, :notify_on_mention, :boolean, default: true, null: false
     add_column :thredded_user_preferences, :notify_on_message, :boolean, default: true, null: false

data/db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+# rubocop:disable Metrics/MethodLength
+class UpgradeV08ToV09 < ActiveRecord::Migration
+  def up
+    create_table :thredded_notifications_for_private_topics do |t|
+      t.integer :user_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :notifier_key],
+              name: 'thredded_notifications_for_private_topics_unique', unique: true
+    end
+    create_table :thredded_notifications_for_followed_topics do |t|
+      t.integer :user_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :notifier_key],
+              name: 'thredded_notifications_for_followed_topics_unique', unique: true
+    end
+    create_table :thredded_messageboard_notifications_for_followed_topics do |t|
+      t.integer :user_id, null: false
+      t.integer :messageboard_id, null: false
+      t.string :notifier_key, null: false
+      t.boolean :enabled, default: true, null: false
+      t.index [:user_id, :messageboard_id, :notifier_key],
+              name: 'thredded_messageboard_notifications_for_followed_topics_unique', unique: true
+    end
+
+    Thredded::UserPreference.includes(:user).each do |pref|
+      pref.notifications_for_private_topics.create(notifier_key: 'email', enabled: pref.notify_on_message)
+      pref.notifications_for_followed_topics.create(notifier_key: 'email', enabled: pref.followed_topic_emails)
+    end
+    Thredded::UserMessageboardPreference.includes(:user).each do |pref|
+      Thredded::MessageboardNotificationsForFollowedTopics.create(
+        user_id: pref.user_id,
+        messageboard_id: pref.messageboard_id,
+        notifier_key: 'email',
+        enabled: pref.followed_topic_emails
+      )
+    end
+
+    remove_column :thredded_user_preferences, :notify_on_message
+    remove_column :thredded_user_preferences, :followed_topic_emails
+    remove_column :thredded_user_messageboard_preferences, :followed_topic_emails
+  end
+
+  def down
+    add_column :thredded_user_preferences, :notify_on_message, :boolean, default: true, null: false
+    add_column :thredded_user_preferences, :followed_topic_emails, :boolean, default: true, null: false
+    add_column :thredded_user_messageboard_preferences, :followed_topic_emails, :boolean, default: true, null: false
+
+    drop_table :thredded_messageboard_notifications_for_followed_topics
+    drop_table :thredded_notifications_for_followed_topics
+    drop_table :thredded_notifications_for_private_topics
+  end
+end
+# rubocop:enable Metrics/MethodLength