decidim-core 0.29.2 → 0.29.3

data/lib/decidim/asset_router/storage.rb

@@ -52,8 +52,13 @@ module Decidim
         when ActiveStorage::Blob
           blob_url(**)
         else # ActiveStorage::VariantWithRecord, ActiveStorage::Variant
-          ensure_current_host(nil, **)
-          representation_url(**)
+          if blob && blob.attachments.any?
+            ensure_current_host(blob.attachments.first&.record, **)
+            representation_url(**)
+          else
+            ensure_current_host(nil, **)
+            representation_url(**, only_path: true)
+          end
         end
       end
 

data/lib/decidim/attributes/time_with_zone.rb

@@ -23,7 +23,11 @@ module Decidim
       def cast_value(value)
         return value unless value.is_a?(String)
 
-        Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
+        if Date._iso8601(value).present?
+          Time.zone.iso8601(value)
+        else
+          Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
+        end
       rescue ArgumentError
         fallback = super
         return fallback unless fallback.is_a?(Time)

data/lib/decidim/content_parsers/blob_parser.rb

@@ -20,19 +20,19 @@ module Decidim
       # https://github.com/rails/rails/blob/a7e379896552ce43b822385c03c37f2bd47739d3/activestorage/config/routes.rb#L5-L14
       BLOB_REGEX = %r{
         # Group 1: Host part
-        (
+        (?<host_part>
           # Group 2: Domain and subpath part
-          https?://((?!/rails).)+
+          #{URI::DEFAULT_PARSER.make_regexp(%w(https http))}
         )?
         /rails/active_storage
         # Group 3: Blob path, representation path or disk service path
-        /(blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
+        /(?<type_part>blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
         # Group 4: Signed ID for blobs or encoded key for disk service
-        /([^/]+)
+        /(?<key_part>[^/]+)
         # Group 5: Variation part (only for representations)
         (
           # Group 6: Variation key for representations
-          /([\w.=-]+)
+          /(?<variation_part>[\w.=-]+)
         )?
         # Group 7: Filename
         /([\w.=-]+)
@@ -46,8 +46,10 @@ module Decidim
 
       def replace_blobs(text)
         text.gsub(BLOB_REGEX) do |match|
-          type_part = Regexp.last_match(3)
-          key_part = Regexp.last_match(4)
+          named_captures = Regexp.last_match.named_captures
+
+          type_part = named_captures["type_part"]
+          key_part = named_captures["key_part"]
 
           variation_key = nil
           blob =
@@ -59,7 +61,7 @@ module Decidim
               # Representation or blob
               if type_part.start_with?("representations")
                 # Representation
-                variation_part = Regexp.last_match(6)
+                variation_part = named_captures["variation_part"]
                 variation_key = generate_variation_key(variation_part)
               end
 

data/lib/decidim/content_parsers/user_parser.rb

@@ -49,7 +49,7 @@ module Decidim
 
       def existing_mentionables
         @existing_mentionables ||= mentionable_class.where(
-          "decidim_organization_id = ? AND LOWER(nickname) IN (?)",
+          "decidim_organization_id = ? AND nickname IN (?)",
           current_organization.id,
           content_nicknames
         )

data/lib/decidim/core/test/shared_examples/reports_examples.rb

@@ -33,17 +33,46 @@ shared_examples "higher user role hides" do
     before do
       login_as user, scope: :user
     end
-    around do |example|
-      previous = Capybara.raise_server_errors
 
-      Capybara.raise_server_errors = false
-      example.run
-      Capybara.raise_server_errors = previous
+    it "reports the resource" do
+      visit reportable_path
+
+      expect(page).to have_css(%(button[data-dialog-open="flagModal"]))
+      find(%(button[data-dialog-open="flagModal"])).click
+      expect(page).to have_css(".flag-modal", visible: :visible)
+
+      within ".flag-modal" do
+        find(:css, "input[name='report[hide]']").set(true)
+        click_on "Hide"
+      end
+
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
+      expect(reportable.reload).to be_hidden
     end
+  end
+end
+
+shared_examples "higher user role hides resource with comments" do
+  context "and the admin hides a resource with comments" do
+    let!(:comments) { create_list(:comment, 2, body: "Dummy comment", commentable: reportable, author: user) }
+
+    before do
+      login_as user, scope: :user
+    end
+
+    it "hides the resource" do
+      visit decidim.search_path
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
 
-    it "reports the resource" do
       visit reportable_path
 
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
+
       expect(page).to have_css(%(button[data-dialog-open="flagModal"]))
       find(%(button[data-dialog-open="flagModal"])).click
       expect(page).to have_css(".flag-modal", visible: :visible)
@@ -53,7 +82,19 @@ shared_examples "higher user role hides" do
         click_on "Hide"
       end
 
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
+      perform_enqueued_jobs
+
       expect(reportable.reload).to be_hidden
+      expect(comments.first.reload).to be_hidden
+      expect(comments.second.reload).to be_hidden
+
+      visit decidim.search_path
+      expect(page).to have_no_content(translated(comments.first.body))
+      expect(page).to have_no_content(translated(comments.second.body))
     end
   end
 end
@@ -120,6 +161,7 @@ shared_examples "reports by user type" do
     let!(:user) { create(:user, :admin, :confirmed, organization:) }
     include_examples "higher user role reports"
     include_examples "higher user role hides"
+    include_examples "higher user role hides resource with comments"
   end
   context "When reporting user is process admin" do
     let!(:user) { create :process_admin, :confirmed, participatory_process: }

data/lib/decidim/core/test/shared_examples/social_share_examples.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+def visit_resource
+  return visit resource if resource.is_a?(String)
+
+  return visit decidim.root_path if resource.is_a?(Decidim::Organization)
+
+  visit resource_locator(resource).path
+end
+
+shared_examples "a social share widget" do
+  it "has the social share button" do
+    visit_resource
+
+    expect(page).to have_css('button[data-dialog-open="socialShare"]')
+  end
+
+  it "lists all the expected social share providers" do
+    visit_resource
+    click_on "Share"
+
+    within "#socialShare" do
+      expect(page).to have_css('a[title="Share to X"]')
+      expect(page).to have_css('a[title="Share to Facebook"]')
+      expect(page).to have_css('a[title="Share to WhatsApp"]')
+      expect(page).to have_css('a[title="Share to Telegram"]')
+      expect(page).to have_css(".share-modal__input")
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb

@@ -8,6 +8,7 @@ shared_examples "an uncommentable component" do
            manifest:,
            participatory_space:)
   end
+  let!(:comment) { create(:comment, commentable: resources.first) }
 
   it "does not displays comments count" do
     component.update!(settings: { comments_enabled: false })
@@ -18,4 +19,29 @@ shared_examples "an uncommentable component" do
       expect(page).to have_no_link(resource_locator(resource).path)
     end
   end
+
+  describe "when search a comment in the global search" do
+    it "does displays the comments" do
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("1 Results for the search")
+    end
+
+    it "does not displays the comment when comments are disable" do
+      component.update!(settings: { comments_enabled: false })
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("0 Results for the search")
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb

@@ -2,6 +2,32 @@
 
 require "spec_helper"
 
+shared_examples "a version of a hidden object" do
+  before do
+    visit resource_path
+    click_on "see other versions"
+    click_on("Version 1 of #{hidden_object.reload.versions.size}")
+  end
+
+  around do |example|
+    previous = Capybara.raise_server_errors
+
+    Capybara.raise_server_errors = false
+    example.run
+    Capybara.raise_server_errors = previous
+  end
+
+  it "shows an error page" do
+    expect(page).to have_content("Changes at")
+
+    create(:moderation, reportable: hidden_object, hidden_at: 1.day.ago)
+
+    visit current_path
+
+    expect(page).to have_content(ActiveRecord::RecordNotFound)
+  end
+end
+
 shared_examples "versions controller" do
   let(:base_params) do
     if resource.is_a?(Decidim::Participable)

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.29.2"
+      "0.29.3"
     end
   end
 end

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -49,46 +49,7 @@ module Decidim
           private
 
           def language_code
-            primary = I18n.locale.to_s
-            secondary = primary.split("-")[0]
-            available_language_codes[primary] || available_language_codes[secondary] || ""
-          end
-
-          def available_language_codes
-            @available_language_codes ||= {
-              "ar" => "ara", # Arabic
-              "eu" => "baq", # Basque
-              "ca" => "cat", # Catalan
-              "zh" => "chi", # Chinese (simplified)
-              # "" => "cht", # Chinese (traditional)
-              "cs" => "cze", # Czech
-              "da" => "dan", # Danish
-              "nl" => "dut", # Dutch
-              "en" => "eng", # English
-              "fi" => "fin", # Finnish
-              "fr" => "fre", # French
-              "de" => "ger", # German
-              "ga" => "gle", # Gaelic
-              "el" => "gre", # Greek
-              "he" => "heb", # Hebrew
-              "hi" => "hin", # Hindi
-              "id" => "ind", # Indonesian
-              "it" => "ita", # Italian
-              "no" => "nor", # Norwegian
-              "fa" => "per", # Persian
-              "pl" => "pol", # Polish
-              "pt" => "por", # Portuguese
-              "ru" => "rus", # Russian
-              "si" => "sin", # Sinhalese
-              "es" => "spa", # Spanish
-              "sv" => "swe", # Swedish
-              "th" => "tha", # Thai
-              "tr" => "tur", # Turkish
-              "uk" => "ukr", # Ukrainian
-              "ur" => "urd", # Urdu
-              "vi" => "vie", # Vietnamese
-              "cy" => "wel" # Welsh
-            }
+            I18n.locale.to_s
           end
         end
       end

data/lib/decidim/map/provider/static_map/here.rb

@@ -6,8 +6,42 @@ module Decidim
       module StaticMap
         # The static map utility class for the HERE maps service
         class Here < ::Decidim::Map::StaticMap
+          def url(latitude:, longitude:, options: {})
+            map_url = configuration.fetch(:url, nil)
+            return super unless map_url
+
+            return super unless map_url.include?("mia/v3")
+
+            w = options[:width] || Decidim::Map::StaticMap::DEFAULT_SIZE
+            h = options[:height] || Decidim::Map::StaticMap::DEFAULT_SIZE
+
+            params = {
+              apiKey: configuration[:api_key],
+              overlay: "point:#{latitude},#{longitude};icon=cp;size=large|#{latitude},#{longitude};style=circle;width=50m;color=%231B9D2C60"
+            }
+
+            URI.parse("#{map_url}:radius=90/#{w}x#{h}/png8").tap do |uri|
+              uri.query = URI.encode_www_form(params)
+            end.to_s
+          end
+
           # @See Decidim::Map::StaticMap#url_params
           def url_params(latitude:, longitude:, options: {})
+            ActiveSupport::Deprecation.warn(
+              <<~DEPRECATION.strip
+                Please use a V3 version HERE maps.
+                For further information, see:
+                https://www.here.com/docs/bundle/map-image-migration-guide-v3/page/README.html
+                Also make sure your Decidim.maps configurations are using the
+                up to date format.
+                You need to change:
+                  static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
+                to:
+                  static_url = "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" if static_provider == "here"
+                in your config/initializers/decidim.rb file.
+              DEPRECATION
+            )
+
             params = {
               c: "#{latitude}, #{longitude}",
               z: options[:zoom] || Decidim::Map::StaticMap::DEFAULT_ZOOM,

data/lib/decidim/moderation_tools.rb

@@ -59,9 +59,11 @@ module Decidim
         event_class: Decidim::ResourceHiddenEvent,
         resource: @reportable,
         extra: {
-          report_reasons:
+          report_reasons:,
+          force_email: true
         },
-        affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
+        affected_users:,
+        force_send: true
       }
 
       Decidim::EventsManager.publish(**data)
@@ -80,10 +82,22 @@ module Decidim
         @reportable.moderation.update!(hidden_at: Time.current)
         @reportable.try(:touch)
       end
+
+      if @reportable.is_a?(Decidim::Comments::Commentable)
+        @reportable.comment_threads.each do |comment|
+          Decidim::HideChildResourcesJob.perform_later(comment, @current_user.id)
+        end
+      end
+
+      send_notification_to_author
     end
 
     private
 
+    def affected_users
+      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:author)]).select { |author| author.is_a?(Decidim::User) }
+    end
+
     def report_reasons
       @reportable.moderation.reports.pluck(:reason).uniq
     end

