thredded 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89649352c4f5481a4e2ad05a885e21a2bb9a5d0
-  data.tar.gz: 4b7bf4007f49a57fbf4a00b176750cb700a8a801
+  metadata.gz: 868d81f0b7ff77d6ae58e572377f1001be7131b7
+  data.tar.gz: f23376c4be14345f85932348d1b9745322ac642a
 SHA512:
-  metadata.gz: d2e4a2b77cd7495e279b80e910c20a28f236e1103974410ec3572cb0b99c482ec662f3eb5951f4f7cda7b4e88f5a8f6cdf4c430c363bcd63cc78384a58a5fae1
-  data.tar.gz: d36788984d19723bb7607042e2675d3da6a9103b76d2e550a8797e557e53ac4493fc2f6aee8d6496920e0dc24cbbffcd3b6bd9e96357ec3d07eb0dfb0fdc9fb7
+  metadata.gz: 11bf79cf05bbf641a8c78540d6d07c2522dbb6ba660de178bdbbe1d98a18958b0edbc4360eaf74b71bb6db71f3f60717eb945326791ae03903f0cf64d1fc780e
+  data.tar.gz: 12b1603c89e6e4660d67fb7a6ed90993c42d2edd408a261d8b15f107e201d1a47dbff2b157ad94628e74713cf9d4607f1ae2a10fcbdbf86b36b49a4dac6a5f95

data/CHANGELOG.mkdn

@@ -1,3 +1,18 @@
+# v0.6.1
+
+This is a minor bugfix release.
+
+## Added
+
+* Adds an Activity tab to moderation, with a list of all the forum topics and posts, most recent first.
+
+## Fixed
+
+* Moderation history rendering of deleted content.
+* Various bugs in @-mentions and highlighting.
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.6.0...v0.6.1.
+
 # 0.6.0 - 2016-06-12
 
 **NB:** If updating to this version from 0.5.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/66f64068b9501ff4e8686c95894b6795aae6082f/db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb).

data/README.mkdn

@@ -44,7 +44,7 @@ application and not an engine like Thredded.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.6.0'
+gem 'thredded', '~> 0.6.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -154,11 +154,12 @@ Thredded does not provide a user's profile page, but it provides a helper for re
 in your app's user profile page.
 
 To use it:
