decidim-core 0.18.1 → 0.19.0

data/app/permissions/decidim/user_manager_permissions.rb

@@ -3,8 +3,10 @@
 module Decidim
   class UserManagerPermissions < DefaultPermissions
     def permissions
-      allow! if read_admin_dashboard_action?
-      allow! if impersonate_managed_user_action?
+      if user_manager?
+        allow! if read_admin_dashboard_action?
+        allow! if impersonate_managed_user_action?
+      end
 
       permission_action
     end
@@ -20,5 +22,10 @@ module Decidim
       permission_action.subject == :managed_user &&
         permission_action.action == :impersonate
     end
+
+    # Whether the user has the user_manager role or not.
+    def user_manager?
+      user && !user.admin? && user.role?("user_manager")
+    end
   end
 end

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -81,6 +81,7 @@ module Decidim
 
       def action_string
         return "decidim.admin_log.organization.update_id_documents_config" if action == "update_id_documents_config"
+
         "decidim.admin_log.organization.update"
       end
 

data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb

@@ -23,7 +23,7 @@ module Decidim
 
       def action_string
         case action
-        when "invite", "delete"
+        when "create", "create_via_csv", "delete"
           "decidim.admin_log.participatory_space_private_user.#{action}"
         else
           super

data/app/presenters/decidim/admin_log/user_presenter.rb

@@ -30,7 +30,7 @@ module Decidim
       end
 
       def user_role
-        action_log.extra.dig("extra", "invited_user_role")
+        Array(action_log.extra.dig("extra", "invited_user_role")).last
       end
 
       def user_badge

data/app/presenters/decidim/hashtag_presenter.rb

@@ -27,7 +27,7 @@ module Decidim
     end
 
     def display_hashtag
-      link_to name, decidim.search_path(term: name), target: "_blank", class: "hashtag-mention"
+      link_to name, decidim.search_path(term: name), target: "_blank", class: "hashtag-mention", rel: "noopener"
     end
 
     def display_hashtag_name

data/app/presenters/decidim/log/base_presenter.rb

@@ -234,6 +234,7 @@ module Decidim
       # Returns an Array of Strings.
       def action_log_extra_classes
         return ["logs__log--deletion"] if action.to_s == "delete"
+
         []
       end
 

data/app/presenters/decidim/log/diff_presenter.rb

@@ -111,7 +111,7 @@ module Decidim
 
         begin
           return klass.constantize
-        rescue NameError => _exception
+        rescue NameError => _e
           default_klass
         end
       end

data/app/presenters/decidim/log/value_types/area_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(area.name) if area
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.area_presenter")
         end
 

data/app/presenters/decidim/log/value_types/area_type_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(area_type.name) if area_type
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.area_type_presenter")
         end
 

data/app/presenters/decidim/log/value_types/currency_presenter.rb

@@ -12,6 +12,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present
           return unless value
+
           h.number_to_currency(value, unit: Decidim.currency_unit)
         end
       end

data/app/presenters/decidim/log/value_types/date_presenter.rb

@@ -12,6 +12,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present
           return unless value
+
           h.l(value, format: :long)
         end
       end

data/app/presenters/decidim/log/value_types/locale_presenter.rb

@@ -12,6 +12,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present
           return unless value
+
           I18n.with_locale(value) { I18n.t("locale.name") }
         end
       end

data/app/presenters/decidim/log/value_types/percentage_presenter.rb

@@ -13,6 +13,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present
           return unless value
+
           h.number_to_percentage(value, strip_insignificant_zeros: true)
         end
       end

data/app/presenters/decidim/log/value_types/scope_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(scope.name) if scope
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.scope_presenter")
         end
 

data/app/presenters/decidim/log/value_types/scope_type_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(scope_type.name) if scope_type
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.scope_type_presenter")
         end
 

data/app/presenters/decidim/metric_charts_presenter.rb

@@ -30,6 +30,7 @@ module Decidim
             safe_join(
               metrics_group.map do |metric|
                 next "" if metric.blank?
+
                 render_metrics_data(metric.metric_name, klass: "column medium-6", graph_klass: "small")
               end
             )

data/app/presenters/decidim/metric_object_presenter.rb

@@ -7,21 +7,25 @@ module Decidim
   class MetricObjectPresenter < SimpleDelegator
     def attr_int(attr, default: 0)
       return default unless __getobj__
+
       __getobj__[attr] || default
     end
 
     def attr_string(attr, default: "")
       return default unless __getobj__
+
       __getobj__[attr].presence || default
     end
 
     def attr_date(attr, default: "")
       return default unless __getobj__
+
       __getobj__[attr].try(:strftime, "%Y-%m-%d") || default
     end
 
     def attr_translated(attr, locale: I18n.locale, default: "")
       return default unless __getobj__
