decidim-core 0.28.6 → 0.29.0.rc1

data/app/helpers/decidim/sanitize_helper.rb

@@ -37,22 +37,13 @@ module Decidim
       end
     end
 
-    # Converts the blob and blob variant references to blob URLs.
-    def decidim_rich_text(html, options = {})
-      renderer = Decidim::ContentProcessor.renderer_klass(:blob).constantize.new(html)
-      renderer.render(options)
-    end
-
     def decidim_sanitize_editor(html, options = {})
       content_tag(:div, decidim_sanitize(html, options), class: %w(rich-text-display))
     end
 
     def decidim_sanitize_editor_admin(html, options = {})
       html = Decidim::IframeDisabler.new(html, options).perform
-      decidim_sanitize_editor(
-        decidim_rich_text(html),
-        { scrubber: Decidim::AdminInputScrubber.new }.merge(options)
-      )
+      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
     end
 
     def decidim_html_escape(text)
@@ -60,7 +51,7 @@ module Decidim
     end
 
     def decidim_url_escape(text)
-      decidim_html_escape(text).sub(/^\s*javascript:/, "")
+      decidim_html_escape(text).sub(/^javascript:/, "")
     end
 
     def decidim_sanitize_translated(text)

data/app/helpers/decidim/scopes_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     Option = Struct.new(:id, :name)
 
     # Checks if the resource should show its scope or not.
-    # resource - the resource to analize
+    # resource - the resource to analyze
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
@@ -53,14 +53,13 @@ module Decidim
     # options       - An optional Hash with options:
     #
     # Returns nothing.
-    def scopes_select_field(form, name, root: false, options: {}, html_options: {})
+    def scopes_select_field(form, name, root: false, options: {})
       options = options.merge(include_blank: I18n.t("decidim.scopes.prompt")) unless options.has_key?(:include_blank)
 
       form.select(
         name,
         ordered_scopes_descendants_for_select(root),
-        options,
-        html_options
+        options
       )
     end
 

data/app/helpers/decidim/searches_helper.rb

@@ -7,7 +7,7 @@ module Decidim
     #
     # klass_name - a String representing the class name of the resource to render
     # count - (optional) the number of resources so that the I18n backend
-    #         can decide to translate into singluar or plural form.
+    #         can decide to translate into singular or plural form.
     def searchable_resource_human_name(resource, count: 5)
       resource = if resource.is_a?(String)
                    resource.constantize

data/app/helpers/decidim/short_link_helper.rb

@@ -15,14 +15,14 @@ module Decidim
     # @option kwargs [Float] :params the URL query parameters that should be
     #   included in the URL where the short link redirects to
     # @return [String] The short URL
-    def short_url(**kwargs)
+    def short_url(**)
       target = respond_to?(:current_component) && current_component
       target ||= respond_to?(:current_participatory_space) && current_participatory_space
       target ||= respond_to?(:current_organization) && current_organization
       target ||= Rails.application
 
       mounted_engine = target.try(:mounted_engine) || EngineResolver.new(_routes).mounted_name
-      ShortLink.to(target, mounted_engine, **kwargs).short_url
+      ShortLink.to(target, mounted_engine, **).short_url
     end
   end
 end

data/app/helpers/decidim/translations_helper.rb

@@ -14,10 +14,10 @@ module Decidim
     # options - Any other option to delegate to the individual I18n.t calls
     #
     # Returns a Hash with the locales as keys and the translations as values.
-    def multi_translation(key, locales = Decidim.available_locales, **options)
+    def multi_translation(key, locales = Decidim.available_locales, **)
       locales.each_with_object({}) do |locale, result|
         I18n.with_locale(locale) do
-          result[locale.to_sym] = I18n.t(key, **options)
+          result[locale.to_sym] = I18n.t(key, **)
         end
       end
     end

data/app/helpers/decidim/twitter_search_helper.rb

@@ -4,7 +4,7 @@ module Decidim
   module TwitterSearchHelper
     # Builds the URL for Twitter's hashtag search.
     #
-    # @param hashtag [String] The hasthag to search
+    # @param hashtag [String] The hashtag to search
     #
     # @return [String]
     def twitter_hashtag_url(hashtag)

data/app/helpers/decidim/user_profile_helper.rb

@@ -14,7 +14,6 @@ module Decidim
     #
     # Returns a String with the menu tab.
     def user_profile_tab(text, link, options = {})