+
 1. Include `Thredded::ApplicationHelper` in the app's helpers module.
 2. Render the partial like this:
 
 ```erb
-<%= render 'thredded/users/_posts',
+<%= render 'thredded/users/posts',
            posts: Thredded.posts_page_view(
                scope: user.thredded_posts.order_newest_first.limit(5),
                current_user: current_user) %>

data/app/assets/stylesheets/thredded/layout/_moderation.scss

@@ -11,7 +11,8 @@
 .thredded--pending-moderation &--moderation-navigation--pending,
 .thredded--moderation-history &--moderation-navigation--history,
 .thredded--moderation-users &--moderation-navigation--users,
-.thredded--moderation-user &--moderation-navigation--users{
+.thredded--moderation-user &--moderation-navigation--users,
+.thredded--moderation-activity &--moderation-navigation--activity {
   @extend %thredded--nav-tabs--item-current;
 }
 

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -13,7 +13,8 @@
 .thredded--pending-moderation &--user-navigation--moderation,
 .thredded--moderation-history &--user-navigation--moderation,
 .thredded--moderation-users &--user-navigation--moderation,
-.thredded--moderation-user &--user-navigation--moderation {
+.thredded--moderation-user &--user-navigation--moderation,
+.thredded--moderation-activity &--user-navigation--moderation {
   @extend %thredded--nav-tabs--item-current;
 }
 

data/app/commands/thredded/at_notification_extractor.rb

@@ -1,16 +1,23 @@
 # frozen_string_literal: true
+require_dependency 'html/pipeline/at_mention_filter'
 module Thredded
   class AtNotificationExtractor
-    # Matches the names in @joe, @"Joe 1", but not email@host.com.
-    # The matched name is captured and may contain the surrounding quotes.
-    MATCH_NAME_RE = /(?:^|[\s>])@([\w]+|"[\w ]+")(?=\W|$)/
-
-    def initialize(content)
-      @content = content
+    def initialize(post)
+      @post = post
     end
 
+    # @return [Array<Thredded.user_class>]
     def run
-      @content.scan(MATCH_NAME_RE).map(&:first).map { |m| m.start_with?('"') ? m[1..-2] : m }.uniq
+      view_context = Thredded::ApplicationController.new.view_context
+      # Do not highlight @-mentions at first, because:
+      # * When parsing, @-mentions within <a> tags will not be considered.
+      # * We can't always generate the user URL here because request.host is not available.
+      html = @post.filtered_content(view_context, users_provider: nil)
+      HTML::Pipeline::AtMentionFilter.new(
+        html,
+        view_context: view_context,
+        users_provider: -> (user_names) { @post.readers_from_user_names(user_names).to_a }
+      ).mentioned_users
     end
   end
 end

data/app/commands/thredded/autofollow_mentioned_users.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_dependency 'thredded/at_notification_extractor'
 module Thredded
   class AutofollowMentionedUsers
     def initialize(post)
@@ -12,10 +13,9 @@ module Thredded
     end
 
     def autofollowers
-      user_names = Thredded::AtNotificationExtractor.new(post.content).run
-      autofollowers = post.readers_from_user_names(user_names).to_a
-      autofollowers.delete post.user
-      exclude_those_opting_out_of_at_notifications(autofollowers)
+      autofollowers = Thredded::AtNotificationExtractor.new(post).run
+      autofollowers.delete(post.user)
+      exclude_those_opting_out_of_at_notifications autofollowers
     end
 
     private

data/app/controllers/thredded/moderation_controller.rb

@@ -26,6 +26,19 @@ module Thredded
         .page(current_page)
     end
 
+    def activity
+      @posts = PostsPageView.new(
+        thredded_current_user,
+        moderatable_posts
+          .order_newest_first
+          .preload(:user, :postable)
+          .page(current_page)
+      )
+      if flash[:last_moderated_record_id]
+        @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
+      end
+    end
+
     def moderate_post
       return head(:bad_request) unless Thredded::Post.moderation_states.include?(params[:moderation_state])
       flash[:last_moderated_record_id] = ModeratePost.run!(

data/app/models/concerns/thredded/post_common.rb

@@ -25,11 +25,8 @@ module Thredded
 
     # @param view_context [Object] the context of the rendering view.
     # @return [String] formatted and sanitized html-safe post content.
-    def filtered_content(view_context)
-      Thredded::ContentFormatter.new(
-        view_context,
-        users_provider: -> (names) { readers_from_user_names(names) }
-      ).format_content(content)
+    def filtered_content(view_context, users_provider: -> (names) { readers_from_user_names(names) })
+      Thredded::ContentFormatter.new(view_context, users_provider: users_provider).format_content(content)
     end
 
     private

data/app/models/thredded/user_detail.rb

@@ -4,7 +4,7 @@ module Thredded
     include ModerationState
 
     belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_user_detail
-    validates :user_id, presence: true
+    validates :user_id, presence: true, uniqueness: true
 
     has_many :topics, class_name: 'Thredded::Topic', foreign_key: :user_id, primary_key: :user_id
     has_many :private_topics, class_name: 'Thredded::PrivateTopic', foreign_key: :user_id, primary_key: :user_id

data/app/models/thredded/user_topic_follow.rb

@@ -3,7 +3,7 @@ module Thredded
   class UserTopicFollow < ActiveRecord::Base
     enum reason: [:manual, :posted, :mentioned]
 
-    belongs_to :user, inverse_of: :thredded_topic_follows
+    belongs_to :user, inverse_of: :thredded_topic_follows, class_name: Thredded.user_class
     belongs_to :topic, inverse_of: :user_follows
 
     validates :user_id, presence: true

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

@@ -7,6 +7,9 @@
       <li class="thredded--moderation-navigation--item thredded--moderation-navigation--history">
         <%= link_to t('thredded.nav.moderation_history'), moderation_history_path %>
       </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--activity">
+        <%= link_to t('thredded.nav.moderation_activity'), moderation_activity_path %>
+      </li>
       <li class="thredded--moderation-navigation--item thredded--moderation-navigation--users">
         <%= link_to t('thredded.nav.moderation_users'), users_moderation_path %>
       </li>

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

@@ -10,5 +10,10 @@
   %>
   <%= render 'thredded/posts_common/content', post: post %>
   <%= render 'thredded/posts_common/actions', post: post %>
+  <% if post.blocked? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
   <%= render 'post_moderation_actions', post: post %>
 <% end %>

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

@@ -23,12 +23,12 @@
         <%= t('thredded.moderation.posts_content_changed_since_moderation_html', post_url: post_permalink_path(post)) %>
       </p>
     <% end %>
-    <%= t 'thredded.moderation.post_deleted_notice' unless post %>
+    <%= content_tag :em, t('thredded.moderation.post_deleted_notice') unless post %>
   </header>
   <article class="thredded--post">
     <% post_user_link = capture do %>
-      <% if post.user %>
-        <%= link_to post.user, user_moderation_path(post.user.id) %>
+      <% if record.post_user %>
+        <%= link_to record.post_user, user_moderation_path(record.post_user.id) %>
       <% else %>
         <%= safe_join [record.post_user_name, content_tag(:em, t('thredded.null_user_name'))].compact, ', ' %>
       <% end %>

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

@@ -3,5 +3,10 @@
   <%= render 'thredded/posts_common/header_with_topic', post: post %>
   <%= render 'thredded/posts_common/content', post: post %>
   <%= render 'thredded/posts_common/actions', post: post %>
+  <% if post.blocked? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
   <%= render 'post_moderation_actions', post: post %>
 <% end %>

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

@@ -0,0 +1,18 @@
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--moderation-activity' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <h1><%= t 'thredded.recent_activity' %></h1>
+  <%= content_tag :section, class: 'thredded--main-section' do %>
+    <% if @last_moderated_record %>
+      <div class="thredded--moderated-notice">
+        <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
+      </div>
+    <% end %>
+    <% if @posts.present? %>
+      <%= render partial: 'post', collection: @posts %>
+      <%= paginate @posts %>
+    <% end %>
+  <% end %>
+<% end %>

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 ---
 en:
   thredded:
+    recent_activity: Recent activity
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
@@ -9,7 +10,7 @@ en:
     form:
       update: Update
     content_moderation_states:
-      content_blocked_notice: Blocked by a moderator
+      content_blocked_notice: Blocked
       content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
     messageboard:
       create: Create a New Messageboard
@@ -51,6 +52,7 @@ en:
       moderation_history: History
       moderation_pending: Pending
       moderation_users: Users
+      moderation_activity: Activity
       private_topics: Private Messages
       settings: Notification Settings
     null_user_name: Deleted user
@@ -140,7 +142,7 @@ en:
     users:
       last_active_html: "Last active %{time_ago}"
       posted_in_topic_html: "Posted in %{topic_link}"
-      recent_activity: Recent activity
+      recent_activity: :thredded.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}"

data/config/locales/pt-BR.yml

@@ -2,7 +2,7 @@
 pt-BR:
   thredded:
     content_moderation_states:
-      content_blocked_notice: Bloqueado por um moderador
+      content_blocked_notice: Bloqueado
       content_blocked_notice_with_record_html: Bloqueados por %{moderator} %{time_ago}
     errors:
       login_required: Por favor, autentique-se primeiro.
@@ -48,6 +48,7 @@ pt-BR:
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Editar
       moderation: Moderação
+      moderation_activity: Atividade
       moderation_history: História
       moderation_pending: Pendente
       moderation_users: Usuários
@@ -108,6 +109,7 @@ pt-BR:
         create_btn: Inicie sua primeira conversa privada
         title: Você não possui mensagens privadas.
       updated_notice: Título atualizado
+    recent_activity: Atividade recente
     search:
       form:
         btn_submit: :thredded.search.form.label
@@ -144,7 +146,7 @@ pt-BR:
       posts_count:
         one: Postado uma vez
         other: vezes %{count} Publicado
-      recent_activity: Atividade recente
+      recent_activity: :thredded.recent_activity
       started_topic_html: Começou %{topic_link}
       started_topics_count:
         one: Começou um tópico

data/config/routes.rb

@@ -35,6 +35,7 @@ Thredded::Engine.routes.draw do
         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
+        get '/activity(/page-:page)', action: :activity, as: :moderation_activity
       end
       post '', action: :moderate_post, as: :moderate_post
       post '/user/:id', action: :moderate_user, as: :moderate_user

data/heroku.gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    thredded (0.6.0)
+    thredded (0.6.1)
       active_record_union (>= 1.1.1)
       autoprefixer-rails
       autosize-rails
@@ -30,7 +30,6 @@ PATH
       rails (>= 4.2.0)
       rails-timeago
       rb-gravatar
-      rinku
       sanitize
       sass (>= 3.4.21)
       select2-rails (~> 3.5)
@@ -212,7 +211,6 @@ GEM
     rb-gravatar (1.0.5)
     ref (2.0.0)
     request_store (1.3.1)
-    rinku (2.0.0)
     rollbar (2.11.5)
       multi_json
     sanitize (4.0.1)
@@ -228,7 +226,7 @@ GEM
       tilt (>= 1.1, < 3)
     select2-rails (3.5.10)
       thor (~> 0.14)
-    sprockets (3.6.0)
+    sprockets (3.6.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.9.0)

data/lib/html/pipeline/at_mention_filter.rb

@@ -1,23 +1,76 @@
 # frozen_string_literal: true
-require 'thredded/at_users'
-
 module HTML
   class Pipeline
     class AtMentionFilter < Filter
+      DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt a style).freeze
+
       # @param context [Hash]
       # @options context :users_provider [#call(usernames)] given usernames, returns a list of users.
-      def initialize(text, context = nil, result = nil)
-        super text, context, result
-        @text = text.to_s.delete("\r")
+      def initialize(doc, context = nil, result = nil)
+        super doc, context, result
         @users_provider = context[:users_provider]
         @view_context = context[:view_context]
       end
 
       def call
-        return html unless @users_provider
-        html = Thredded::AtUsers.render(@text, @users_provider, @view_context)
-        html.rstrip!
-        html
+        return doc unless @users_provider
+        process_text_nodes! do |node|
+          content = node.to_html
+          next unless content.include?('@')
+          highlight! content
+          node.replace content
+        end
+        doc
+      end
+
+      # @return [Array<Thredded.user_class>] users that were @-mentioned
+      def mentioned_users
+        return [] unless @users_provider
+        names = []
+        process_text_nodes! { |node| names.concat mentioned_names(node.to_html) }
+        names.uniq!
+        @users_provider.call(names)
+      end
+
+      private
+
+      MATCH_NAME_RE = /(?:^|[\s>])@([\w]+|"[\w ]+")(?=\W|$)/
+
+      def mentioned_names(text_node_html)
+        text_node_html.scan(MATCH_NAME_RE).map(&:first).map { |m| m.start_with?('"') ? m[1..-2] : m }
+      end
+
+      def highlight!(text_node_html)
+        names = mentioned_names(text_node_html)
+        return unless names.present?
+        @users_provider.call(names).each do |user|
+          name = user.to_s
+          maybe_quoted_name = name.include?(' ') ? %("#{name}") : name
+          url = Thredded.user_path(@view_context, user)
+          text_node_html.gsub!(
+            /(^|[\s>])(@#{Regexp.escape maybe_quoted_name})([^a-z\d]|$)/i,
+            %(\\1<a href="#{ERB::Util.html_escape url}">@#{ERB::Util.html_escape maybe_quoted_name}</a>\\3)
+          )
+        end
+      end
+
+      # Yields text nodes that should be processed.
+      def process_text_nodes!
+        doc.search('.//text()').each do |node|
+          next if has_ancestor?(node, ignored_ancestor_tags)
+          yield node
+        end
+      end
+
+      # Return ancestor tags to stop the at-mention highlighting.
+      #
+      # @return [Array<String>] Ancestor tags.
+      def ignored_ancestor_tags
+        if @context[:ignored_ancestor_tags]
+          DEFAULT_IGNORED_ANCESTOR_TAGS | @context[:ignored_ancestor_tags]
+        else
+          DEFAULT_IGNORED_ANCESTOR_TAGS
+        end
       end
     end
   end

data/lib/thredded/content_formatter.rb

@@ -43,13 +43,12 @@ module Thredded
     mattr_accessor :pipeline_filters
 
     self.pipeline_filters = [
-      HTML::Pipeline::AtMentionFilter,
       HTML::Pipeline::VimeoFilter,
       HTML::Pipeline::YoutubeFilter,
       HTML::Pipeline::BbcodeFilter,
       HTML::Pipeline::MarkdownFilter,
+      HTML::Pipeline::AtMentionFilter,
       HTML::Pipeline::EmojiFilter,
-      HTML::Pipeline::AutolinkFilter,
       HTML::Pipeline::SanitizationFilter,
     ].freeze
 

data/lib/thredded/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/thredded.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
   # html-pipeline dependencies, see https://github.com/jch/html-pipeline#dependencies
   s.add_dependency 'gemoji'
   s.add_dependency 'github-markdown'
-  s.add_dependency 'rinku'
   s.add_dependency 'sanitize'
 
   # frontend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbcoder
@@ -235,20 +235,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rinku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -788,6 +774,7 @@ files:
 - app/views/thredded/moderation/_user_moderation_state.html.erb
 - app/views/thredded/moderation/_user_post.html.erb
 - app/views/thredded/moderation/_users_search_form.html.erb
+- app/views/thredded/moderation/activity.html.erb
 - app/views/thredded/moderation/history.html.erb
 - app/views/thredded/moderation/pending.html.erb
 - app/views/thredded/moderation/user.html.erb
@@ -871,7 +858,6 @@ files:
 - lib/html/pipeline/bbcode_filter.rb
 - lib/tasks/thredded_tasks.rake
 - lib/thredded.rb
-- lib/thredded/at_users.rb
 - lib/thredded/content_formatter.rb
 - lib/thredded/engine.rb
 - lib/thredded/errors.rb

data/lib/thredded/at_users.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module Thredded
-  class AtUsers
-    # @param users_provider [#call(usernames)] given usernames, returns a list of users.
-    def self.render(content, users_provider, view_context)
-      at_names = AtNotificationExtractor.new(content).run
-
-      if at_names.any?
-        members = users_provider.call(at_names)
-
-        members.each do |member|
-          member_path = Thredded.user_path(view_context, member)
-          name = member.to_s
-          content.gsub!(/(^|[\s>])(@#{name.include?(' ') ? %("#{name}") : name})\b/i,
-                        %(\1<a href="#{ERB::Util.html_escape member_path}">@#{ERB::Util.html_escape name}</a>))
-        end
-      end
-
-      content
-    end
-  end
-end