thredded 0.15.5 → 0.16.0

data/config/locales/de.yml

@@ -69,6 +69,7 @@ de:
         page_title: Forum
       last_updated_by_html: Letzter Beitrag %{time_ago} <cite>von %{user}</cite>
       topics_and_posts_counts: "%{topics_count} Diskussionen / %{posts_count} Beiträge"
+      topics_and_unread_topics_counts: "%{unread_topics_count} ungelesen von %{topics_count} Themen"
       update: :thredded.form.update
       updated_notice: Das Forum wurde aktualisiert
     messageboard_first_topic:

data/config/locales/en.yml

@@ -67,7 +67,8 @@ en:
       index:
         page_title: Messageboards
       last_updated_by_html: Updated %{time_ago} <cite>by %{user}</cite>
-      topics_and_posts_counts: "%{topics_count} topics / %{posts_count} posts"
+      topics_and_posts_counts: "%{posts_count} posts in %{topics_count} topics"
+      topics_and_unread_topics_counts: "%{unread_topics_count} unread of %{topics_count} topics"
       update: :thredded.form.update
       updated_notice: Messageboard has been updated
     messageboard_first_topic:

data/config/locales/es.yml

@@ -70,6 +70,7 @@ es:
         page_title: Foros
       last_updated_by_html: Actualizado %{time_ago} <cite>por %{user}</cite>
       topics_and_posts_counts: "%{topics_count} temas / %{posts_count} mensajes"
+      topics_and_unread_topics_counts: "%{unread_topics_count} no leídos de los temas de %{topics_count}"
       update: :thredded.form.update
       updated_notice: Foro actualizado
     messageboard_first_topic:

data/config/locales/fr.yml

@@ -68,6 +68,7 @@ fr:
         page_title: Catégories
       last_updated_by_html: Mise à jour %{time_ago} <cite>par %{user}</cite>
       topics_and_posts_counts: "%{topics_count} sujets / %{posts_count} commentaires"
+      topics_and_unread_topics_counts: "%{unread_topics_count} non lu des sujets de %{topics_count}"
       update: :thredded.form.update
       updated_notice: La catégorie a été mise à jour
     messageboard_first_topic:

data/config/locales/it.yml

@@ -68,6 +68,7 @@ it:
         page_title: Bacheche
       last_updated_by_html: Aggiornato %{time_ago} <cite>da %{user}</cite>
       topics_and_posts_counts: "%{topics_count} discussioni / %{posts_count} messaggi"
+      topics_and_unread_topics_counts: "%{unread_topics_count} non letto di argomenti %{topics_count}"
       update: :thredded.form.update
       updated_notice: La bacheca è stata aggiornata
     messageboard_first_topic:

data/config/locales/pl.yml

@@ -68,6 +68,7 @@ pl:
         page_title: Tablice
       last_updated_by_html: Zaktualizowano %{time_ago} <cite>przez %{user}</cite>
       topics_and_posts_counts: "%{topics_count} tematów / %{posts_count} postów"
+      topics_and_unread_topics_counts: "%{unread_topics_count} nieprzeczytane tematy %{topics_count}"
       update: :thredded.form.update
       updated_notice: Tablica została zaktualizowana
     messageboard_first_topic:

data/config/locales/pt-BR.yml

@@ -70,6 +70,7 @@ pt-BR:
         page_title: Fóruns de Mensagens
       last_updated_by_html: Atualizado %{time_ago} <cite>por %{user}</cite>
       topics_and_posts_counts: "%{topics_count} tópicos / %{posts_count} posts"
+      topics_and_unread_topics_counts: "%{unread_topics_count} não lida de %{topics_count} topics"
       update: :thredded.form.update
       updated_notice: Fórum de mensagem foi atualizado
     messageboard_first_topic:

data/config/locales/ru.yml

@@ -67,6 +67,7 @@ ru:
         page_title: Форумы
       last_updated_by_html: Обновлено %{time_ago} <cite>пользователем %{user}</cite>
       topics_and_posts_counts: "%{topics_count} тем / %{posts_count} постов"
