decidim-core 0.27.0.rc2 → 0.27.1

data/app/packs/stylesheets/decidim/_editor.scss

@@ -10,4 +10,133 @@
     margin-bottom: $paragraph-margin-bottom;
     text-rendering: $paragraph-text-rendering;
   }
+
+  ul,
+  ol{
+    margin-bottom: $paragraph-margin-bottom;
+  }
+}
+
+.ql-editor-display{
+  ul,
+  ol{
+    li{
+      list-style-type: none;
+      margin-bottom: .5rem;
+
+      &::before{
+        content: "\2022";
+        display: inline-block;
+        white-space: nowrap;
+        width: 1.2em;
+      }
+
+      &.ql-indent-1{
+        padding-left: 3em;
+      }
+
+      &.ql-indent-2{
+        padding-left: 6em;
+      }
+
+      &.ql-indent-3{
+        padding-left: 9em;
+      }
+
+      &.ql-indent-4{
+        padding-left: 12em;
+      }
+
+      &.ql-indent-5{
+        padding-left: 15em;
+      }
+
+      &.ql-indent-6{
+        padding-left: 18em;
+      }
+
+      &.ql-indent-7{
+        padding-left: 21em;
+      }
+
+      &.ql-indent-8{
+        padding-left: 24em;
+      }
+
+      &.ql-indent-9{
+        padding-left: 27em;
+      }
+    }
+  }
+
+  ol{
+    li{
+      counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+      counter-increment: list-0;
+
+      &::before{ content: counter(list-0, decimal) ". "; }
+
+      &.ql-indent-1{
+        counter-increment: list-1;
+        counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-1, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-2{
+        counter-increment: list-2;
+        counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-2, lower-roman) ". "; }
+      }
+
+      &.ql-indent-3{
+        counter-increment: list-3;
+        counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-3, decimal) ". "; }
+      }
+
+      &.ql-indent-4{
+        counter-increment: list-4;
+        counter-reset: list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-4, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-5{
+        counter-increment: list-5;
+        counter-reset: list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-5, lower-roman) ". "; }
+      }
+
+      &.ql-indent-6{
+        counter-increment: list-6;
+        counter-reset: list-7 list-8 list-9;
+
+        &::before{ content: counter(list-6, decimal) ". "; }
+      }
+
+      &.ql-indent-7{
+        counter-increment: list-7;
+        counter-reset: list-8 list-9;
+
+        &::before{ content: counter(list-7, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-8{
+        counter-increment: list-8;
+        counter-reset: list-9;
+
+        &::before{ content: counter(list-8, lower-roman) ". "; }
+      }
+
+      &.ql-indent-9{
+        counter-increment: list-9;
+
+        &::before{ content: counter(list-9, decimal) ". "; }
+      }
+    }
+  }
 }

data/app/packs/stylesheets/decidim/extras/_quill.scss

@@ -11,9 +11,3 @@
   margin-top: 0;
   margin-bottom: 0;
 }
-
-.ql-reset-decidim{
-  display: inline;
-  padding: 0;
-  white-space: inherit;
-}

data/app/presenters/decidim/home_stats_presenter.rb

@@ -42,12 +42,19 @@ module Decidim
     end
 
     def component_stats(conditions)
+      stats = {}
       Decidim.component_manifests.flat_map do |component|
-        component.stats.except([:supports_count])
-                 .filter(conditions)
-                 .with_context(published_components)
-                 .map { |name, data| [name, data] }
+        component
+          .stats.except([:supports_count])
+          .filter(conditions)
+          .with_context(published_components)
+          .each do |name, data|
+            stats[name] ||= 0
+            stats[name] += data
+          end
       end
+
+      stats.to_a
     end
 
     def published_components

data/app/presenters/decidim/stats_presenter.rb

@@ -15,18 +15,17 @@ module Decidim
     end
 
     def statistics(grouped_stats)
-      statistics = []
+      statistics = {}
+
       grouped_stats.each do |_manifest_name, stats|
-        stats.each_with_index.each do |stat, _index|
-          stat.each_with_index.map do |_item, subindex|
-            next unless (subindex % 3).zero?
-            next if stat[subindex + 2].zero?
+        stats.each do |_space_manifest, component_manifest, count|
+          next if count.zero?
 
-            statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
-          end
+          statistics[component_manifest] ||= 0
+          statistics[component_manifest] += count
         end
       end
-      statistics
+      statistics.map { |key, number| { stat_title: key, stat_number: number } }
     end
   end
 end

data/app/presenters/decidim/user_presenter.rb