+
       __getobj__[attr].try(:[], locale.to_s).presence || default
     end
   end

data/app/queries/decidim/metric_manage.rb

@@ -11,6 +11,7 @@ module Decidim
     def initialize(day_string, organization)
       @day = day_string.present? ? Date.parse(day_string) : Time.zone.yesterday
       raise ArgumentError, "[ERROR] Malformed `day` argument. Format must be `YYYY-MM-DD` and in the past" if @day > Time.zone.today
+
       @day ||= Time.zone.yesterday
       @organization = organization
       @metric_name = metric_name
@@ -28,6 +29,7 @@ module Decidim
       return @registry if @registry
 
       return if cumulative.zero?
+
       @registry = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name, organization: @organization)
       @registry.assign_attributes(cumulative: cumulative, quantity: quantity)
       @registry.save!
@@ -61,6 +63,7 @@ module Decidim
     def retrieve_participatory_spaces
       Decidim.participatory_space_manifests.map do |space_manifest|
         next unless space_manifest.name == :participatory_processes # Temporal limitation
+
         space_manifest.participatory_spaces.call(@organization)
       end.flatten.compact
     end

data/app/queries/decidim/metric_measure.rb

@@ -9,6 +9,7 @@ module Decidim
     def initialize(day, resource)
       @day = day.try(:to_date) || Time.zone.yesterday
       raise ArgumentError, "[ERROR] Malformed `day` argument. Format must be `YYYY-MM-DD` and in the past" if @day > Time.zone.today
+
       @day ||= Time.zone.yesterday
       @resource = resource
     end

data/app/queries/decidim/metrics/followers_metric_manage.rb

@@ -11,10 +11,12 @@ module Decidim
 
       def save
         return @registry if @registry
+
         @registry = []
         query.each do |key, results|
           cumulative_value = results[:cumulative_users].count
           next if cumulative_value.zero?
+
           quantity_value = results[:quantity_users].count || 0
           space_type, space_id = key
           record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
@@ -49,6 +51,7 @@ module Decidim
           components.each do |component|
             operation_manifest = Decidim.metrics_operation.for(:followers, component.manifest_name)
             next grouped_participants unless operation_manifest
+
             component_participants = operation_manifest.calculate(@day, component)
             grouped_participants[key].merge!(component_participants || {}) do |_key, grouped_users, component_users|
               grouped_users | component_users

data/app/queries/decidim/metrics/participants_metric_manage.rb

@@ -14,10 +14,12 @@ module Decidim
 
       def save
         return @registry if @registry
+
         @registry = []
         query.each do |key, results|
           cumulative_value = results[:cumulative_users].count
           next if cumulative_value.zero?
+
           quantity_value = results[:quantity_users].count || 0
           space_type, space_id = key
           record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
@@ -45,6 +47,7 @@ module Decidim
           components.each do |component|
             operation_manifest = Decidim.metrics_operation.for(:participants, component.manifest_name)
             next grouped_participants unless operation_manifest
+
             component_participants = operation_manifest.calculate(@day, component)
             grouped_participants[key].merge!(component_participants || {}) do |_key, grouped_users, component_users|
               grouped_users | component_users
@@ -54,6 +57,7 @@ module Decidim
           # Special case for comments ONLY
           operation_manifest = Decidim.metrics_operation.for(:participants, :comments)
           next grouped_participants unless operation_manifest
+
           comments_participants = operation_manifest.calculate(@day, participatory_space)
           grouped_participants[key].merge!(comments_participants || {}) do |_key, grouped_users, comment_users|
             grouped_users | comment_users

data/app/queries/decidim/similar_emendations.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Class used to retrieve similar emendations, scoped to the current component.
+  class SimilarEmendations < Rectify::Query
+    include Decidim::TranslationsHelper
+
+    # Syntactic sugar to initialize the class and return the queried objects.
+    #
+    # amendment - Decidim::Amendment
+    def self.for(amendment)
+      new(amendment).query
+    end
+
+    # Initializes the class.
+    #
+    # amendment - Decidim::Amendment
+    def initialize(amendment)
+      @component = amendment.amendable.component
+      @emendation = amendment.emendation
+      @amender = amendment.amender
+    end
+
+    # Retrieves similar emendations
+    def query
+      emendation.class
+                .where(component: component)
+                .only_visible_emendations_for(amender, component)
+                .published
+                .not_hidden
+                .where(
+                  "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
+                  emendation.title,
+                  emendation.body,
+                  amendable_module.similarity_threshold
+                )
+                .limit(amendable_module.similarity_limit)
+    end
+
+    private
+
+    attr_reader :component, :emendation, :amender
+
+    def amendable_module
+      emendation.class.parent
+    end
+
+    def title_similarity
+      "similarity(title, ?)"
+    end
+
+    def body_similarity
+      "similarity(body, ?)"
+    end
+  end
+end

