decidim-comments 0.27.9 → 0.28.0.rc4

data/lib/decidim/comments/test/shared_examples/comment_event.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-shared_context "when it's a comment event" do
+shared_context "when it is a comment event" do
   include Decidim::ComponentPathHelper
   include Decidim::SanitizeHelper
 
@@ -16,10 +16,10 @@ shared_context "when it's a comment event" do
   let(:comment_author_name) { decidim_html_escape comment.author.name }
 
   let(:extra) { { comment_id: comment.id } }
-  let(:resource_title) { decidim_sanitize_translated(resource.title) }
+  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
   let(:user_group) do
-    user_group = create(:user_group, :verified, organization: organization, users: [comment_author])
-    comment.update!(user_group: user_group)
+    user_group = create(:user_group, :verified, organization:, users: [comment_author])
+    comment.update!(user_group:)
     user_group
   end
 end
@@ -42,37 +42,4 @@ shared_examples_for "a comment event" do
       expect(subject.resource_text).to eq comment.formatted_body
     end
   end
-
-  describe "hidden_resource?" do
-    context "when comment is not moderated" do
-      it "returns false" do
-        expect(subject.hidden_resource?).to be false
-      end
-    end
-
-    context "when comment is moderated" do
-      let(:comment) { create(:comment, :moderated) }
-
-      it "returns true" do
-        expect(subject.hidden_resource?).to be true
-      end
-    end
-
-    context "when resource is not moderated" do
-      it "returns false" do
-        expect(subject.hidden_resource?).to be false
-      end
-    end
-
-    context "when resource is moderated" do
-      before do
-        create(:moderation, reportable: resource, hidden_at: 2.days.ago)
-        resource.reload
-      end
-
-      it "returns true" do
-        expect(subject.hidden_resource?).to be true
-      end
-    end
-  end
 end

data/lib/decidim/comments/test/shared_examples/comment_voted_event.rb

@@ -3,16 +3,16 @@
 require "spec_helper"
 
 shared_examples_for "a comment voted event" do
-  include_context "when it's a comment event"
+  include_context "when it is a comment event"
 
   let(:resource) { comment.commentable }
 
   let(:comment) { create :comment }
-  let(:comment_vote) { create :comment_vote, comment: comment }
+  let(:comment_vote) { create :comment_vote, comment: }
   let(:comment_vote_author) { comment_vote.author }
 
-  let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight: weight, downvotes: 100, upvotes: 999 } }
-  let(:resource_title) { decidim_sanitize_translated(resource.title) }
+  let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight:, downvotes: 100, upvotes: 999 } }
+  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
   let(:resource_text) { subject.resource_text }
 
   let(:verb) { weight.positive? ? "upvoted" : "downvoted" }

data/lib/decidim/comments/test/shared_examples/create_comment_context.rb

@@ -2,13 +2,13 @@
 
 RSpec.shared_context "when creating a comment" do
   let(:organization) { create(:organization) }
-  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:participatory_process) { create(:participatory_process, organization:) }
   let(:component) { create(:component, participatory_space: participatory_process) }
-  let(:user) { create(:user, organization: organization) }
-  let(:author) { create(:user, organization: organization) }
-  let(:dummy_resource) { create :dummy_resource, component: component }
+  let(:user) { create(:user, organization:) }
+  let(:author) { create(:user, organization:) }
+  let(:dummy_resource) { create :dummy_resource, component: }
   let(:commentable) { dummy_resource }
-  let(:body) { ::Faker::Lorem.paragraph }
+  let(:body) { Faker::Lorem.paragraph }
   let(:alignment) { 1 }
   let(:user_group_id) { nil }
   let(:form_params) do

data/lib/decidim/comments/test/shared_examples/has_comments_availability_attributes.rb

@@ -5,11 +5,11 @@ shared_examples_for "has comments availability attributes" do
   let(:comments_start_time) { nil }
   let(:comments_end_time) { nil }
   let(:updates) do