@@ -5,7 +5,6 @@ module Decidim
   # Decorator for users
   #
   class UserPresenter < SimpleDelegator
-    include Rails.application.routes.mounted_helpers
     include ActionView::Helpers::UrlHelper
     include Decidim::TranslatableAttributes
 
@@ -27,7 +26,7 @@ module Decidim
     def profile_url
       return "" if respond_to?(:deleted?) && deleted?
 
-      decidim.profile_url(__getobj__.nickname, host: __getobj__.organization.host)
+      decidim.profile_url(__getobj__.nickname)
     end
 
     def avatar
@@ -36,13 +35,13 @@ module Decidim
 
     def avatar_url(variant = nil)
       return default_avatar_url if __getobj__.blocked?
-      return avatar.default_url unless avatar.attached?
+      return default_avatar_url unless avatar.attached?
 
       avatar.path(variant: variant)
     end
 
     def default_avatar_url
-      attached_uploader(:avatar).default_url
+      avatar.default_url
     end
 
     def profile_path
@@ -77,5 +76,11 @@ module Decidim
     def has_tooltip?
       true
     end
+
+    private
+
+    def decidim
+      @decidim ||= Decidim::EngineRouter.new("decidim", { host: __getobj__.organization.host })
+    end
   end
 end

data/app/queries/decidim/public_activities.rb

@@ -107,6 +107,7 @@ module Decidim
               LEFT JOIN decidim_participatory_space_private_users AS #{manifest.name}_private_users
                 ON #{manifest.name}_private_users.privatable_to_type = '#{manifest.model_class_name}'
                 AND #{table}.id = #{manifest.name}_private_users.privatable_to_id