data/app/resolvers/decidim/core/metric_resolver.rb

@@ -48,6 +48,7 @@ module Decidim
       def filter
         @filters.each do |key, value|
           next unless Decidim::Metric.column_names.include? key.to_s
+
           @records = @records.where("#{key}": value)
         end
       end

data/app/services/decidim/action_authorizer.rb

@@ -47,6 +47,7 @@ module Decidim
 
     def permission
       return nil unless component && action
+
       @permission ||= resource&.permissions&.fetch(action, nil) || component.permissions&.fetch(action, nil)
     end
 

data/app/services/decidim/action_logger.rb

@@ -75,6 +75,7 @@ module Decidim
 
     def participatory_space
       return component.participatory_space if component.respond_to?(:participatory_space)
+
       resource.participatory_space if resource.respond_to?(:participatory_space)
     end
 

data/app/services/decidim/activity_search.rb

@@ -114,6 +114,7 @@ module Decidim
 
       chained_conditions = conditions.inject do |previous_condition, condition|
         next condition unless previous_condition
+
         previous_condition.or(condition)
       end
 

data/app/services/decidim/email_notification_generator.rb

@@ -39,11 +39,13 @@ module Decidim
       followers.each do |recipient|
         next unless ["all", "followed-only"].include?(recipient.notification_types)
         next unless participatory_space.present? && participatory_space.is_a?(Decidim::Participable) && participatory_space.can_participate?(recipient)
+
         send_email_to(recipient, user_role: :follower)
       end
 
       affected_users.each do |recipient|
         next unless ["all", "own-only"].include?(recipient.notification_types)
+
         send_email_to(recipient, user_role: :affected_user)
       end
     end
@@ -63,6 +65,7 @@ module Decidim
     def send_email_to(recipient, user_role:)
       return unless recipient
       return unless recipient.email_on_notification?
+      return if resource.respond_to?(:can_participate?) && !resource.can_participate?(recipient)
 
       NotificationMailer
         .event_received(
@@ -83,6 +86,7 @@ module Decidim
 
     def participatory_space
       return resource if resource.is_a?(Decidim::ParticipatorySpaceResourceable)
+
       component&.participatory_space
     end
   end

data/app/services/decidim/notification_generator.rb

@@ -50,6 +50,8 @@ module Decidim
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 
     def generate_notification_for(recipient, user_role:)
+      return if resource.respond_to?(:can_participate?) && !resource.can_participate?(recipient)
+
       NotificationGeneratorForRecipientJob.perform_later(
         event,
         event_class.name,

data/app/services/decidim/notification_generator_for_recipient.rb

@@ -30,7 +30,6 @@ module Decidim
       return unless event_class
       return unless resource
       return unless recipient
-      return unless notification.event_class_instance.notifiable?
 
       notification.save!
     end

data/app/services/decidim/resource_search.rb

@@ -45,7 +45,7 @@ module Decidim
                         end
 
       conditions = []
-      conditions << "decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
+      conditions << "#{query.model_name.plural}.decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
       conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
 
       query.includes(:scope).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))

data/app/services/decidim/traceability.rb

@@ -109,6 +109,7 @@ module Decidim
     def gid(author)
       return if author.blank?
       return author.to_gid if author.respond_to?(:to_gid)
+
       author
     end
 

data/app/uploaders/decidim/application_uploader.rb

@@ -11,6 +11,7 @@ module Decidim
       default_path = "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
 
       return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+
       default_path
     end
   end

data/app/uploaders/decidim/attachment_uploader.rb

@@ -7,6 +7,7 @@ module Decidim
 
     process :set_content_type_and_size_in_model
     process :validate_dimensions
+    process :strip
 
     version :thumbnail, if: :image? do
       process resize_to_fit: [nil, 237]
@@ -18,6 +19,20 @@ module Decidim
 
     protected
 
+    def extension_white_list
+      %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt ppx rtf txt odt ott odf otg ods ots)
+    end
+
+    # Strips out all embedded information from the image
+    def strip
+      return unless image?(self)
+
+      manipulate! do |img|
+        img.strip
+        img
+      end
+    end
+
     # CarrierWave automatically calls this method and validates the content
     # type fo the temp file to match against any of these options.
     def content_type_whitelist
@@ -62,6 +77,7 @@ module Decidim
 
       manipulate! do |image|
         raise CarrierWave::IntegrityError, I18n.t("carrierwave.errors.image_too_big") if image.dimensions.any? { |dimension| dimension > max_image_height_or_width }
+
         image
       end
     end