biovision-comment 0.8.190926.0 → 0.12.200627.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa9177ba4ca81f53183269587c9ff8d1ab7da046904e65616a72686856b1b44
-  data.tar.gz: 24550aecb8c28841f760bbe9f4caef9ca502efb0c396450ab39f5a18f2499856
+  metadata.gz: fcfc0b5b350911016a52aca91b97a22d97fcb9b56db8f9eb9c896461b44bfb4f
+  data.tar.gz: 7fa54e4a1fdab7e2af536625e4997cfa5b8af28d50857193cb09dbd6757014e3
 SHA512:
-  metadata.gz: b49ee2521b7c018184f042c464d905c6209452f21aacdb636327a4a07fe254ea79a34ff522ff7257531727e441076e8faf4f683fb8c3e235291904d58c7e8134
-  data.tar.gz: 967b2cb830a8f4076c45c4ccdac61152f88943e67e0a3b5d13c642241e896bd6464c55f017f48884a5e7e4327214ceaa879a4d7cdda6dab94c06f297272370f2
+  metadata.gz: 28ea2988dac507f37e3b434944e73ac81ad4b66277b15b4e15a7b8c6a81b50a4c56d4beeef240baa7cf707e1bf09bcb43b8e3dc02deb3d0ab0205982daa2cd3c
+  data.tar.gz: 9aa0e6476f9b048c132f5ba7232918b9e9fc990578b75557a6a0beda636fc46724dfd56220dc7300bbec44a176ed9e98769de96ea721e38b765ce1bb3733f162

data/app/assets/stylesheets/biovision/comment/comments.scss