-      cls = %w(tabs-title)
       aria = {}
       if is_active_link?(link, (options[:aria_link_type] || :inclusive))
         cls << "is-active"

data/app/jobs/decidim/email_notifications_digest_generator_job.rb

@@ -8,10 +8,10 @@ module Decidim
       user = Decidim::User.find_by(id: user_id)
       return if user.blank?
 
-      should_notify = force || NotificationsDigestSendingDecider.must_notify?(user, time:)
+      should_notify = force || NotificationsDigestSendingDecider.must_notify?(user, time)
       return unless should_notify
 
-      notification_ids = user.notifications.try(frequency, time:).pluck(:id)
+      notification_ids = user.notifications.try(frequency, time).pluck(:id)
       return if notification_ids.blank?
 
       NotificationsDigestMailer.digest_mail(user, notification_ids).deliver_later

data/app/mailers/decidim/application_mailer.rb

@@ -6,6 +6,10 @@ module Decidim
   class ApplicationMailer < ActionMailer::Base
     include LocalisedMailer
     include MultitenantAssetHost
+    include Decidim::SanitizeHelper
+    include Decidim::OrganizationHelper
+    helper_method :organization_name, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize, :decidim_sanitize_newsletter
+
     after_action :set_smtp
     after_action :set_from
 
@@ -44,11 +48,11 @@ module Decidim
       smtp_settings_from = organization.smtp_settings["from"]
       return smtp_settings_from if already_defined_name_in_mail?(smtp_settings_from)
 
-      email_address_with_name(smtp_settings_from, organization.name)
+      email_address_with_name(smtp_settings_from, organization_name(organization))
     end
 
     def default_sender
-      email_address_with_name(Decidim.config.mailer_sender, organization.name)
+      email_address_with_name(Decidim.config.mailer_sender, organization_name(organization))
     end
 
     def already_defined_name_in_mail?(mail_address)

data/app/mailers/decidim/block_user_mailer.rb

@@ -11,7 +11,7 @@ module Decidim
         @justification = justification
         subject = I18n.t(
           "decidim.block_user_mailer.notify.subject",
-          organization_name: @organization.name,
+          organization_name: organization_name(@organization),
           justification: @justification
         )
 

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -5,6 +5,8 @@ module Decidim
   # each role and use a localised version.
   class DecidimDeviseMailer < ::Devise::Mailer
     include LocalisedMailer
+    include Decidim::SanitizeHelper
+    helper_method :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute
 
     layout "decidim/mailer"
 
@@ -19,7 +21,11 @@ module Decidim
         @organization = user.organization
         @opts = opts
 
-        opts[:subject] = I18n.t("devise.mailer.#{opts[:invitation_instructions]}.subject", organization: user.organization.name) if opts[:invitation_instructions]
+        if opts[:invitation_instructions]
+          opts[:subject] =
+            I18n.t("devise.mailer.#{opts[:invitation_instructions]}.subject",
+                   organization: organization_name(user.organization))
+        end
       end
 
       devise_mail(user, opts[:invitation_instructions] || :invitation_instructions, opts)

data/app/mailers/decidim/newsletter_mailer.rb

@@ -2,16 +2,13 @@
 
 module Decidim
   class NewsletterMailer < ApplicationMailer
-    helper Decidim::SanitizeHelper
-    helper Decidim::TranslationsHelper
-
     include Decidim::NewslettersHelper
 
     layout "decidim/newsletter_base"
 
     helper_method :cell
 
-    def newsletter(user, newsletter, preview: false)
+    def newsletter(user, newsletter, preview = nil)
       return if user.email.blank?
 
       @organization = user.organization

data/app/mailers/decidim/newsletters_opt_in_mailer.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A custom mailer for Decidim so we can notify users to verify
-  # their own newsletter notifications settings. GDPR releated
+  # their own newsletter notifications settings. GDPR related
   class NewslettersOptInMailer < ApplicationMailer
     def notify(user, token)
       with_user(user) do
@@ -10,7 +10,7 @@ module Decidim
         @organization = user.organization
         @token = token
 
-        mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+        mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: organization_name(@organization)))
       end
     end
   end

data/app/mailers/decidim/notification_mailer.rb

@@ -5,7 +5,6 @@ module Decidim
   # a events are received.
   class NotificationMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
-    helper Decidim::SanitizeHelper
 
     def event_received(event, event_class_name, resource, user, user_role, extra) # rubocop:disable Metrics/ParameterLists
       with_user(user) do

data/app/mailers/decidim/notifications_digest_mailer.rb

@@ -5,7 +5,6 @@ module Decidim
   # a events are received.
   class NotificationsDigestMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
-    helper Decidim::SanitizeHelper
     SIZE_LIMIT = 10
 
     def digest_mail(user, notification_ids)

data/app/mailers/decidim/reported_mailer.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A custom mailer for sending notifications to an admin when a report is created..
+  # A custom mailer for sending notifications to an admin when a report is created.
   class ReportedMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
-    helper Decidim::TranslationsHelper
 
     helper_method :reported_content_url, :report_url, :manage_moderations_url, :author_profile_url, :reported_content_cell
 
@@ -38,6 +37,10 @@ module Decidim
       @organization
     end
 
+    def current_user
+      @user
+    end
+
     private
 
     def reported_content_url
@@ -63,7 +66,7 @@ module Decidim
     end
 
     # This is needed to be able to use a cell in an ActionMailer, which is not supported out of the box by cells-rails.
-    # We are are passing the current object as if it was a controller.
+    # We are passing the current object as if it was a controller.
     # We also need to define a 'current_organization' method, which is expected by Decidim::ViewModel.
     # A similar approach is used in Decidim::NewsletterMailer
     def reported_content_cell

data/app/mailers/decidim/user_report_mailer.rb

@@ -11,7 +11,7 @@ module Decidim
       with_user(admin) do
         mail(to: admin.email, subject: I18n.t(
           "decidim.user_report_mailer.notify.subject",
-          organization_name: report.moderation.user.organization.name,
+          organization_name: organization_name(report.moderation.user.organization),
           reason: @report.reason
         ))
       end

data/app/models/decidim/action_log.rb

@@ -138,7 +138,6 @@ module Decidim
         Decidim::Proposals::Proposal
         Decidim::Surveys::Survey
         Decidim::Assembly
-        Decidim::Conference
         Decidim::Initiative
         Decidim::ParticipatoryProcess
       ).select do |klass|
@@ -155,16 +154,7 @@ module Decidim
     end
 
     def self.publicable_public_resource_types
-      @publicable_public_resource_types ||= public_resource_types
-                                            .select { |klass| klass.constantize.column_names.include?("published_at") } - publicable_exceptions
-    end
-
-    def self.publicable_exceptions
-      @publicable_exceptions = %w(
-        Decidim::Blogs::Post
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+      @publicable_public_resource_types ||= public_resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
     end
 
     def self.ransackable_scopes(auth_object = nil)
@@ -204,7 +194,7 @@ module Decidim
     # as a regular object.
     def participatory_space_lazy(cache: true)
       return if participatory_space_id.blank? || participatory_space_type.blank?
-      return resouce_lazy if participatory_space_id == resource_id && participatory_space_type == resource_type
+      return resource_lazy if participatory_space_id == resource_id && participatory_space_type == resource_type
 
       self.class.lazy_relation(participatory_space_id, participatory_space_type, cache)
     end

data/app/models/decidim/area_type.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Area types allows to use different types of areas in participatory space
-  # (terriotrial, sectorial, etc.)
+  # (territorial, sectorial, etc.)
   class AreaType < ApplicationRecord
     include Decidim::TranslatableResource
     include Decidim::Traceable

data/app/models/decidim/attachment.rb

@@ -9,6 +9,7 @@ module Decidim
     include Traceable
 
     before_save :set_content_type_and_size, if: :attached?
+    before_validation :set_link_content_type_and_size, if: :link?
 
     translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
@@ -61,15 +62,33 @@ module Decidim
       !photo?
     end
 
+    # Whether this attachment is a link or not.
+    #
+    # Returns Boolean.
+    def link?
+      link.present?
+    end
+
     # Which kind of file this is.
     #
     # Returns String.
     def file_type
-      url&.split(".")&.last&.split("&")&.first&.downcase
+      if file?
+        url&.split(".")&.last&.downcase
+      elsif link?
+        "link"
+      end
     end
 
+    # The URL that points to the attachment
+    #
+    # Returns String.
     def url
-      attached_uploader(:file).url
+      if file?
+        attached_uploader(:file).path
+      elsif link?
+        link
+      end
     end
 
     # The URL to download the thumbnail of the file. Only works with images.
@@ -78,7 +97,7 @@ module Decidim
     def thumbnail_url
       return unless photo?
 
-      @thumbnail_url ||= attached_uploader(:file).variant_url(:thumbnail)
+      attached_uploader(:file).path(variant: :thumbnail)
     end
 
     # The URL to download the a big version of the file. Only works with images.
@@ -87,7 +106,7 @@ module Decidim
     def big_url
       return unless photo?
 
-      @big_url ||= attached_uploader(:file).variant_url(:big)
+      attached_uploader(:file).path(variant: :big)
     end
 
     def set_content_type_and_size
@@ -95,6 +114,11 @@ module Decidim
       self.file_size = file.byte_size
     end
 
+    def set_link_content_type_and_size
+      self.content_type = "text/uri-list"
+      self.file_size = 0
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::AttachmentPresenter
     end

data/app/models/decidim/authorization.rb

@@ -101,7 +101,7 @@ module Decidim
       @workflow_manifest ||= Decidim::Verifications.find_workflow_manifest(name)
     end
 
-    # Calculates when this authorization can be reseted, if desired.
+    # Calculates when this authorization can be reset, if desired.
     #
     # **time_between_renewals** is defined in `workflow_manifest.time_between_renewals`
     # defaults to 1 day

data/app/models/decidim/authorization_transfer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Rails/HelperInstanceVariable
 module Decidim
   # An authorization transfer object is created when the user authorizes
   # themselves with the same unique ID as some other user had used in the past.

data/app/models/decidim/component.rb

@@ -14,10 +14,7 @@ module Decidim
 
     belongs_to :participatory_space, polymorphic: true
 
-    scope :registered_component_manifests, -> { where(manifest_name: Decidim.component_registry.manifests.collect(&:name)) }
-    scope :registered_space_manifests, -> { where(participatory_space_type: Decidim.participatory_space_registry.manifests.collect(&:model_class_name)) }
-
-    default_scope { registered_component_manifests.registered_space_manifests.order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
+    default_scope { order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
 
     delegate :organization, :categories, to: :participatory_space
 
@@ -59,8 +56,8 @@ module Decidim
     # Public: The hash of contextual params when the component is mounted.
     def mounted_params
       {
-        host: organization.host,
-        component_id: id,
+        :host => organization.host,
+        :component_id => id,
         "#{participatory_space.underscored_name}_slug".to_sym => participatory_space.slug
       }
     end

data/app/models/decidim/content_block.rb

@@ -60,8 +60,8 @@ module Decidim
     #
     #     # This is how you can access the image data, just like with any other
     #     # uploader field. You can use the uploader variants too.
-    #     content_block.images_container.attached_uploader(:my_image).url
-    #     content_block.images_container.attached_uploader(:my_image).variant_url(:big)
+    #     content_block.images_container.attached_uploader(:my_image).path
+    #     content_block.images_container.attached_uploader(:my_image).path(variant: :big)
     #
     #     # This will delete the attached image
     #     content_block.images_container.my_image = nil
@@ -134,7 +134,7 @@ module Decidim
       images_container.save
     end
 
-    # On instance reloading we need to remove the `images_cointainer` cached
+    # On instance reloading we need to remove the `images_container` cached
     # class so it gets regenerated with the new values.
     def reload_images
       @images_container = nil

data/app/models/decidim/messaging/message.rb

@@ -34,7 +34,7 @@ module Decidim
 
       #
       # Associates receipts for this message for each of the given users,
-      # including also a receipt for the remitent (sender) of the message.
+      # including also a receipt for the remittant (sender) of the message.
       # Receipts are unread by default, except for the sender's receipt.
       #
       # If the sender is a UserGroup then receipts will be created for its managers
@@ -64,7 +64,7 @@ module Decidim
 
       private
 
-      # returns all posible recipients from a list of users or groups
+      # returns all possible recipients from a list of users or groups
       def all_recipients(recipients)
         users = recipients.flat_map do |recipient|
           recipient.is_a?(UserGroup) ? recipient.managers : recipient

data/app/models/decidim/newsletter.rb

@@ -46,7 +46,7 @@ module Decidim
       extended_data["send_to_participants"]
     end
 
-    def sended_to_partipatory_spaces
+    def sent_to_participatory_spaces
       extended_data["participatory_space_types"]
     end
 
@@ -56,16 +56,16 @@ module Decidim
                     .find_by(scoped_resource_id: id)
     end
 
-    def url(**kwargs)
-      proxy_url(:newsletter_url, id:, **kwargs)
+    def url(**)
+      proxy_url(:newsletter_url, id:, **)
     end
 
-    def notifications_settings_url(**kwargs)
-      proxy_url(__method__, **kwargs)
+    def notifications_settings_url(**)
+      proxy_url(__method__, **)
     end
 
-    def unsubscribe_newsletters_url(**kwargs)
-      proxy_url(__method__, **kwargs)
+    def unsubscribe_newsletters_url(**)
+      proxy_url(__method__, **)
     end
 
     def organization_official_url
@@ -82,10 +82,10 @@ module Decidim
       errors.add(:author, :invalid) unless author.organization == organization
     end
 
-    def proxy_url(method, **kwargs)
+    def proxy_url(method, **)
       return "#" unless sent?
 
-      router.public_send(method, host: organization.host, **kwargs)
+      router.public_send(method, host: organization.host, **)
     end
 
     def router

data/app/models/decidim/notification.rb

@@ -9,12 +9,12 @@ module Decidim
 
     # Daily notifications should contain all notifications within the previous
     # day from the given day.
-    scope :daily, ->(time: Time.now.utc) { where(created_at: (time - 1.day).all_day) }
+    scope :daily, ->(time = Time.now.utc) { where(created_at: (time - 1.day).all_day) }
 
     # Weekly notifications should contain all notifications within the previous
     # week counting from the end of the previous day until the start of the day
     # 1 week ago from the previous day.
-    scope :weekly, lambda { |time: Time.now.utc|
+    scope :weekly, lambda { |time = Time.now.utc|
       end_of_previous_day = (time - 1.day).end_of_day
       where(created_at: (end_of_previous_day - 7.days).beginning_of_day..end_of_previous_day)
     }

data/app/models/decidim/organization.rb

@@ -15,7 +15,7 @@ module Decidim
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES = %w(original translation).freeze
 
-    translatable_fields :description, :cta_button_text, :omnipresent_banner_title, :omnipresent_banner_short_description,
+    translatable_fields :name, :description, :cta_button_text, :omnipresent_banner_title, :omnipresent_banner_short_description,
                         :highlighted_content_banner_title, :highlighted_content_banner_short_description, :highlighted_content_banner_action_title,
                         :highlighted_content_banner_action_subtitle, :welcome_notification_subject, :welcome_notification_body, :id_documents_explanation_text,
                         :admin_terms_of_service_body
@@ -41,7 +41,7 @@ module Decidim
     #  disable: Users cannot register or sign in.
     enum users_registration_mode: [:enabled, :existing, :disabled], _prefix: true
 
-    validates :name, :host, uniqueness: true
+    validates :host, uniqueness: true
     validates :reference_prefix, presence: true
     validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
@@ -60,6 +60,27 @@ module Decidim
 
     has_one_attached :open_data_file
 
+    validate :unique_name
+
+    def unique_name
+      base_query = new_record? ? Decidim::Organization.all : Decidim::Organization.where.not(id:).all
+
+      organization_names = []
+
+      base_query.pluck(:name).each do |value|
+        organization_names += value.except("machine_translations").values
+        organization_names += value.fetch("machine_translations", {}).values
+      end
+
+      organization_names = organization_names.map(&:downcase).compact_blank
+
+      name.each do |language, value|
+        next if value.is_a?(Hash)
+
+        errors.add("name_#{language}", :taken) if organization_names.include?(value.downcase)
+      end
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::OrganizationPresenter
     end

data/app/models/decidim/push_notification_message.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A messsage from a conversation that will be sent as a push notification
+  # A message from a conversation that will be sent as a push notification
   class PushNotificationMessage
     class InvalidActionError < StandardError; end
 

data/app/models/decidim/resource_link.rb

@@ -7,7 +7,7 @@ module Decidim
   # In order to group the relations between resources you need to specify a name.
   #
   # Some examples could be: proposals that have been created in a meeting or
-  # projects that are a result of merging diffrent proposals.
+  # projects that are a result of merging different proposals.
   class ResourceLink < ApplicationRecord
     belongs_to :from, polymorphic: true
     belongs_to :to, polymorphic: true