data/lib/decidim/nicknamizable.rb

@@ -52,7 +52,7 @@ module Decidim
         candidate = name
 
         2.step do |n|
-          return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/reportable.rb

@@ -53,8 +53,12 @@ module Decidim
       # Public: The reported content url
       #
       # Returns String
-      def reported_content_url
-        raise NotImplementedError
+      def reported_content_url(options = {})
+        if hidden?
+          ResourceLocatorPresenter.new(self).index(options)
+        else
+          ResourceLocatorPresenter.new(self).url(options)
+        end
       end
 
       # Public: The collection of attribute names that are considered

data/lib/decidim/translatable_attributes.rb

@@ -62,7 +62,7 @@ module Decidim
             final = super(value)
             return unless final # Do not set the `nil` values for the parent hash
 
-            final = value_type.serialize(final) if value_type
+            final = value_type.serialize(final) if value_type && !attachment?(final)
 
             public_send("#{name}=", field.merge(locale => final))
           end
@@ -127,5 +127,9 @@ module Decidim
       locale.to_s == try(:default_locale).to_s ||
         locale.to_s == try(:current_organization).try(:default_locale).to_s
     end
+
+    def attachment?(value)
+      value.is_a?(String) && value.include?(ActiveStorage.routes_prefix)
+    end
   end
 end