@@ -82,6 +82,7 @@ $row-background-odd: #fafafa !default;
 
   .comment-wrapper {
     display: flex;
+    flex-wrap: wrap;
   }
 
   .vote-block {
@@ -152,6 +153,16 @@ $row-background-odd: #fafafa !default;
   .children {
     margin-left: var(--spacer-xs, .8rem);
   }
+
+  .approval-buttons {
+    padding: var(--spacer-xs);
+    text-align: center;
+    width: 100%;
+
+    button {
+      cursor: pointer;
+    }
+  }
 }
 
 .comment-form {

data/app/controllers/admin/comments_controller.rb

@@ -19,6 +19,7 @@ class Admin::CommentsController < AdminController
   # put /admin/comments/:id/approve
   def approve
     @entity.update(approved: true)
+    component_handler.class.notify(@entity)
 
     head :no_content
   end
@@ -31,8 +32,8 @@ class Admin::CommentsController < AdminController
 
   protected
 
-  def component_slug
-    Biovision::Components::CommentsComponent::SLUG
+  def component_class
+    Biovision::Components::CommentsComponent
   end
 
   def restrict_access

data/app/controllers/comments_controller.rb

@@ -51,8 +51,8 @@ class CommentsController < ApplicationController
 
   private
 
-  def component_slug
-    Biovision::Components::CommentsComponent::SLUG
+  def component_class
+    Biovision::Components::CommentsComponent
   end
 
   def restrict_access
@@ -65,9 +65,11 @@ class CommentsController < ApplicationController
   end
 
   def create_comment
-    @entity = component_handler.create_comment(creation_parameters)
+    verify_captcha_and_create
     if @entity.valid?
-      notify_participants
+      unless @entity.approved?
+        flash[:notice] = t('comments.create.premoderation')
+      end
       next_page = param_from_request(:return_url)
       form_processed_ok(next_page.match?(%r{\A/[^/]}) ? next_page : root_path)
     else
@@ -89,8 +91,12 @@ class CommentsController < ApplicationController
     params.require(:comment).permit(permitted).merge(owner_for_entity(true))
   end
 
-  def notify_participants
-    flash[:notice] = t('comments.create.premoderation') unless @entity.approved?
-    # to be implemented...
+  protected
+
+  def verify_captcha_and_create
+    entity = Comment.new(creation_parameters)
+    verify_recaptcha(model: entity) if component_handler.use_captcha?
+
+    @entity = component_handler.create_comment(entity)
   end
 end

data/app/helpers/comments_helper.rb

@@ -15,6 +15,7 @@ module CommentsHelper
   def comment_link(entity, text = entity.commentable_name, options = {})
     anchor = options.key?(:anchor)
     options.delete(:anchor)
-    link_to(text, CommentsManager.commentable_path(entity, anchor), options)
+    path = Biovision::Components::CommentsComponent.commentable_path(entity, anchor)
+    link_to(text, path, options)
   end
 end

data/app/mailers/comment_mailer.rb

@@ -1,8 +1,26 @@
+# frozen_string_literal: true
+
+# Mailer for sending comment notifications
 class CommentMailer < ApplicationMailer
-  # @param [Integer] comment
+  # @param [Integer] comment_id
   def entry_reply(comment_id)
     @comment = Comment.find_by(id: comment_id)
 
-    mail to: @comment.commentable.user.email unless @comment.nil?
+    return if @comment.nil?
+
+    user = @comment.commentable.user
+
+    mail(to: user.email) if user.can_receive_letters?
+  end
+
+  # @param [Integer] comment_id
+  def comment_reply(comment_id)
+    @comment = Comment.find_by(id: comment_id)
+
+    return if @comment.nil?
+
+    user = @comment.parent.user
+
+    mail(to: user.email) if user.can_receive_letters?
   end
 end

data/app/models/comment.rb

@@ -11,6 +11,7 @@
 #   commentable_id [Integer]
 #   commentable_type [String]
 #   created_at [DateTime]
+#   data [JSON]
 #   deleted [Boolean]
 #   downvote_count [Integer]
 #   ip [Inet], optional
@@ -50,6 +51,7 @@ class Comment < ApplicationRecord
   scope :chronological, -> { order 'id asc' }
   scope :approved, -> { where(approved: true) }
   scope :visible, -> { approved.where(deleted: false, visible: true, spam: false) }
+  scope :search, ->(q) { where("to_tsvector('russian', body) @@ phraseto_tsquery('russian', ?)", q.to_s) unless q.blank? }
   scope :list_for_administration, -> { recent }
   scope :list_for_visitors, -> { visible.chronological }
   scope :list_for_visitors_recent, -> { visible.recent }
@@ -110,12 +112,18 @@ class Comment < ApplicationRecord
   end
 
   def notify_entry_owner?
+    return false unless commentable.respond_to?(:user)
+
     entry_owner = commentable.user
-    if entry_owner.is_a?(User) && !owned_by?(entry_owner)
-      entry_owner.can_receive_letters?
-    else
-      false
-    end
+    return false if entry_owner.nil? || owned_by?(entry_owner)
+
+    !entry_owner.nil?
+  end
+
+  def notify_parent_owner?
+    return false if parent.nil?
+
+    !parent.owned_by?(user)
   end
 
   def text_for_link
@@ -127,7 +135,9 @@ class Comment < ApplicationRecord
   end
 
   def commentable_title
-    if commentable.respond_to?(:title)
+    if commentable.respond_to?(:title!)
+      commentable.title!
+    elsif commentable.respond_to?(:title)
       commentable.title
     else
       commentable_name
@@ -138,6 +148,13 @@ class Comment < ApplicationRecord
     user.nil? ? author_name : user.profile_name
   end
 
+  # @param [Integer] word_count
+  def preview(word_count = 50)
+    words = body.split(/\s+/)
+    ellipsis = words.count > word_count ? '…' : ''
+    words.first(word_count).join(' ') + ellipsis
+  end
+
   private
 
   def commentable_is_commentable

data/app/models/concerns/commentable_item.rb

@@ -10,6 +10,6 @@ module CommentableItem
 
   # @param [User] user
   def commentable_by?(user)
-    !user.nil?
+    respond_to?(:visible_to?) ? visible_to?(user) : !user.nil?
   end
 end

data/app/services/biovision/components/comments_component.rb

@@ -10,28 +10,73 @@ module Biovision
         %w[moderator]
       end
 
+      # @param [Comment] comment
+      # @param [TrueClass|FalseClass] anchor
+      def self.commentable_path(comment, anchor = false)
+        method_name = "#{comment.commentable_type}_path".downcase.to_sym
+        if comment.commentable.respond_to?(:url)
+          result = comment.commentable.url
+          anchor ? "#{result}#comment-#{comment.id}" : result
+        else
+          "##{method_name}"
+        end
+      end
+
+      # @param [Comment] comment
+      def self.notify(comment)
+        return if comment.data['notified']
+
+        if comment.parent.nil?
+          if comment.notify_entry_owner?
+            CommentMailer.entry_reply(comment.id).deliver_later
+          end
+        elsif comment.notify_parent_owner?
+          CommentMailer.comment_reply(comment.id).deliver_later
+        end
+
+        comment.data['notified'] = true
+        comment.save
+      end
+
       def use_parameters?
         false
       end
 
-      # @param [Hash] parameters
-      def create_comment(parameters)
-        @comment = ::Comment.new(parameters)
+      # @param [Hash|Comment] data
+      def create_comment(data)
+        @comment = data.is_a?(::Comment) ? data : ::Comment.new(data)
+        limit_comment_body
         @comment.approved = approval_flag if settings['premoderation']
-        @comment.save
+        trap_spam if settings['trap_spam']
+        @comment.save unless ignore?
+        self.class.notify(@comment) if @comment.approved?
+
         @comment
       end
 
+      def use_captcha?
+        return false unless settings['recaptcha']
+        return false unless Gem.loaded_specs.key?('recaptcha')
+        return true if user.nil?
+
+        gate = settings['auto_approve_threshold'].to_i
+        positive = ::Comment.where(user: user, approved: true).count
+        negative = ::Comment.where(user: user, approved: false).count
+        positive - negative < gate
+      end
+
       protected
 
       # @param [Hash] data
       # @return [Hash]
       def normalize_settings(data)
         result = {}
-        flags  = %w[premoderation]
+        flags = %w[premoderation trap_spam recaptcha ignore_spam]
         flags.each { |f| result[f] = data[f].to_i == 1 }
-        numbers = %w[auto_approve_threshold]
+        numbers = %w[auto_approve_threshold body_limit spam_link_threshold]
         numbers.each { |f| result[f] = data[f].to_i }
+        strings = %w[spam_pattern]
+        strings.each { |f| result[f] = data[f].to_s }
 
         result
       end
@@ -40,15 +85,41 @@ module Biovision
         threshold = settings['auto_approve_threshold']
         if @comment.user.nil?
           criteria = {
-            user_id: nil,
-            ip: @comment.ip,
-            agent_id: @comment.agent_id
+            agent_id: @comment.agent_id, ip: @comment.ip, user_id: nil
           }
           ::Comment.approved.where(criteria).count >= threshold
         else
           ::Comment.approved.owned_by(@comment.user).count >= threshold
         end
       end
+
+      def trap_spam
+        @comment.approved = !spam?
+      end
+
+      def spam?
+        pattern = settings['spam_pattern']
+        return false if pattern.blank?
+
+        threshold = settings['spam_link_threshold'].to_i
+
+        @comment.body.scan(Regexp.new(pattern, 'i')).length > threshold
+      rescue RegexpError => e
+        Rails.logger.warn(e)
+        false
+      end
+
+      def ignore?
+        settings['ignore_spam'] && spam?
+      end
+
+      def limit_comment_body
+        body_limit = @component.settings['body_limit'].to_i
+        body_limit = 5000 if body_limit < 1
+        body_limit -= 1
+
+        @comment.body = @comment.body.to_s[0..body_limit]
+      end
     end
   end
 end

data/app/services/comment_handler.rb

@@ -6,9 +6,8 @@ class CommentHandler
 
   # @param [User] user
   def initialize(user = nil)
-    slug = Biovision::Components::CommentsComponent::SLUG
     @user = user
-    @handler = Biovision::Components::BaseComponent.handler(slug, user)
+    @handler = Biovision::Components::CommentsComponent[user]
   end
 
   # Get list of comments for entity

data/app/views/admin/comments/entity/_in_list.html.erb

@@ -12,13 +12,13 @@
 
   <div class="info">
     <%= entity.commentable_name %>
-    (<%= entity.commentable_title %>)<br/>
+    (<cite><%= entity.commentable_title %></cite>)<br/>
     <%= admin_user_link(entity.user) %>,
     <%= time_tag entity.created_at %>
   </div>
 
   <div class="secondary info">
-    <%= simple_format(entity.body) %>
+    <p><%= entity.preview %></p>
   </div>
 
   <% unless entity.approved? %>
@@ -31,7 +31,7 @@
   <ul class="actions">
     <li><%= edit_icon(edit_comment_path(id: entity.id)) %></li>
     <% unless entity.deleted? %>
-      <li><%= world_icon(CommentsManager.commentable_path(entity, true)) %></li>
+      <li><%= world_icon(Biovision::Components::CommentsComponent.commentable_path(entity, true)) %></li>
       <li class="danger"><%= destroy_icon(entity) %></li>
     <% end %>
   </ul>

data/app/views/admin/comments/show.html.erb

@@ -14,7 +14,7 @@
   <ul class="actions">
     <li><%= back_icon(admin_comments_path) %></li>
     <% unless @entity.deleted? %>
-      <li><%= world_icon(CommentsManager.commentable_path(@entity, true)) %></li>
+      <li><%= world_icon(Biovision::Components::CommentsComponent.commentable_path(@entity, true)) %></li>
     <% end %>
     <% unless @entity.locked? %>
       <li><%= edit_icon edit_comment_path(id: @entity.id) %></li>

data/app/views/comment_mailer/comment_reply.html.erb

@@ -0,0 +1,18 @@
+<%
+  relative_path = Biovision::Components::CommentsComponent.commentable_path(@comment, true)
+  protocol = ActionMailer::Base.default_url_options[:protocol] || 'http'
+  url = "#{protocol}://" + ActionMailer::Base.default_url_options[:host] + relative_path
+%>
+<p>Здравствуйте, <%= @comment.parent.user.name_for_letter %>.</p>
+
+<p>
+  На&nbsp;ваш <%= link_to('комментарий', url) %> к&nbsp;записи
+  «<%= @comment.commentable_title %>» оставили ответ.
+</p>
+
+<figure style="margin-left:0;border-left:2px solid #777777;padding:10px">
+  <figcaption style="font-weight:700"><%= @comment.profile_name %>:</figcaption>
+  <blockquote>
+    <%= simple_format(@comment.body) %>
+  </blockquote>
+</figure>

data/app/views/comment_mailer/entry_reply.html.erb

@@ -0,0 +1,18 @@
+<%
+  relative_path = Biovision::Components::CommentsComponent.commentable_path(@comment)
+  protocol = ActionMailer::Base.default_url_options[:protocol] || 'http'
+  url = "#{protocol}://" + ActionMailer::Base.default_url_options[:host] + relative_path
+%>
+<p>Здравствуйте, <%= @comment.commentable.user.name_for_letter %>.</p>
+
+<p>
+  На&nbsp;вашу запись «<%= link_to(@comment.commentable_title, url) %>»
+  оставили комментарий.
+</p>
+
+<figure style="margin-left:0;border-left:2px solid #777777;padding:10px">
+  <figcaption style="font-weight:700"><%= @comment.profile_name %>:</figcaption>
+  <blockquote>
+    <%= simple_format(@comment.body) %>
+  </blockquote>
+</figure>

data/app/views/comments/_comment.html.erb

@@ -39,6 +39,13 @@
       <div class="body" itemprop="about">
         <%= simple_format(comment.body) %>
       </div>
+
+      <% if handler.allow?('moderator') && !comment.approved? %>
+        <div class="approval-buttons">
+          <button class="js-approve-comment button-primary" data-url="<%= approve_admin_comment_path(id: comment.id) %>" type="button"><%= t('admin.comments.entity.in_list.approve') %></button>
+          <button class="js-delete-comment button-destroy" data-url="<%= admin_comment_path(id: comment.id) %>" type="button"><%= t(:delete) %></button>
+        </div>
+      <% end %>
     </div>
 
     <% if show_container %>

data/app/views/comments/_form.html.erb

@@ -59,6 +59,10 @@
     <% end %>
 
     <div class="required">
+      <%
+        body_limit = BiovisionComponent['comments'].settings['body_limit'].to_i
+        body_limit = 5000 if body_limit < 1
+      %>
       <%= f.label :body %>
       <%=
         f.text_area(
@@ -67,7 +71,7 @@
             required: true,
             cols: 60,
             rows: 5,
-            maxlength: Comment::BODY_LIMIT,
+            maxlength: 5000,
             class: 'auto-expand',
             data: {
                 min_rows: 5,
@@ -77,7 +81,7 @@
         )
       %>
       <div class="check-result-error hidden" data-field="body"></div>
-      <div class="guideline"><%= t('.guidelines.body') %></div>
+      <div class="guideline"><%= t('.guidelines.body', limit: body_limit) %></div>
     </div>
   </div>
 

data/config/locales/comments-ru.yml

@@ -86,8 +86,13 @@ ru:
       guidelines:
         author_name: "Максимум 100 символов, обязательное поле."
         author_email: "Не показывается публично. Максимум 100 символов, обязательное поле."
-        body: "Максимум 5000 символов."
+        body: "Максимум %{limit} символов."
       disclaimer: "Отправляя комментарий, вы принимаете пользовательское соглашение и даёте своё согласие на обработку ваших персональных данных."
+  comment_mailer:
+    entry_reply:
+      subject: "Новый комментарий к вашей записи"
+    comment_reply:
+      subject: "Новый ответ на ваш комментарий"
   biovision:
     components:
       comments:
@@ -95,5 +100,11 @@ ru:
         privileges:
           moderator: "Модератор"
         settings:
-          premoderation: "Премодерация"
           auto_approve_threshold: "Порог автоматического одобрения"
+          body_limit: "Максимальная длина"
+          ignore_spam: "Игнорировать спам"
+          premoderation: "Премодерация"
+          spam_link_threshold: "Порог попаданий шаблона для пометки как спам"
+          spam_pattern: "RegEx для ловли спама"
+          trap_spam: "Отлавливать спам"
+          recaptcha: "Использовать reCaptcha"

data/db/{migrate → amends}/20190428212122_create_comments_component.rb

@@ -3,14 +3,16 @@
 # Create row for comments component in components table
 class CreateCommentsComponent < ActiveRecord::Migration[5.2]
   def up
-    slug = Biovision::Components::CommentsComponent::SLUG
+    slug = Biovision::Components::CommentsComponent.slug
     return if BiovisionComponent.exists?(slug: slug)
 
     BiovisionComponent.create!(
       slug: slug,
       settings: {
+        auto_approve_threshold: 3,
         premoderation: false,
-        auto_approve_threshold: 3
+        spam_link_threshold: 0,
+        trap_spam: true
       }
     )
   end

data/db/migrate/20170914000001_create_comments.rb

@@ -16,6 +16,7 @@ class CreateComments < ActiveRecord::Migration[5.0]
   def create_comments_table
     create_table :comments, comment: 'Comment for commentable item' do |t|
       t.timestamps
+      t.uuid :uuid
       t.integer :parent_id
       t.references :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
       t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
@@ -25,9 +26,6 @@ class CreateComments < ActiveRecord::Migration[5.0]
       t.boolean :deleted, default: false, null: false
       t.boolean :spam, default: false, null: false
       t.boolean :approved, default: true, null: false
-      t.integer :upvote_count, default: 0, null: false
-      t.integer :downvote_count, default: 0, null: false
-      t.integer :vote_result, default: 0, null: false
       t.integer :commentable_id, null: false
       t.string :commentable_type, null: false
       t.string :author_name
@@ -36,20 +34,32 @@ class CreateComments < ActiveRecord::Migration[5.0]
       t.jsonb :data, default: {}, null: false
     end
 
+    add_index :comments, :uuid, unique: true
     add_index :comments, :data, using: :gin
     add_index :comments, %i[commentable_id commentable_type]
+    add_index :comments, %i[approved agent_id ip]
     add_foreign_key :comments, :comments, column: :parent_id, on_update: :cascade, on_delete: :cascade
+
+    execute %(
+      create index if not exists
+        comments_search_idx on comments
+        using gin(to_tsvector('russian', body));
+    )
   end
 
   def create_component_record
-    slug = Biovision::Components::CommentsComponent::SLUG
+    slug = Biovision::Components::CommentsComponent.slug
     return if BiovisionComponent.exists?(slug: slug)
 
     BiovisionComponent.create!(
       slug: slug,
       settings: {
+        auto_approve_threshold: 3,
+        body_limit: 5000,
         premoderation: false,
-        auto_approve_threshold: 3
+        spam_link_threshold: 0,
+        trap_spam: true,
+        spam_pattern: 'https?://[a-z0-9]+'
       }
     )
   end

data/db/migrate/20191017202020_add_search_index_to_comments.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Add full-text search for comments
+class AddSearchIndexToComments < ActiveRecord::Migration[5.2]
+  def up
+    execute %(
+      create index if not exists
+        comments_search_idx on comments 
+        using gin(to_tsvector('russian', body));
+    )
+  end
+
+  def down
+    execute %(drop index if exists comments_search_idx)
+  end
+end

data/db/migrate/20200208090909_convert_comments_vote_data.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Move vote component fields into data
+class ConvertCommentsVoteData < ActiveRecord::Migration[5.2]
+  def up
+    return unless column_exists?(:comments, :vote_result)
+
+    add_column :comments, :uuid, :uuid
+
+    Comment.order('id asc').each do |comment|
+      comment.data['votes'] = {
+        up: comment.upvote_count,
+        down: comment.downvote_count,
+        total: comment.vote_result
+      }
+      comment.save!
+    end
+
+    remove_column :comments, :upvote_count
+    remove_column :comments, :downvote_count
+    remove_column :comments, :vote_result
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/comment/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Comment
-    VERSION = '0.8.190926.0'
+    VERSION = '0.12.200627.0'
   end
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: biovision-comment
 version: !ruby/object:Gem::Version
-  version: 0.8.190926.0
+  version: 0.12.200627.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: rails-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: biovision-base
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  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: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +108,14 @@ files:
 - app/models/concerns/commentable_item.rb
 - app/services/biovision/components/comments_component.rb
 - app/services/comment_handler.rb
-- app/services/comments_manager.rb
 - app/views/admin/comments/_comment.html.erb
 - app/views/admin/comments/_nav_item.html.erb
 - app/views/admin/comments/entity/_in_list.html.erb
 - app/views/admin/comments/index.html.erb
 - app/views/admin/comments/show.html.erb
 - app/views/admin/components/links/_comments.html.erb
-- app/views/comment_mailer/entry_reply.text.erb
+- app/views/comment_mailer/comment_reply.html.erb
+- app/views/comment_mailer/entry_reply.html.erb
 - app/views/comments/_comment.html.erb
 - app/views/comments/_form.html.erb
 - app/views/comments/_list.html.erb
@@ -168,11 +126,13 @@ files:
 - app/views/layouts/biovision/comment/application.html.erb
 - config/locales/comments-ru.yml
 - config/routes.rb
+- db/amends/20190203090909_add_fields_to_comments.rb
+- db/amends/20190428212121_add_approved_to_comments.rb
+- db/amends/20190428212122_create_comments_component.rb
+- db/amends/20190628101010_add_data_to_comments.rb
 - db/migrate/20170914000001_create_comments.rb
-- db/migrate/20190203090909_add_fields_to_comments.rb
-- db/migrate/20190428212121_add_approved_to_comments.rb
-- db/migrate/20190428212122_create_comments_component.rb
-- db/migrate/20190628101010_add_data_to_comments.rb
+- db/migrate/20191017202020_add_search_index_to_comments.rb
+- db/migrate/20200208090909_convert_comments_vote_data.rb
 - lib/biovision/comment.rb
 - lib/biovision/comment/engine.rb
 - lib/biovision/comment/version.rb
@@ -196,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Commenting for biovision-based applications

data/app/services/comments_manager.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# Tool for handling comments
-class CommentsManager
-  # @param [Comment] comment
-  # @param [TrueClass|FalseClass] anchor
-  def self.commentable_path(comment, anchor = false)
-    method_name = "#{comment.commentable_type}_path".downcase.to_sym
-    if comment.commentable.respond_to?(:url)
-      result = comment.commentable.url
-      anchor ? "#{result}#comment-#{comment.id}" : result
-    else
-      "##{method_name}"
-    end
-  end
-end

data/app/views/comment_mailer/entry_reply.text.erb

@@ -1,7 +0,0 @@
-Здравствуйте, <%= @comment.commentable.user.name_for_letter %>.
-
-На вашу запись «<%= @comment.commentable.title %>»
-<%= url_for @comment.commentable %>
-
-Сам комментарий (<%= @comment.user.nil? ? 'анонимный' : @comment.user.profile_name %>):
-<%= @comment.body %>