thredded 0.16.10 → 0.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b0d8ea36cff88b87fc05f44d4419af0872e6f2c6747fc316df5b010d1affd3
-  data.tar.gz: 5f82a2fdc6c287cd85cb3dd3a5ef12631e5227dfbef4ab2d68c7495c990bf523
+  metadata.gz: 741784943db6fb342733ffb31a72839b04f50c11f73800ac6ef12e4a69eb61a8
+  data.tar.gz: de850a7928e05f2d97990b918fe5fddf684859087fda119e6511f344ea385fc8
 SHA512:
-  metadata.gz: ec6c4e0b3ec14274519dcff925d6f10c3de0721de4dd074fd44ba193e682e178d1fabe3253e026bdc6cbdf53d13933675f39dbe61e308a8edb5af540930ade5c
-  data.tar.gz: befd728ca48d0a7c9313850fd1297f1afe9a1f52e73b960ad1b35b044484f131f0c2d9e7713cbc62dc453b45ba4888ec6a19872424071ddc67f83be03715fa83
+  metadata.gz: bf23cc3d905ba1ab460bab9a0fd40babfb4bdccac806bc299a3100cf9550b7d80b5d0c948cfe7493997fef773a3260cca3449ff46360cd3ff66c2a63dd3c03a6
+  data.tar.gz: 155e6a9079c65c33008d91a9bf5def441dd7f5d78021d6656ee2d2625248e6d0bf01f773107b871000b917e9fbd39d5a0bc653f18953807d37a4a8779c223af7

data/README.md

@@ -95,7 +95,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.16.10'
+gem 'thredded', '~> 0.16.11'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -368,7 +368,7 @@ for a team messageboard or a company announcements board, for example. To enable
 run the following migration(s):
 
 ```ruby
-change_column_default :thredded_user_preferences, :auto_follow_topics, 1
+change_column_default :thredded_user_preferences, :auto_follow_topics, true
 ```
 
 ## I18n
@@ -655,7 +655,7 @@ before updating this to full Babel.
 All Thredded JavaScript is compatible with the following Turbolinks options:
 
 * No Turbolinks.
-* Tubrolinks 5.
+* Turbolinks 5.
 * Turbolinks Classic.
 * Turbolinks Classic + jquery-turbolinks.
 

data/app/commands/thredded/autofollow_users.rb

@@ -31,24 +31,33 @@ module Thredded
     attr_reader :post
 
     # Returns the users that have:
-    #   UserMessageboardPreference#auto_follow_topics? && UserPreference#auto_follow_topics?
-    # If the `user_preference` for a given does not exist, its default value is used.
+    #
+    #    COALESCE(
+    #      `user_messageboard_preferences`.`auto_follow_topics`,
+    #      `user_preferences`.`auto_follow_topics`,
+    #      default for `user_preferences`.`auto_follow_topics`
+    #    ) = true
+    #
     # @return [Enumerable<Thredded.user_class>]
     def auto_followers
-      user_board_prefs = post.messageboard.user_messageboard_preferences.each_with_object({}) do |ump, h|
-        h[ump.user_id] = ump
-      end
-      Thredded.user_class.includes(:thredded_user_preference)
+      u = Thredded.user_class.arel_table
+      u_pkey = u[Thredded.user_class.primary_key]
+      up = Thredded::UserPreference.arel_table
+      ump = Thredded::UserMessageboardPreference.arel_table
+      coalesce = [
+        ump[:auto_follow_topics],
+        up[:auto_follow_topics],
+      ]
+      coalesce << Arel::Nodes::Quoted.new(true) if Thredded::UserPreference.column_defaults['auto_follow_topics']
+      Thredded.user_class
         .select(Thredded.user_class.primary_key)
-        .find_each(batch_size: 50_000).select do |user|
-
-        result = user_board_prefs[user.id]
-        result ||= Thredded::UserMessageboardPreference.new(
-          messageboard: post.messageboard,
-          user_preference: user.thredded_user_preference
-        )
-        result.auto_follow_topics?
-      end
+        .joins(
+          u.join(up, Arel::Nodes::OuterJoin)
+            .on(up[:user_id].eq(u_pkey))
+            .join(ump, Arel::Nodes::OuterJoin)
+            .on(ump[:user_id].eq(u_pkey).and(ump[:messageboard_id].eq(post.messageboard_id)))
+            .join_sources
+        ).where(Arel::Nodes::NamedFunction.new('COALESCE', coalesce).eq(true))
     end
 
     # @return [Enumerable<Thredded.user_class>]

data/config/locales/de.yml

@@ -5,7 +5,7 @@ de:
       content_blocked_notice: Blockiert
       content_blocked_notice_with_record_html: Blockiert von %{moderator} %{time_ago}
     email_notifier:
-      by_email: Per E-mail
+      by_email: Per E-Mail
     emails:
       message_notification:
         html:
@@ -124,7 +124,7 @@ de:
       unread_topics: Ungelesen
     null_user_name: Gelöschte Nutzer
     posts:
-      delete: Beitrag gelöscht
+      delete: Beitrag löschen
       delete_confirm: Bist du sicher, dass du diesen Beitrag löschen willst?
       deleted_notice: Dein Beitrag wurde gelöscht
       edit: :thredded.nav.edit_post
@@ -172,7 +172,7 @@ de:
     private_posts:
       form:
         content_label: Nachricht
-        create_btn: Nchricht senden
+        create_btn: Nachricht senden
         create_btn_submitting: Senden...
         update_btn_submitting: :thredded.form.update_btn_submitting
     private_topics:
@@ -212,7 +212,7 @@ de:
       edit: Diskussion bearbeiten
       follow: Folge dieser Diskussion
       followed_by: 'gefolgt von:'
-      followed_by_noone: Die Diskussion wird von Niemandem verfolgt
+      followed_by_noone: Die Diskussion wird von niemandem verfolgt
       followed_notice: Du folgst der Diskussion
       following:
         auto: Du folgst dieser Diskussion, da automatisches Folgen aktiviert ist
@@ -245,7 +245,7 @@ de:
       started_by_html: Gestartet %{time_ago} von %{user}
       sticky:
         label: Angepinnt
-      unfollow: Nich mehr folgen
+      unfollow: Nicht mehr folgen
       unfollowed_notice: Du folgst der Diskussion nicht mehr
       updated_notice: Beitrag aktualisiert
     unread_topics:
@@ -255,7 +255,7 @@ de:
       page_title: Ungelesene Themen
       page_title_in_messageboard: "%{messageboard}: Ungelesene Themen"
     users:
-      currently_online: Zurzeit Online
+      currently_online: Zurzeit online
       last_active_html: Zuletzt aktiv %{time_ago}
       posted_in_topic_html: Hochgeladen in %{topic_link}
       posts_count:

data/lib/thredded/content_formatter.rb

@@ -47,8 +47,13 @@ module Thredded
         'span'   => %w[class],
         'div'    => %w[class],
         'img'    => %w[src longdesc class],
+        'th'     => %w[style],
+        'td'     => %w[style],
         :all     => HTML::Pipeline::SanitizationFilter::WHITELIST[:attributes][:all] +
           %w[aria-expanded aria-label aria-labelledby aria-live aria-hidden aria-pressed role],
+      },
+      css: {
+        properties: %w[text-align],
       }
     )
 

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.10
+  version: 0.16.11
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -1026,7 +1026,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.