data/lib/tasks/upgrade/clean_hidden_resources.rake

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :clean do
+      desc "Removes all related resources from hidden resource"
+      task hidden_resources: :environment do
+        logger.info("Removing child resources for hidden parents...")
+        Decidim::Moderation.hidden.find_each do |moderation_for_hidden_resource|
+          reportable = moderation_for_hidden_resource.reportable
+
+          current_user = if Decidim.module_installed?(:ai)
+                           reportable.organization.users.find_by!(email: Decidim::Ai::SpamDetection.reporting_user_email)
+                         else
+                           reportable.organization.admins.first
+                         end
+
+          tool = Decidim::ModerationTools.new(reportable, current_user)
+          tool.hide!
+        rescue NameError => e
+          log_error "Could not hide child resources for reportable id #{moderation_for_hidden_resource.id} because: #{e.message}"
+        end
+      end
+
+      private
+
+      def log_error(msg)
+        puts msg
+        Rails.logger.error(msg)
+      end
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -2,37 +2,40 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
-    task fix_nickname_uniqueness: :environment do
-      logger = Logger.new($stdout)
-      logger.info("Updating conflicting user nicknames...")
+    desc "Modifies nickname of the user to lower case"
+    task :fix_nickname_casing => :environment do
+      logger.info("Fixing user nicknames case...")
 
-      # list of users already changed in the process
       has_changed = []
+      Decidim::UserBaseEntity.not_deleted.find_each do |user|
+        user.nickname.downcase!
 
-      Decidim::User.not_deleted.find_each do |user|
-        next if has_changed.include? user.id
-
-        Decidim::User.where(organization: user.organization)
-                     .where("nickname ILIKE ?", user.nickname.downcase)
-                     .where.not(id: has_changed + [user.id])
-                     .not_deleted
-                     .order(:created_at)
-                     .each do |similar_user|
-          # change her nickname to the lowercased one with numbers if needed
-          begin
-            update_user_nickname(similar_user, Decidim::UserBaseEntity.nicknamize(similar_user.nickname, organization: similar_user.organization))
-          rescue ActiveRecord::RecordInvalid => e
-            logger.warn("User ID (#{similar_user.id}) : #{e}")
+        begin
+          if user.nickname_changed?
+            user.save!
+            has_changed << user.id
           end
-          has_changed.append(similar_user.id)
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
+          has_changed << user.id
+        rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
+          logger.warn("User ID (#{user.id}) : #{e}")
         end
       end
       logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")
     end
 
+    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
+    task :fix_nickname_uniqueness => :environment do
+      Rake::Task["decidim:upgrade:fix_nickname_casing"].execute
+    end
+
     private
 
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
+
     def send_notification_to(user)
       Decidim::EventsManager.publish(
         event: "decidim.events.nickname_event",