decidim-core 0.29.2 → 0.29.4

data/config/locales/zh-CN.yml

@@ -25,6 +25,8 @@ zh-CN:
         password_confirmation: 确认您的密码
         personal_url: 个人网址
         remove_avatar: 删除头像
+      user_group:
+        avatar: 头像
     models:
       decidim/attachment_created_event: 附文
       decidim/component_published_event: 活动组件
@@ -316,6 +318,8 @@ zh-CN:
         view_all: 查看全部
       metrics:
         name: 组织指标
+      participatory_space_metrics:
+        name: 指标
       stats:
         name: 组织统计
       sub_hero:
@@ -701,6 +705,8 @@ zh-CN:
           new_conversation: 新建对话
           next: 下一个
           title: 对话
+        reply_form:
+          placeholder: 您的回复...
         show:
           back: 回到所有对话
           chat_with: 对话
@@ -715,11 +721,9 @@ zh-CN:
       participants:
         description: 组织中的活跃参与者人数
         object: 参与者
-        title: 参加者
       users:
         description: 参加组织的人数
         object: 参与者
-        title: 参加者
     newsletter_mailer:
       newsletter:
         unsubscribe: 选择不接收这种类型的电子邮件， <a href="%{link}" target="_blank" class="unsubscribe">取消订阅</a>。
@@ -814,29 +818,23 @@ zh-CN:
         conversations: 对话
         followers: 关注者
         following: 关注的问题
+        group_admins: 管理管理员
+        group_members: 管理成员
         groups: 群組
         members: 成员
         officialized: 官方参与者
-      sidebar:
-        badges:
-          info: 徽章是通过在平台上执行特定活动赚取的。
-          title: 徽章
       user:
-        create_user_group: 创建组
-        edit_profile: 编辑配置文件
-        edit_user_group: 编辑群组资料
-        invite_user: Invite participant
-        join_user_group: 加入组的请求
-        leave_user_group: 离开组
-        manage_user_group_admins: 管理管理员
-        manage_user_group_users: 管理成员
-        resend_email_confirmation_instructions: 重新发送电子邮件确认说明
+        actions:
+          create_user_group: 创建组
+          edit_profile: 编辑配置文件
+          edit_user_group: 编辑群组资料
+          invite_user: Invite participant
+          join_user_group: 加入组的请求
+          leave_user_group: 离开组
+          manage_user_group_admins: 管理管理员
+          manage_user_group_users: 管理成员
+          resend_email_confirmation_instructions: 重新发送电子邮件确认说明
     reported_mailer:
-      hide:
-        hello: 您好 %{name}，
-        manage_moderations: 管理版面
-        report_html: <p>以下 <a href="%{url}">内容</a> 已被自动隐藏。</p>
-        subject: 资源已自动隐藏
       report:
         authors: 作者
         content: 报告的内容

data/config/locales/zh-TW.yml

@@ -31,6 +31,8 @@ zh-TW:
         personal_url: 個人 URL
         remove_avatar: 刪除頭像
         tos_agreement: 同意服務條款
+      user_group:
+        avatar: 頭像
     models:
       decidim/attachment_created_event: 附件
       decidim/component_published_event: 啟用組件
@@ -474,6 +476,8 @@ zh-TW:
         view_all: 檢視全部
       metrics:
         name: 組織指標
+      participatory_space_metrics:
+        name: 指標
       static_page:
         section:
           name: 節
@@ -562,7 +566,6 @@ zh-TW:
       drag_and_drop_help: 通過拖放或粘貼方式添加圖片。
     endorsement_buttons_cell:
       already_endorsed: 不喜歡
-      endorse: 喜歡！
     endorsements:
       identities:
         done: 已完成
@@ -1216,14 +1219,12 @@ zh-TW:
         conversations: 對話
         followers: 追隨者
         following: 關注
+        group_admins: 管理管理員
+        group_members: 管理成員
         groups: 群組
         members: 成員
         officialized: 正式認證參與者
         send_private_message: 發送私人訊息
-      sidebar:
-        badges:
-          info: 徽章是通過在平台上執行特定活動而獲得的。
-          title: 徽章
       user:
         actions:
           create_user_group: 建立群組
@@ -1231,26 +1232,14 @@ zh-TW:
           edit_user_group: 編輯群組資料
           invite_user: 邀請參與者
           join_user_group: 申請加入群組
+          leave_user_group: 退出群組
           manage_user_group_admins: 管理管理員
           manage_user_group_users: 管理成員
           message: 訊息
+          resend_email_confirmation_instructions: 重新發送電子郵件確認指示
         confirmation_instructions_sent: 電子郵件確認指示已發送.
-        create_user_group: 建立群組
-        edit_profile: 編輯個人資料
-        edit_user_group: 編輯群組資料
         fill_in_email_to_confirm_it: 請填寫您的群組電子郵件以進行確認.