+      topics_and_unread_topics_counts: "%{unread_topics_count} непрочитанных из %{topics_count} тем"
       update: :thredded.form.update
       updated_notice: Форум обновлен
     messageboard_first_topic:

data/config/locales/zh-CN.yml

@@ -65,6 +65,7 @@ zh-CN:
         page_title: 板块
       last_updated_by_html: 最近由 <span>%{user}</span> 在%{time_ago}更新
       topics_and_posts_counts: "%{topics_count} 帖子 / %{posts_count} 回复"
+      topics_and_unread_topics_counts: "%{unread_topics_count} 未读取 %{topics_count} 主题"
       update: :thredded.form.update
       updated_notice: 板块已更新
     messageboard_first_topic:

data/db/migrate/20160329231848_create_thredded.rb

@@ -195,12 +195,17 @@ class CreateThredded < Thredded::BaseMigration
     %i[topic private_topic].each do |topics_table|
       table_name = :"thredded_user_#{topics_table}_read_states"
       create_table table_name do |t|
+        t.references :messageboard, null: false, index: true if table_name == :thredded_user_topic_read_states
         t.references :user, type: user_id_type, null: false, index: false
         t.references :postable, null: false, index: false
+        t.integer :unread_posts_count, default: 0, null: false
+        t.integer :read_posts_count, :integer, default: 0, null: false
         t.timestamp :read_at, null: false
         t.index %i[user_id postable_id], name: :"#{table_name}_user_postable", unique: true
       end
     end
+    add_index :thredded_user_topic_read_states, %i[user_id messageboard_id],
+              name: :thredded_user_topic_read_states_user_messageboard
 
     create_table :thredded_messageboard_groups do |t|
       t.string :name

data/db/upgrade_migrations/20180930063614_upgrade_thredded_v0_15_to_v0_16.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'thredded/base_migration'
+
+class UpgradeThreddedV015ToV016 < Thredded::BaseMigration
+  def up
+    %i[thredded_user_topic_read_states thredded_user_private_topic_read_states].each do |table_name|
+      add_column table_name, :unread_posts_count, :integer, default: 0, null: false
+      add_column table_name, :read_posts_count, :integer, default: 0, null: false
+    end
+    add_column :thredded_user_topic_read_states, :messageboard_id, column_type(:thredded_messageboards, :id)
+    set_messageboard_ids
+    change_column_null :thredded_user_topic_read_states, :messageboard_id, false
+    add_index :thredded_user_topic_read_states, :messageboard_id
+    add_index :thredded_user_topic_read_states, %i[user_id messageboard_id],
+              name: :thredded_user_topic_read_states_user_messageboard
+    [Thredded::UserTopicReadState, Thredded::UserPrivateTopicReadState].each do |klass|
+      klass.reset_column_information
+      klass.update_post_counts!
+    end
+  end
+
+  def down
+    remove_column :thredded_user_topic_read_states, :messageboard_id
+    %i[thredded_user_topic_read_states thredded_user_private_topic_read_states].each do |table|
+      remove_column table, :unread_posts_count
+    end
+  end
+
+  private
+
+  def set_messageboard_ids
+    messageboard_topics = Thredded::Topic.pluck(:messageboard_id, :id).group_by(&:first)
+    messageboard_topics.transform_values! { |v| v.map(&:second) }
+    messageboard_topics.each do |messageboard_id, topic_ids|
+      say "Setting messageboard_id #{messageboard_id} for postable_id IN (#{topic_ids.join(',')})"
+      Thredded::UserTopicReadState.where(postable_id: topic_ids).update_all(messageboard_id: messageboard_id)
+    end
+  end
+end

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

@@ -109,10 +109,10 @@ Thredded.layout = 'thredded/application'
 # ==> Post Content Formatting
 # Customize the way Thredded handles post formatting.
 