+                AND #{table}.private_space = 't'
             SQL
           ).to_s
         ).where(

data/app/validators/etiquette_validator.rb

@@ -3,12 +3,16 @@
 # This validator takes care of ensuring the validated content is
 # respectful, doesn't use caps, and overall is meaningful.
 class EtiquetteValidator < ActiveModel::EachValidator
+  include ActionView::Helpers::SanitizeHelper
+
   def validate_each(record, attribute, value)
     return if value.blank?
 
-    validate_caps(record, attribute, value)
-    validate_marks(record, attribute, value)
-    validate_caps_first(record, attribute, value)
+    text_value = strip_tags(value)
+
+    validate_caps(record, attribute, text_value)
+    validate_marks(record, attribute, text_value)
+    validate_caps_first(record, attribute, text_value)
   end
 
   private

data/app/validators/file_content_type_validator.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# We need to define the validator in the `ActiveModel::Validations` namespace as
+# this is what the `file_validators` uses and this is what gets priority over
+# the root namespace class.
+module ActiveModel
+  module Validations
+    # This validator provides content type validation for uploaded files. Extends
+    # the validator provided by the `file_validators` gem by fixing some weird
+    # messages in that validator.
+    class FileContentTypeValidator
+      private
+
+      alias mark_invalid_original mark_invalid unless private_method_defined?(:mark_invalid_original)
+
+      # This fixes the "weird" error messages such as "(?-mix:image\\/.*)" because
+      # this is the notation Regexp#to_s will return. Instead, we want to show the
+      # inner contents of the regular expressions.
+      #
+      # @see ActiveModel::Validations::FileContentTypeValidator#mark_invalid
+      def mark_invalid(record, attribute, error, option_types)
+        mark_invalid_original(record, attribute, error, invalid_types(option_types))
+      end
+
+      # Converts the configured content type matches to extensions if extensions are
+      # recognized for the specified content type and if not, the content type
+      # string itself.
+      #
+      # @param option_types [Array<Regexp, String>] Array of configured types.
+      # @param allowed_extensions [Array<String>, nil] Array of allowed extensions
+      #   or nil if all extensions are "allowed" (in case we want to show the
+      #   denylist error or hard code the types).
+      # @return [Array<String>] The invalid types as strings.
+      def invalid_types(option_types, allowed_extensions = nil)
+        extensions = []
+        content_types = []
+        option_types.each do |type|
+          # Since the original content types may have endings such as image/.*?, we
+          # want to replace the regexp pattern just with a star with the fallback
+          # option.
+          content_type = (type.try(:source) || type.to_s).gsub(".*?", "*")
+          if (exts = content_type_extensions(content_type, allowed_extensions))
+            extensions += exts
+          else
+            content_types << content_type
+          end
+        end
+
+        extensions.sort + content_types.sort
+      end
+
+      # Resolves the content type extensions through MiniMime or looks up all the
+      # possible extensions for wildcard content types such as `image/*`. For the
+      # wildcard extension types only those listed in the `allowed_extensions` will
+      # be returned.
+      #
+      # @param content_type [String] The content type, such as application/pdf or
+      #   image/*.
+      # @param allowed_extensions [Array, nil] Array of allowed extensions
+      #   or nil if all extensions are "allowed" (in case we want to show the
+      #   denylist error or hard code the types).
+      # @return [Array<String>, nil] An array of the allowed extensions or nil when
+      #   no extensions could be found.
+      def content_type_extensions(content_type, allowed_extensions = nil)
+        extensions =
+          if content_type.ends_with?("/*")
+            main_type = content_type.split("/")[0]
+            extensions_matching(%r{#{main_type}/.*})
+          else
+            extensions_matching(content_type)
+          end
+        return if extensions.count.zero?
+        return extensions unless allowed_extensions
+
+        extensions & allowed_extensions
+      end
+
+      # Looks up the extensions matching the content type lookup based on the
+      # MiniMime content types.
+      #
+      # @param content_type_lookup [String, Regexp] The lookup to be matched
+      #   against.
+      # @return [Array<String>] The array of extensions.
+      def extensions_matching(content_type_lookup)
+        extensions = []
+        File.open(MiniMime::Configuration.ext_db_path).each do |line|
+          info = line.split(/\s+/)
+          next unless info[1].match?(content_type_lookup)
+
+          extensions << info[0]
+        end
+
+        extensions
+      end
+    end
+  end
+end
+
+# This is just to make Zeitwerk happy. The actual validator that gets priority
+# is the class above as all validators in the `ActiveModel::Validations`
+# namespace will be used primarily and only if a matching validator is not found
+# in that namespace, the ones at the root level are used.
+class FileContentTypeValidator < ActiveModel::Validations::FileContentTypeValidator; end

data/app/validators/passthru_validator.rb

@@ -62,9 +62,20 @@ class PassthruValidator < ActiveModel::EachValidator
     elsif dummy.respond_to?(:organization=) && record.respond_to?(:organization)
       dummy.organization = record.organization
     end
+    validation_record_context(dummy, record)
     dummy
   end
 
+  def validation_record_context(dummy, record)
+    if dummy.is_a?(Decidim::Form)
+      dummy.with_context(
+        current_organization: record.try(:current_organization) || record.try(:ganization),
+        current_participatory_space: record.try(:current_participatory_space) || record.try(:participatory_space),
+        current_component: record.try(:current_component) || record.try(:component)
+      )
+    end
+  end
+
   def target_validators(attribute)
     target_class.validators_on(target_attribute(attribute))
   end

data/app/validators/uploader_content_type_validator.rb

@@ -41,4 +41,26 @@ class UploaderContentTypeValidator < ActiveModel::Validations::FileContentTypeVa
   # rubocop: enable Metrics/CyclomaticComplexity
 
   def check_validity!; end
+
+  private
+
+  # This fixes the "weird" error messages such as "(?-mix:image\\/.*)" because
+  # this is the notation Regexp#to_s will return. Instead, we want to show the
+  # inner contents of the regular expressions.
+  #
+  # @see ActiveModel::Validations::FileContentTypeValidator#mark_invalid
+  def mark_invalid(record, attribute, error, option_types)
+    allowed_extensions = nil
+    if error == :allowed_file_content_types
+      uploader = record.attached_uploader(attribute) if record.respond_to?(:attached_uploader)
+      allowed_extensions =
+        # Note that this may be a private method in some uploaders.
+        if uploader && uploader.respond_to?(:extension_allowlist, true)
+          uploader.send(:extension_allowlist)
+        else
+          Decidim.organization_settings(record).upload_allowed_file_extensions
+        end
+    end
+    mark_invalid_original(record, attribute, error, invalid_types(option_types, allowed_extensions))
+  end
 end

data/app/views/decidim/notification_mailer/event_received.html.erb

@@ -4,7 +4,7 @@
 
 <% if @event_instance.resource_path.present? && @event_instance.resource_title.present? %>
   <p class="email-button email-button__cta">
-    <%= link_to @event_instance.resource_title, @event_instance.resource_url %>
+    <%= link_to decidim_sanitize(@event_instance.resource_title, strip_tags: true), @event_instance.resource_url %>
   </p>
 <% end %>
 

data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb

@@ -5,7 +5,7 @@
   </p>
   <% if notification.resource_path.present? && notification.resource_title.present? %>
     <p class="email-button email-button__cta">
-      <%= link_to notification.resource_title, notification.resource_url %>
+      <%= link_to decidim_sanitize(notification.resource_title, strip_tags: true), notification.resource_url %>
     </p>
   <% end %>
 </div>

data/config/locales/ar.yml

@@ -654,18 +654,6 @@ ar:
           how: كيف يمكنك كسب ذلك
           page_description: الشارات عبارة عن اعتراف بإجراءات المشارك والتقدم في المنصة. عند البدء في الاكتشاف والمشاركة والتفاعل في المنصة ، ستربح شارات مختلفة. فيما يلي قائمة بالشارات وبعض الطرق التي يمكنك من خلالها كسبها.
           title: شارات
-        invitations:
-          conditions:
-            - استخدم رابط "دعوة الأصدقاء" في صفحة المستخدم الخاصة بك لدعوة أصدقائك
-            - تخصيص ، إذا كنت تريد ، الرسالة التي ترسلها
-            - ستصل إلى أعلى مستوى عن طريق إرسال الدعوات وتسجيلها.
-          description: تُمنح هذه الشارة عند قيامك بدعوة بعض الأشخاص وقضاء بعض الوقت للتسجيل في %{organization_name} وتصبح مشاركًا. شكرًا لك على تعريف شخص %{organization_name} للآخرين والمساعدة في توسيع نطاق المجتمع!
-          description_another: قام هذا المشارك بدعوة %{score} شخصًا.
-          description_own: لقد قمت بدعوة %{score} شخصًا.
-          name: دعوات
-          next_level_in: دعوة %{score} أشخاص آخرين للوصول إلى المستوى التالي!
-          unearned_another: هذا المشارك لم يدع أي شخص حتى الآن
-          unearned_own: لم تقم بدعوة أي شخص حتى الآن.
       description: الشارات عبارة عن اعتراف بإجراءات المشارك والتقدم في المنصة. عند البدء في الاكتشاف والمشاركة والتفاعل في المنصة ، ستربح شارات مختلفة.
       level: المستوى %{level}
       reached_top: لقد وصلت إلى المستوى الأعلى لهذه الشارة.
@@ -824,12 +812,10 @@ ar:
           title: المحادثات
         reply:
           send: إرسال
-          title: رد
         show:
           title: المحادثة مع %{usernames}
         start:
           send: إرسال
-          title: بدء محادثة
     metrics:
       followers:
         description: عدد المشاركين الذين يتبعون مساحة المشاركة هذه
@@ -1270,7 +1256,6 @@ ar:
       not_locked: لم يكن مغلقا
       too_many_marks: يستخدم الكثير من علامات الترقيم المتتالية (مثل! و؟)
       too_much_caps: يستخدم عددًا كبيرًا جدًا من الأحرف الكبيرة (أكثر من 25٪ من النص)
-      too_short: قصير جدًا (أقل من 15 حرفًا)
   forms:
     required: مطلوب
   invisible_captcha:

data/config/locales/bg.yml

@@ -643,18 +643,6 @@ bg:
           how: Как може да я заслужите
           page_description: Значките са признания за действия на участниците и напредък в платформата. Когато започнете да откривате, участвате и взаимодействате в платформата, ще заслужите различни значки. Ето списъка със значки и някои начини, по които можете да ги заслужите.
           title: Значки
-        invitations:
-          conditions:
-            - Използвайте връзката "покани приятели" на своята страница, за да поканите приятелите си
-            - Персонализирайте, ако жеаете, съобщението, което изпращате
-            - Ще се повишите нивото си, като изпращате покани и те бъдат регистрирани.
-          description: Тази значка се предоставя, когато поканите някои хора и те отделят малко време да се регистрират в %{organization_name} и станат участници. Благодарим ви, че разказвате за %{organization_name} и така помогнете за разширяването на общността!
-          description_another: Този участник покани %{score} човека.
-          description_own: Вие поканихте %{score} човека.
-          name: Покани
-          next_level_in: Поканете още %{score} за да достигнете следващо ниво!
-          unearned_another: Този участник все още не е поканил никой.
-          unearned_own: Не сте поканил(а) никого все ще.
       description: Значките са признания за действия на участниците и напредък в платформата. Когато започнете да откривате, участвате и взаимодействате в платформата, ще спечелите различни значки.
       level: Ниво %{level}
       reached_top: Достигнахте максималното ниво на значката.
@@ -845,7 +833,7 @@ bg:
           title: Разговор с %{usernames}
         start:
           send: Изпрати
-          title: Започнете разговор
+          title: Започни разговор
     metrics:
       followers:
         description: Брой участници, които следват това пространство
@@ -1334,7 +1322,6 @@ bg:
         other: 'При обработката на заявката Ви имаше няколко грешки:'
       too_many_marks: използва твърде много последователни препинателни знаци (напр. ! и ?)
       too_much_caps: използва твърде много главни букви (над 25% от текста)
-      too_short: е твърде къс (под 15 знака)
   forms:
     required: Задължително
   invisible_captcha:

data/config/locales/ca.yml

@@ -30,6 +30,7 @@ ca:
         password_confirmation: Confirma la teva contrasenya
         personal_url: URL personal
         remove_avatar: Elimina la imatge de perfil
+        tos_agreement: Acord de termes i condicions d'ús
     models:
       decidim/attachment_created_event: Arxiu adjunt
       decidim/component_published_event: Component actiu
@@ -820,6 +821,8 @@ ca:
         allowed_file_extensions: 'Tipus de fitxers admesos: %{extensions}'
         max_file_dimension: 'Mides máximes de l''arxiu: %{resolution} pixels'
         max_file_size: 'Mida màxima del fitxer:%{megabytes}MB'
+      files:
+        extension_allowlist: 'Formats acceptats: %{extensions}'
       upload:
         labels:
           add_attachment: Afegir adjunt
@@ -858,18 +861,6 @@ ca:
           how: Com pots aconseguir-la
           page_description: Les insígnies són reconeixements de les accions de les participants i del progrés en la plataforma. A mesura que comencis a descobrir, participar i interactuar amb la plataforma, n'obtindràs de diferents tipus. Aquí tens la llista d'insígnies i algunes formes d'aconseguir-les.
           title: Insígnies
-        invitations:
-          conditions:
-            - Utilitza l'enllaç "convidar amigues" a la teva pàgina d'usuària per convidar a les teves amistats
-            - Personalitza, si vols, el missatge que estàs enviant
-            - Pujaràs per mitjà de l'enviament d'invitacions i de registrar-les.
-          description: Aquesta insígna s'aconsegueix quan has convidat a algunes persones a la plataforma %{organization_name}, i s'hi han registrat com a participants. Gràcies per donar a conèixer %{organization_name} a d'altres i ajudar a ampliar la comunitat!
-          description_another: Aquesta participant ha convidat a %{score} persones.
-          description_own: Has convidat %{score} persones.
-          name: Invitacions
-          next_level_in: Convida a %{score} persones més per arribar al següent nivell!
-          unearned_another: Aquesta participant encara no ha convidat ningú.
-          unearned_own: Encara no has convidat a ningú.
       description: Les insígnies són reconeixements de les accions de les participants i del progrés en la plataforma. A mesura que comencis a descobrir, participar i interactuar amb la plataforma, n'obtindràs de diferents tipus.
       level: Nivell %{level}
       reached_top: Has arribat al màxim nivell d'aquesta insígnia.
@@ -1081,7 +1072,7 @@ ca:
         reply:
           placeholder: La teva resposta...
           send: Enviar
-          title: Respon
+          title: Respondre
         show:
           back: Tornar a totes les converses
           chat_with: Conversa amb
@@ -1090,7 +1081,7 @@ ca:
           title: Conversa amb %{usernames}
         start:
           send: Enviar
-          title: Comença una conversa
+          title: Iniciar una conversa
         update:
           error: El missatge no ha estat enviat degut a un error
     metrics:
@@ -1685,6 +1676,7 @@ ca:
       public: La teva informació pública.
   errors:
     messages:
+      allowed_file_content_types: 'Només s''accepten arxius amb les següents extensions: %{types}'
       already_confirmed: ja s'ha confirmat, si us plau intenta iniciar la sessió
       confirmation_period_expired: s'ha de confirmar dins de %{period}, si us plau sol·licita'n un de nou
       content_type_allowlist_error: el tipus de fitxer no és vàlid
@@ -1702,7 +1694,7 @@ ca:
         other: 'S''han produït múltiples errors en processar la vostra sol·licitud:'
       too_many_marks: Estàs fent servir massa signes de puntuació consecutius (p. ex. i?)
       too_much_caps: Estàs utilitzant massa lletres majúscules (més del 25% del text)
-      too_short: És massa curt (menys de 15 caràcters)
+      too_short: És massa curt (menys %{count} caràcters)
   forms:
     correct_errors: Hi ha errors al formulari, si us plau corregeix-los per continuar.
     length_validator: