thredded 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446cac9b09b4d4bf92db6feaa8fdf3ed2b3708fc
-  data.tar.gz: f2c7b6e776222e744532f53dc5ae04ed475353a7
+  metadata.gz: 6f51494c108c361f5f0d96441cf9bb0615f388d3
+  data.tar.gz: 0f98a9b720385ee57a189aaf42116d52b60bff87
 SHA512:
-  metadata.gz: 9872e5d357a029ea8ca930b1c600ebd6687d26d7b2d6c8c710734cba6c5ec3e84795811b9ed905f3754d2baad27fa66bad7ab182674024695a3cf7be06495861
-  data.tar.gz: b90d6d78537a2f1060aaf78f121fd15862bbab0d6c71e23403f22fee080fe1d9fdf54fd13073b121e1a465d200e1ff941bbb46ef3bb0ec8a5ffd128b9d278b3f
+  metadata.gz: 82f7a755ef708111bd17e06da26f684e870334f0b3acf0a555cb6d18a767f8e93858d9e04d7c9a90d69aded4dc8abacd9c295181e3808c6b30902b9d152476b8
+  data.tar.gz: 15b3f0169e31a3bf7938cee0eef98111967668e15f97aadf57b81af02e8a4c281863eeca013bab9a4535c243dad42c9e144623482cdfe1b266640af70601a4cf

data/README.md

@@ -98,7 +98,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.13.3'
+gem 'thredded', '~> 0.13.4'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/stylesheets/thredded/components/_form-list.scss

@@ -14,9 +14,10 @@
     transition: all 0.15s ease-out 0s;
   }
 
-  label + label {
+  label ~ label {
     display: inline-block;
     font-weight: normal;
+    margin-right: 15px;
   }
 }
 

data/app/commands/thredded/notify_following_users.rb

@@ -9,47 +9,65 @@ module Thredded
     end
 
     def run
+      subscribed_users.select! do |user|
+        # Record idempotently that the notification happened.
+        # If a notification was already created (e.g. from another thread/process),
+        # this will return false due to the unique constraint on the table
+        # and the user will be excluded.
+        subscribed_via_any_notifier?(user) && record_as_notified_successful?(user)
+      end
       Thredded.notifiers.each do |notifier|
         notifiable_users = targeted_users(notifier)
-        notifiable_users = notifiable_users.select do |user|
-          # Create a notification for the user.
-          # If a notification was already created (from another thread/process),
-          # this will return false due to the unique constraint on the table
-          # and the user will be excluded.
-          Thredded::UserPostNotification.create_from_post_and_user(@post, user)
-        end
         next if notifiable_users.empty?
         notifier.new_post(@post, notifiable_users)
       end
     end
 
     def targeted_users(notifier)
-      users_subscribed_via(notifier).reject do |user|
-        already_notified_user_ids.include?(user.id)
+      subscribed_users.select do |user|
+        user_subscribed_via?(user, notifier)
       end
     end
 
-    def users_subscribed_via(notifier)
-      subscribed_users.select do |user|
-        Thredded::NotificationsForFollowedTopics
-          .detect_or_default(user.thredded_notifications_for_followed_topics, notifier).enabled? &&
-          Thredded::MessageboardNotificationsForFollowedTopics
-            .detect_or_default(messageboard_notifier_prefs_by_user_id[user.id], notifier).enabled?
-      end
+    def user_subscribed_via?(user, notifier)
+      Thredded::NotificationsForFollowedTopics
+        .detect_or_default(user.thredded_notifications_for_followed_topics, notifier).enabled? &&
+        Thredded::MessageboardNotificationsForFollowedTopics
+          .detect_or_default(messageboard_notifier_prefs_by_user_id[user.id], notifier).enabled?
     end
 
+    # @return [Array<User>]
     def subscribed_users
       @subscribed_users ||=
-        @post.postable.followers.includes(:thredded_notifications_for_followed_topics).reject do |user|
-          user == @post.user || !Thredded::PostPolicy.new(user, @post).read?
+        @post.postable.followers.includes(:thredded_notifications_for_followed_topics).select do |user|
+          !already_notified?(user) && !originator?(user) && can_read_post?(user)
         end
     end
 
-    def already_notified_user_ids
-      @notified_user_ids ||= Set.new Thredded::UserPostNotification.notified_user_ids(@post)
+    private
+
+    def originator?(user)
+      user == @post.user
     end
 
-    private
+    def can_read_post?(user)
+      Thredded::PostPolicy.new(user, @post).read?
+    end
+
+    def already_notified?(user)
+      # We memoize the set so that records created during this task do not affect the result,
+      # so that a user can receive notifications via multiple notifiers.
+      @already_notified_user_ids ||= Set.new Thredded::UserPostNotification.notified_user_ids(@post)
+      @already_notified_user_ids.include?(user.id)
+    end
+
+    def subscribed_via_any_notifier?(user)
+      Thredded.notifiers.any? { |notifier| user_subscribed_via?(user, notifier) }
+    end
+
+    def record_as_notified_successful?(user)
+      Thredded::UserPostNotification.create_from_post_and_user(@post, user)
+    end
 
     def messageboard_notifier_prefs_by_user_id
       @messageboard_notifier_prefs_by_user_id ||= Thredded::MessageboardNotificationsForFollowedTopics

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

@@ -3,8 +3,8 @@
     class: 'thredded--form thredded--notification-preferences-form',
     'data-thredded-user-preferences-form' => true
 }) do |f| %>
-  <ul class="thredded--form-list">
-    <li>
+  <ul class="thredded--form-list thredded--user-preferences-global">
+    <li class="thredded--user-preferences--auto-follow-topics">
       <%= f.label :auto_follow_topics do %>
         <%= f.check_box :auto_follow_topics,
                         'data-thredded-update-checkbox-on-change' =>
@@ -15,7 +15,7 @@
         </p>
       <% end %>
     </li>
-    <li>
+    <li class="thredded--user-preferences--follow-topics-on-mention">
       <%= f.label :follow_topics_on_mention do %>
         <%= f.check_box :follow_topics_on_mention, 'data-thredded-bound-messageboard-pref' => 'user_preferences_form[messageboard_follow_topics_on_mention]' %>
         <%= t 'thredded.preferences.form.follow_topics_on_mention.label' %>
@@ -25,7 +25,7 @@
       <% end %>
     </li>
     <% if Thredded.notifiers.present? %>
-      <li>
+      <li class="thredded--user-preferences--notifications-for-followed-topics">
         <label><%= t 'thredded.preferences.form.notifications_for_followed_topics.label' %></label>
         <%= f.fields_for :notifications_for_followed_topics, preferences.notifications_for_followed_topics do |fn| %>
           <%= fn.label :enabled do %>
@@ -37,7 +37,7 @@
           <%- end %>
         <%- end %>
       </li>
-      <li>
+      <li class="thredded--user-preferences--notifications-for-private-topics">
         <label><%= t 'thredded.preferences.form.notifications_for_private_topics.label' %></label>
         <%= f.fields_for :notifications_for_private_topics, preferences.notifications_for_private_topics do |fn| %>
           <%= fn.label :enabled do %>
@@ -53,8 +53,8 @@
     <h2 class="thredded--preferences--title">
       <%= t 'thredded.preferences.messageboard_preferences_title_html', messageboard: messageboard.name %>
     </h2>
-    <ul class="thredded--form-list" data-thredded-user-preferences-form-messageboard-fields>
-      <li>
+    <ul class="thredded--form-list thredded--user-preferences-messageboard" data-thredded-user-preferences-form-messageboard-fields>
+      <li class="thredded--user-preferences--auto-follow-topics">
         <%= f.label :messageboard_auto_follow_topics do %>
           <%= f.check_box :messageboard_auto_follow_topics %>
           <%= t 'thredded.preferences.form.messageboard_auto_follow_topics.label' %>
@@ -63,7 +63,7 @@
           </p>
         <% end %>
       </li>
-      <li>
+      <li class="thredded--user-preferences--follow-topics-on-mention">
         <%= 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' %>
@@ -73,7 +73,7 @@
         <% end %>
       </li>
       <% if Thredded.notifiers.present? %>
-        <li>
+        <li class="thredded--user-preferences--notifications-for-followed-topics">
           <label><%= t 'thredded.preferences.form.messageboard_notifications_for_followed_topics.label' %></label>
           <%= f.fields_for :messageboard_notifications_for_followed_topics,
                            preferences.messageboard_notifications_for_followed_topics do |fn| %>

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

@@ -41,6 +41,7 @@
   <% end %>
 <% end %>
 
-<% if !topic_iteration.last? && topic.sticky? && !topics[topic_counter + 1].sticky? %>
+<% if local_assigns[:sticky_topics_divider] &&
+    !topic_iteration.last? && topic.sticky? && !topics[topic_counter + 1].sticky? %>
   <%= render 'thredded/topics/sticky_topics_divider' %>
 <% end %>

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

@@ -13,7 +13,12 @@
                topic: @new_topic,
                css_class: 'thredded--is-compact',
                placeholder: t('thredded.topics.form.title_placeholder_start') if @new_topic %>
-    <%= render partial: 'thredded/topics/topic', collection: @topics, locals: {topics: @topics} %>
+    <%= render partial: 'thredded/topics/topic',
+               collection: @topics,
+               locals: {
+                 sticky_topics_divider: true,
+                 topics: @topics
+               } %>
   <% end %>
 
   <footer class="thredded--pagination-bottom">

data/config/locales/pl.yml

@@ -25,8 +25,7 @@ pl:
           unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
       post_notification:
         html:
-          email_sent_reason_html: >-
-            Ten e-mail został wysłany do Ciebie, ponieważ śledzisz ten temat: "<a href="%{post_url}">%{topic_title}</a>".
+          email_sent_reason_html: 'Ten e-mail został wysłany do Ciebie, ponieważ śledzisz ten temat: "<a href="%{post_url}">%{topic_title}</a>".'
           post_lead_html: '%{user} <a href="%{post_url}">powiedział w "%{topic_title}"</a>:'
           unsubscribe_instructions_html: Aby wypisać się z tych e-maili, zaktualizuj swoje <a href="%{preferences_url}">preferencje</a>.
         subject: Nowy post w "%{topic_title}" przez %{user}

data/config/locales/ru.yml

@@ -25,8 +25,7 @@ ru:
           unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
       post_notification:
         html:
-          email_sent_reason_html: >-
-            Это письмо было отправлено вам, потому что вы подписаны на тему: «<a href="%{post_url}">%{topic_title}</a>».
+          email_sent_reason_html: 'Это письмо было отправлено вам, потому что вы подписаны на тему: «<a href="%{post_url}">%{topic_title}</a>».'
           post_lead_html: '%{user} в <a href="%{post_url}">«%{topic_title}»</a>:'
           unsubscribe_instructions_html: Чтобы отписаться от этих писем, обновите свои <a href="%{preferences_url}">настройки</a>.
         subject: Новое сообщение в «%{topic_title}» от %{user}

data/lib/thredded.rb

@@ -37,6 +37,7 @@ require 'thredded/view_hooks/renderer'
 # Require these explicitly so that they do not need to be required if used in the initializer:
 require 'thredded/content_formatter'
 require 'thredded/email_transformer'
+require 'thredded/base_notifier'
 
 require 'thredded/collection_to_strings_with_cache_renderer'
 

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -569,14 +569,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -840,7 +840,6 @@ files:
 - app/models/thredded/user_private_topic_read_state.rb
 - app/models/thredded/user_topic_follow.rb
 - app/models/thredded/user_topic_read_state.rb
-- app/notifiers/thredded/base_notifier.rb
 - app/notifiers/thredded/email_notifier.rb
 - app/policies/thredded/messageboard_group_policy.rb
 - app/policies/thredded/messageboard_policy.rb
@@ -994,6 +993,7 @@ files:
 - lib/tasks/thredded_tasks.rake
 - lib/thredded.rb
 - lib/thredded/base_migration.rb
+- lib/thredded/base_notifier.rb
 - lib/thredded/collection_to_strings_with_cache_renderer.rb
 - lib/thredded/content_formatter.rb
 - lib/thredded/database_seeder.rb