-    { comments_enabled: comments_enabled }.merge(
+    { comments_enabled: }.merge(
       if subject.is_a?(Decidim::Debates::Debate)
         { start_time: comments_start_time, end_time: comments_end_time }
       else
-        { comments_start_time: comments_start_time, comments_end_time: comments_end_time }
+        { comments_start_time:, comments_end_time: }
       end
     )
   end

data/lib/decidim/comments/test/shared_examples/translatable_comment.rb

@@ -6,10 +6,10 @@ shared_examples_for "a translated comment event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
     let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
-    let(:participatory_process) { create :participatory_process, organization: organization }
+    let(:participatory_process) { create :participatory_process, organization: }
     let(:component) { create(:component, participatory_space: participatory_process) }
-    let(:commentable) { create(:dummy_resource, component: component) }
-    let(:comment) { create :comment, body: body, commentable: commentable }
+    let(:commentable) { create(:dummy_resource, component:) }
+    let(:comment) { create :comment, body:, commentable: }
     let(:en_version) { "<div><p>#{comment.body["en"]}</p></div>" }
     let(:machine_translated) { "<div><p>#{comment.body["machine_translations"]["ca"]}</p></div>" }
 

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.27.9"
+      "0.28.0.rc4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.27.9
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -87,23 +87,21 @@ files:
 - Rakefile
 - app/cells/decidim/comments/comment/actions.erb
 - app/cells/decidim/comments/comment/alignment_badge.erb
-- app/cells/decidim/comments/comment/author.erb
 - app/cells/decidim/comments/comment/deletion_data.erb
 - app/cells/decidim/comments/comment/moderation_data.erb
+- app/cells/decidim/comments/comment/replies.erb
 - app/cells/decidim/comments/comment/show.erb
-- app/cells/decidim/comments/comment/utilities.erb
 - app/cells/decidim/comments/comment/votes.erb
 - app/cells/decidim/comments/comment_activity_cell.rb
 - app/cells/decidim/comments/comment_card_cell.rb
 - app/cells/decidim/comments/comment_cell.rb
 - app/cells/decidim/comments/comment_form/comment_as.erb
+- app/cells/decidim/comments/comment_form/opinion.erb
 - app/cells/decidim/comments/comment_form/show.erb
 - app/cells/decidim/comments/comment_form_cell.rb
-- app/cells/decidim/comments/comment_m/footer.erb
-- app/cells/decidim/comments/comment_m/top.erb
-- app/cells/decidim/comments/comment_m_cell.rb
+- app/cells/decidim/comments/comment_metadata_cell.rb
+- app/cells/decidim/comments/comment_s_cell.rb
 - app/cells/decidim/comments/comment_thread/show.erb
-- app/cells/decidim/comments/comment_thread/title.erb
 - app/cells/decidim/comments/comment_thread_cell.rb
 - app/cells/decidim/comments/comments/add_comment.erb
 - app/cells/decidim/comments/comments/blocked_comments_warning.erb
@@ -134,14 +132,17 @@ files:
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
 - app/helpers/decidim/comments/comment_cells_helper.rb
+- app/jobs/decidim/comments/hide_all_created_by_author_job.rb
 - app/models/decidim/comments/application_record.rb
 - app/models/decidim/comments/comment.rb
 - app/models/decidim/comments/comment_vote.rb
 - app/models/decidim/comments/seed.rb
+- app/packs/entrypoints/decidim_comments.js
 - app/packs/src/decidim/comments/comments.component.js
 - app/packs/src/decidim/comments/comments.component.test.js
 - app/packs/src/decidim/comments/comments.component_for_testing.js
 - app/packs/src/decidim/comments/comments.js
+- app/packs/stylesheets/comments.scss
 - app/permissions/decidim/comments/permissions.rb
 - app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb
 - app/queries/decidim/comments/metrics/comments_metric_manage.rb
@@ -199,7 +200,6 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
-- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -263,9 +263,7 @@ files:
 - db/migrate/20200828101910_add_commentable_counter_cache_to_comments.rb
 - db/migrate/20210402124534_add_participatory_process_to_comments.rb
 - db/migrate/20210529095942_add_deleted_at_column_to_comments.rb
-- db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb
 - db/seeds.rb
-- decidim-comments.gemspec
 - lib/decidim/api/add_comment_type.rb
 - lib/decidim/api/comment_mutation_type.rb
 - lib/decidim/api/comment_type.rb
@@ -296,26 +294,31 @@ files:
 - lib/decidim/comments/test/shared_examples/translatable_comment.rb
 - lib/decidim/comments/version.rb
 - lib/tasks/decidim_comments.rake
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Decidim comments module

data/app/cells/decidim/comments/comment/author.erb

@@ -1 +0,0 @@
-<%== cell("decidim/author", author_presenter).profile %>

data/app/cells/decidim/comments/comment/utilities.erb

@@ -1,41 +0,0 @@
-<div class="comment__header__context-menu">
-  <label for="<%= context_menu_id %>" data-toggle="<%= context_menu_id %>">
-    <%= icon "ellipses" %>
-  </label>
-  <ul id="<%= context_menu_id %>" data-dropdown data-close-on-click="true" data-position="left" data-alignment="top" class="card dropdown-pane comment__header__context-menu__content">
-    <li>
-      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" title="<%= t("decidim.components.comment.report.title") %>" aria-controls="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" aria-haspopup="dialog" tabindex="0">
-        <%= icon "flag", class: "icon--small", aria_label: t("decidim.components.comment.report.title") %>
-        <span><%= t("decidim.components.comment.report.action") %></span>
-      </button>
-    </li>
-    <li>
-      <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", class: "comment__header__context-menu__content-item", title: t("decidim.components.comment.single_comment_link_title") do %>
-        <%= icon "link-intact", class: "icon--small", aria_label: t("decidim.components.comment.single_comment_link_title") %>
-        <span><%= t("decidim.components.comment.single_comment_link_title") %></span>
-      <% end %>
-    </li>
-    <% if model.authored_by?(current_user) %>
-      <li>
-      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog" tabindex="0">
-          <%= icon "pencil", class: "icon--small", aria_label: t("decidim.components.comment.edit") %>
-          <span><%= t("decidim.components.comment.edit") %></span>
-      </button>
-      </li>
-      <li>
-        <%= link_to comment_path, remote: true, method: :delete, class: "comment__header__context-menu__content-item", data: { confirm: t("decidim.components.comment.confirm_destroy") } do %>
-          <%= icon "trash", class: "icon--small", aria_label: t("decidim.components.comment.delete") %>
-          <span><%= t("decidim.components.comment.delete") %></span>
-        <% end %>
-      </li>
-    <% end %>
-  </ul>
-</div>
-<% unless reloaded? %>
-  <% if current_user.present? %>
-    <%= cell("decidim/flag_modal", model, modal_id: "flagModalComment#{model.id}") %>
-  <% end %>
-  <% if model.authored_by?(current_user) %>
-    <%= cell("decidim/comments/edit_comment_modal_form", model, modal_id: "editCommentModal#{model.id}") %>
-  <% end %>
-<% end %>

data/app/cells/decidim/comments/comment_m/footer.erb

@@ -1,5 +0,0 @@
-<div class="card__footer">
-  <div class="card__support">
-    <%= link_to t("view", scope: "decidim.comments"), resource_link_path, class: "card__button button button--sc small" %>
-  </div>
-</div>

data/app/cells/decidim/comments/comment_m/top.erb

@@ -1,7 +0,0 @@
-<div class="card__top">
-  <% if render_space? %>
-    <div class="card__content text-small">
-      <span class="muted"><%= searchable_resource_human_name(model.root_commentable.class, count: 1) %>:</span>&nbsp;<%= link_to root_commentable_title, resource_link_path, class: "card__link text-ellipsis" %>
-    </div>
-  <% end %>
-</div>

data/app/cells/decidim/comments/comment_m_cell.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    # This cell renders the Medium (:m) comment card
-    # for an given instance of a Comment
-    class CommentMCell < Decidim::CardMCell
-      include CommentCellsHelper
-
-      def statuses
-        []
-      end
-
-      def comment
-        model
-      end
-
-      def has_header?
-        false
-      end
-
-      delegate :participatory_space, to: :model
-
-      def description
-        strip_tags(model.formatted_body).truncate(200, separator: /\s/)
-      end
-    end
-  end
-end

data/app/cells/decidim/comments/comment_thread/title.erb

@@ -1,3 +0,0 @@
-<h6 class="comment-thread__title">
-  <%= t("decidim.components.comment_thread.title", authorName: author_name) %>
-</h6>

data/config/locales/he-IL.yml

@@ -1 +0,0 @@
-he:

data/db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class AddCommentVoteCounterCacheToComments < ActiveRecord::Migration[6.1]
-  def change
-    add_column :decidim_comments_comments, :up_votes_count, :integer, null: false, default: 0, index: true
-    add_column :decidim_comments_comments, :down_votes_count, :integer, null: false, default: 0, index: true
-
-    # We cannot use the reset_counters as up_votes and down_votes are scoped associationws
-    reversible do |dir|
-      dir.up do
-        Decidim::Comments::Comment.reset_column_information
-        Decidim::Comments::Comment.find_each do |record|
-          # rubocop:disable Rails/SkipsModelValidations
-          record.class.update_counters(record.id, up_votes_count: record.up_votes.length)
-          record.class.update_counters(record.id, down_votes_count: record.down_votes.length)
-          # rubocop:enable Rails/SkipsModelValidations
-        end
-      end
-    end
-  end
-end

data/decidim-comments.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path("lib", __dir__)
-
-# Maintain your gem's version:
-require "decidim/comments/version"
-
-# Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.version = Decidim::Comments.version
-  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
-  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0"
-  s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = "~> 3.0.0"
-
-  s.name = "decidim-comments"
-  s.summary = "Decidim comments module"
-  s.description = "Pluggable comments system for some components."
-
-  s.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").select do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
-    end
-  end
-
-  s.add_dependency "decidim-core", Decidim::Comments.version
-  s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
-
-  s.add_development_dependency "decidim-admin", Decidim::Comments.version
-  s.add_development_dependency "decidim-dev", Decidim::Comments.version
-end