-# Change the default html-pipeline filters used by thredded.
-# E.g. to replace default emoji filter with your own:
-# Thredded::ContentFormatter.after_markup_filters[
-#   Thredded::ContentFormatter.after_markup_filters.index(HTML::Pipeline::EmojiFilter)] = MyEmojiFilter
+# ===> Emoji using the 'gemoji' gem
+# 1. Install `gemoji` following instruction at https://github.com/github/gemoji.
+# 2. Uncomment the following line:
+# Thredded::ContentFormatter.after_markup_filters.insert(1, HTML::Pipeline::EmojiFilter)
 
 # Change the HTML sanitization settings used by Thredded.
 # See the Sanitize docs for more information on the underlying library: https://github.com/rgrove/sanitize/#readme

data/lib/thredded/arel_compat.rb

@@ -4,6 +4,24 @@ unless Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSIO
   require 'thredded/rails_lt_5_2_arel_case_node.rb'
 end
 
+if Rails::VERSION::MAJOR == 4
+  # Make `pluck` compatible with Arel.
+  require 'active_record/relation'
+  ActiveRecord::Relation.prepend(Module.new do
+    def pluck(*column_names)
+      super(*column_names.map do |n|
+        if n.is_a?(Arel::Node)
+          Arel.sql(n.to_sql)
+        elsif n.is_a?(Arel::Attributes::Attribute)
+          n.name
+        else
+          n
+        end
+      end)
+    end
+  end)
+end
+
 module Thredded
   module ArelCompat
     module_function
@@ -20,30 +38,6 @@ module Thredded
       end
     end
 
-    if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSION::MAJOR > 5
-      # @param [ActiveRecord::Relation] relation
-      # @return [Arel::Nodes::Node]
-      def relation_to_arel(relation)
-        relation.arel
-      end
-    else
-      def relation_to_arel(relation)
-        Arel.sql("(#{relation.to_sql})")
-      end
-    end
-
-    if Rails::VERSION::MAJOR >= 5
-      # @param [Arel::Nodes::Node] table
-      # @return [Arel::SelectManager]
-      def new_arel_select_manager(table)
-        Arel::SelectManager.new(table)
-      end
-    else
-      def new_arel_select_manager(table)
-        Arel::SelectManager.new(ActiveRecord::Base, table)
-      end
-    end
-
     if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSION::MAJOR > 5
       def true_value(_engine)
         true

data/lib/thredded/content_formatter.rb

@@ -46,6 +46,7 @@ module Thredded
         'abbr'   => %w[title],
         'span'   => %w[class],
         'div'    => %w[class],
+        'img'    => %w[src longdesc class],
         :all     => HTML::Pipeline::SanitizationFilter::WHITELIST[:attributes][:all] +
           %w[aria-expanded aria-label aria-labelledby aria-live aria-hidden aria-pressed role],
       }
@@ -63,7 +64,6 @@ module Thredded
       # AutolinkFilter is required because Kramdown does not autolink by default.
       # https://github.com/gettalong/kramdown/issues/306
       Thredded::HtmlPipeline::AutolinkFilter,
-      HTML::Pipeline::EmojiFilter,
       Thredded::HtmlPipeline::AtMentionFilter,
       Thredded::HtmlPipeline::SpoilerTagFilter::AfterMarkup,
     ]

data/lib/thredded/database_seeder.rb

@@ -229,12 +229,13 @@ module Thredded
     end
 
     def read_topic(topic, user_id)
-      read_state = Thredded::UserTopicReadState.find_or_initialize_by(user_id: user_id, postable_id: topic.id)
-      if rand(2).zero?
-        read_state.update!(read_at: topic.updated_at)
-      else
-        read_state.update!(read_at: topic.posts.order_newest_first.first(2).last.created_at)
-      end
+      last_read_post =
+        if rand(2).zero?
+          topic.posts.order_newest_first.first(2).last
+        else
+          topic.posts.order_newest_first.first
+        end
+      Thredded::UserTopicReadState.touch!(user_id, last_read_post)
     end
 
     class BaseSeedData

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.16.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -213,20 +213,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gemoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -591,6 +577,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: twemoji
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -752,6 +752,7 @@ files:
 - app/assets/stylesheets/thredded/layout/_search-navigation.scss
 - app/assets/stylesheets/thredded/layout/_user-navigation.scss
 - app/assets/stylesheets/thredded/layout/_user.scss
+- app/assets/stylesheets/thredded/utilities/_flex.scss
 - app/assets/stylesheets/thredded/utilities/_is-compact.scss
 - app/assets/stylesheets/thredded/utilities/_is-expanded.scss
 - app/commands/thredded/at_notification_extractor.rb
@@ -855,6 +856,7 @@ files:
 - app/view_hooks/thredded/all_view_hooks.rb
 - app/view_models/thredded/base_topic_view.rb
 - app/view_models/thredded/messageboard_group_view.rb
+- app/view_models/thredded/messageboard_view.rb
 - app/view_models/thredded/post_view.rb
 - app/view_models/thredded/posts_page_view.rb
 - app/view_models/thredded/private_topic_view.rb
@@ -878,9 +880,13 @@ files:
 - app/views/thredded/messageboards/_form.html.erb
 - app/views/thredded/messageboards/_messageboard.html.erb
 - app/views/thredded/messageboards/_messageboard_actions.html.erb
-- app/views/thredded/messageboards/_messageboard_meta.html.erb
 - app/views/thredded/messageboards/edit.html.erb
 - app/views/thredded/messageboards/index.html.erb
+- app/views/thredded/messageboards/messageboard/_description.html.erb
+- app/views/thredded/messageboards/messageboard/_header.html.erb
+- app/views/thredded/messageboards/messageboard/_last_updated.html.erb
+- app/views/thredded/messageboards/messageboard/_meta.html.erb
+- app/views/thredded/messageboards/messageboard/_unread_followed_topics_badge.html.erb
 - app/views/thredded/messageboards/new.html.erb
 - app/views/thredded/moderation/_nav.html.erb
 - app/views/thredded/moderation/_post.html.erb
@@ -1006,10 +1012,10 @@ files:
 - db/upgrade_migrations/20170420163138_upgrade_thredded_v0_11_to_v0_12.rb
 - db/upgrade_migrations/20170811090735_upgrade_thredded_v0_13_to_v0_14.rb
 - db/upgrade_migrations/20180110200009_upgrade_thredded_v0_14_to_v0_15.rb
+- db/upgrade_migrations/20180930063614_upgrade_thredded_v0_15_to_v0_16.rb
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb
-- lib/tasks/thredded_tasks.rake
 - lib/thredded.rb
 - lib/thredded/arel_compat.rb
 - lib/thredded/base_migration.rb

data/app/views/thredded/messageboards/_messageboard_meta.html.erb

@@ -1,13 +0,0 @@
-<div class="thredded--messageboard--meta">
-  <% if messageboard.locked? %>
-    <span class="thredded--messageboard--meta--locked"
-          title="<%= t('thredded.messageboard.form.locked_notice') %>">
-      <%= inline_svg('thredded/lock.svg', class: 'thredded--messageboard--meta--icon') %>
-    </span>
-  <% end %>
-  <h3 class="thredded--messageboard--meta--counts">
-    <%= t 'thredded.messageboard.topics_and_posts_counts',
-          topics_count: number_with_delimiter(messageboard.topics_count),
-          posts_count: number_with_delimiter(messageboard.posts_count) %>
-  </h3>
-</div>

data/lib/tasks/thredded_tasks.rake

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-namespace :thredded do
-  namespace :install do
-    desc 'Copy emoji to the Rails `public/emoji` directory'
-    task :emoji do
-      require 'emoji'
-
-      target = Rails.application.root.join('public')
-      STDERR.puts "Copying emoji to #{target}"
-      `mkdir -p '#{target}' && cp -Rp '#{Emoji.images_path}/emoji' '#{target}'`
-    end
-  end
-end