-        invite_user: 邀請參與者
-        join_user_group: 申請加入群組
-        leave_user_group: 退出群組
-        manage_user_group_admins: 管理管理員
-        manage_user_group_users: 管理成員
-        resend_email_confirmation_instructions: 重新發送電子郵件確認指示
     reported_mailer:
-      hide:
-        hello: 哈囉，%{name},
-        manage_moderations: 管理版主
-        report_html: <p>以下<a href="%{url}">內容</a>已自動隱藏。</p>
-        subject: 一個資源已被自動隱藏。
       report:
         authors: 作者
         content: 已檢舉內容
@@ -1331,14 +1320,11 @@ zh-TW:
       flag_user_modal:
         already_reported: 此內容已被舉報，將由管理員進行審查。
         block: 封鎖此參與者
-        close: 關閉
-        description: 關於該使用者有什麼不適當的行為？
         does_not_belong: 包含非法活動、自殺威脅、個人資訊或其他您認為不適合在%{organization_name} 上的內容。
         hide: 隱藏所有內容
         offensive: 包含種族主義、性別歧視、辱罵、人身攻擊、死亡威脅、自殺要求或任何形式的仇恨言論
         report: 報告
         spam: 包含點閱率誘導、廣告、詐騙或自動腳本。
-        title: 舉報不適當的使用者
       floating_help:
         help: 幫助
       mentions_modal:

data/db/migrate/20171212103803_create_unique_nicknames.rb

@@ -11,7 +11,7 @@ class CreateUniqueNicknames < ActiveRecord::Migration[5.1]
     add_column :decidim_users, :nickname, :string, limit: 20
 
     User.where.not(name: nil).find_each do |user|
-      user.update!(nickname: UserBaseEntity.nicknamize(user.name, decidim_organization_id: user.decidim_organization_id))
+      user.update!(nickname: UserBaseEntity.nicknamize(user.name, user.decidim_organization_id))
     end
 
     add_index :decidim_users,

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -11,7 +11,7 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
     User.where(nickname: nil)
         .where(deleted_at: nil)
         .where(managed: false)
-        .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, decidim_organization_id: u.decidim_organization_id)) }
+        .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, u.decidim_organization_id)) }
 
     # rubocop:disable Rails/SkipsModelValidations
     User.where(nickname: nil).update_all("nickname = ''")

data/db/migrate/20180706104107_add_nickname_to_managed_users.rb

@@ -7,7 +7,7 @@ class AddNicknameToManagedUsers < ActiveRecord::Migration[5.2]
 
   def up
     User.where(managed: true, nickname: nil).includes(:organization).find_each do |user|
-      user.nickname = UserBaseEntity.nicknamize(user.name, organization: user.organization)
+      user.nickname = UserBaseEntity.nicknamize(user.name, user.decidim_organization_id)
       user.save
     end
   end

data/db/migrate/20181001124950_move_users_groups_to_users_table.rb

@@ -64,7 +64,7 @@ class MoveUsersGroupsToUsersTable < ActiveRecord::Migration[5.2]
         verified_at: old_user_group.verified_at
       }
       new_attributes = clean_attributes.merge(
-        nickname: UserBaseEntity.nicknamize(clean_attributes["name"]),
+        nickname: UserBaseEntity.nicknamize(clean_attributes["name"], old_user_group.decidim_organization_id),
         extended_data:
       )
       new_user_group = NewUserGroup.create!(new_attributes)

data/db/migrate/20190412131728_fix_user_names.rb

@@ -23,7 +23,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
-        entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
+        entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, entity.decidim_organization_id)
         entity.save(validate: false)
       end
     end

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.4"
     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

@@ -27,19 +27,16 @@ module Decidim
       # * Disambiguates it so it is unique.
       #
       # name - the String to nicknamize
-      # scope - a Hash with extra values to scope the nickname to
+      # organization_id - the organization id we are using as scope for the uniqueness
       #
       # Example to nicknamize a user name, scoped to the organization:
       #
-      #    nicknamize(user_name, organization: current_organization)
+      #    nicknamize(user_name, organization_id)
       #
-      def nicknamize(name, scope = {})
+      def nicknamize(name, organization_id)
         return unless name
 
-        disambiguate(
-          name.parameterize(separator: "_")[nickname_length_range],
-          scope
-        )
+        disambiguate(name.parameterize(separator: "_")[nickname_length_range], organization_id)
       end
 
       private
@@ -48,11 +45,11 @@ module Decidim
         (0...nickname_max_length)
       end
 
-      def disambiguate(name, scope)
+      def disambiguate(name, organization_id)
         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(decidim_organization_id: organization_id).empty?
 
           candidate = numbered_variation_of(name, n)
         end