decidim-core 0.23.0 → 0.24.0.rc1

data/app/controllers/decidim/user_activities_controller.rb

@@ -6,10 +6,15 @@ module Decidim
     include Paginable
     include UserGroups
     include FilterResource
+    include Flaggable
 
     helper Decidim::ResourceHelper
     helper_method :activities, :resource_types, :user
 
+    def index
+      raise ActionController::RoutingError, "Blocked User" if user&.blocked? && !current_user&.admin?
+    end
+
     private
 
     def user

data/app/controllers/decidim/user_timeline_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     include Paginable
     include UserGroups
     include FilterResource
+    include Flaggable
 
     helper Decidim::ResourceHelper
     helper_method :activities, :resource_types, :user

data/app/events/decidim/demoted_membership_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/invited_to_group_event.rb

@@ -23,11 +23,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/join_request_accepted_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/join_request_created_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/join_request_rejected_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/promoted_to_admin_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/events/decidim/removed_from_group_event.rb

@@ -18,11 +18,11 @@ module Decidim
     end
 
     def user_group_nickname
-      extra.dig("user_group_nickname")
+      extra["user_group_nickname"]
     end
 
     def user_group_name
-      extra.dig("user_group_name")
+      extra["user_group_name"]
     end
   end
 end

data/app/forms/decidim/account_form.rb

@@ -37,7 +37,7 @@ module Decidim
     def personal_url
       return if super.blank?
 
-      return "http://" + super unless super.match?(%r{\A(http|https)://}i)
+      return "http://#{super}" unless super.match?(%r{\A(http|https)://}i)
 
       super
     end

data/app/forms/decidim/attachment_form.rb

@@ -8,6 +8,7 @@ module Decidim
 
     attribute :title, String
     attribute :file
+    attribute :delete_file, Boolean
 
     mimic :attachment
 

data/app/forms/decidim/invite_user_form.rb

@@ -16,7 +16,7 @@ module Decidim
     validates :email, :name, :organization, :invitation_instructions, presence: true
     validates :role, inclusion: { in: Decidim::User::Roles.all }
 
-    validates :name, format: { with: /\A(?!.*[<>?%&\^*#@\(\)\[\]\=\+\:\;\"\{\}\\\|])/ }
+    validates :name, format: { with: /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/ }
     validate :admin_uniqueness
 
     def email
@@ -43,7 +43,7 @@ module Decidim
     private
 
     def admin_uniqueness
-      errors.add(:email, :taken) if organization.admins.where(email: email).exists?
+      errors.add(:email, :taken) if organization.admins.exists?(email: email)
     end
   end
 end

data/app/forms/decidim/messaging/conversation_form.rb

@@ -6,7 +6,7 @@ module Decidim
     class ConversationForm < Decidim::Form
       mimic :conversation
 
-      attribute :body, String
+      attribute :body, Decidim::Attributes::CleanString
       attribute :recipient_id, Integer
 
       validates :body, :recipient, presence: true

data/app/forms/decidim/messaging/message_form.rb

@@ -6,7 +6,7 @@ module Decidim
     class MessageForm < Decidim::Form
       mimic :message
 
-      attribute :body, String
+      attribute :body, Decidim::Attributes::CleanString
 
       validates :body, presence: true
     end

data/app/forms/decidim/notifications_settings_form.rb

@@ -7,6 +7,7 @@ module Decidim
     mimic :user
 
     attribute :email_on_notification, Boolean
+    attribute :email_on_moderations, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean
@@ -40,5 +41,24 @@ module Decidim
     def direct_message_types
       allow_public_contact ? "all" : "followed-only"
     end
+
+    def user_is_moderator?(user)
+      participatory_space_types.each do |participatory_space_type|
+        participatory_space_type.constantize.all.each do |participatory_space|
+          return true if participatory_space.moderators.include?(user)
+        end
+      end
+      false
+    end
+
+    private
+
+    def participatory_space_types
+      participatory_space_types = []
+      Decidim.participatory_space_manifests.each do |manifest|
+        participatory_space_types << manifest.model_class_name.to_s
+      end
+      participatory_space_types
+    end
   end
 end

data/app/forms/url_validator.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# A custom validator to check that the field value is a URL.
+#
+#   validates :my_url, url: true
+#
+class UrlValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors[attribute] << (options[:message] || "must be a valid URL") unless url_valid?(value)
+  end
+
+  # a URL may be technically well-formed but may
+  # not actually be valid, so this checks for both.
+  def url_valid?(url)
+    url = URI.parse(url)
+    (url.is_a?(URI::HTTP) || url.is_a?(URI::HTTPS)) && url.host.present?
+  rescue URI::InvalidURIError
+    false
+  end
+end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -50,6 +50,7 @@ module Decidim
 
     private
 
+    # rubocop: disable Metrics/PerceivedComplexity
     def authorized_to(tag, action, arguments, block)
       if block
         body = block
@@ -85,6 +86,7 @@ module Decidim
         send("#{tag}_to", body, url, html_options)
       end
     end
+    # rubocop: enable Metrics/PerceivedComplexity
 
     def modal_path(action, resource)
       resource_params = if resource

data/app/helpers/decidim/application_helper.rb

@@ -22,7 +22,7 @@ module Decidim
       options[:tail] = options.delete(:separator) || options[:tail] || "..."
       options[:count_tags] ||= false
       options[:count_tail] ||= false
-      options[:tail_before_final_tag] ||= true
+      options[:tail_before_final_tag] = true unless options.has_key?(:tail_before_final_tag)
 
       Truncato.truncate(text, options)
     end
@@ -98,7 +98,6 @@ module Decidim
     # Renders the cell contents.
     def cell(name, model, options = {}, &block)
       options = { context: { current_user: current_user } }.deep_merge(options)
-
       super(name, model, options, &block)
     end
 

data/app/helpers/decidim/cells_helper.rb

@@ -33,5 +33,11 @@ module Decidim
 
       true
     end
+
+    def user_flaggable?
+      return unless context[:controller].try(:flaggable_controller?)
+
+      true
+    end
   end
 end

data/app/helpers/decidim/filters_helper.rb

@@ -29,6 +29,15 @@ module Decidim
       end
     end
 
+    def filter_cache_hash(filter)
+      hash = []
+      hash << "decidim/proposals/filters"
+      hash << I18n.locale.to_s
+      hash << Digest::MD5.hexdigest(filter.to_json)
+
+      hash.join("/")
+    end
+
     private
 
     # Creates a unique namespace for a filter form to prevent dupliacte IDs in

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -6,7 +6,7 @@ module Decidim
       #
       # Generates a visualization of users for listing conversations threads
       #
-      def username_list(users, shorten = false)
+      def username_list(users, shorten: false)
         return users.pluck(:name).join(", ") unless shorten
         return users.pluck(:name).join(", ") unless users.count > 3
 
@@ -29,6 +29,16 @@ module Decidim
         end
       end
 
+      #
+      # Same as #link_to_current_or_new_conversation_with, but with a text body instead of an icon
+      #
+      # Links to the conversation between the current user and another user
+      #
+      def text_link_to_current_or_new_conversation_with(user, body = t("decidim.profiles.show.send_private_message"))
+        conversation_path = current_or_new_conversation_path_with(user)
+        link_to body, conversation_path, title: body if conversation_path
+      end
+
       #
       # Finds the right path to the conversation the current user and another
       # user (the interlocutor).

data/app/helpers/decidim/newsletters_helper.rb

@@ -9,17 +9,15 @@ module Decidim
     # And replace "%{name}" on the subject or content of newsletter to the user Name
     # for example transform "%{name}" to "User Name"
     def parse_interpolations(content, user = nil, id = nil)
-      if Decidim.config.track_newsletter_links
-        if id.present? && user.present?
-          host = user.organization.host.to_s
-          campaign = "newsletter_#{id}"
+      if Decidim.config.track_newsletter_links && id.present? && user.present?
+        host = user.organization.host.to_s
+        campaign = "newsletter_#{id}"
 
-          links = content.scan(/href\s*=\s*"([^"]*)"/)
+        links = content.scan(/href\s*=\s*"([^"]*)"/)
 
-          links.each do |link|
-            link_replaced = link.first + utm_codes(host, campaign)
-            content = content.gsub(/href\s*=\s*"([^"]*#{link.first})"/, %(href="#{link_replaced}"))
-          end
+        links.each do |link|
+          link_replaced = link.first + utm_codes(host, campaign)
+          content = content.gsub(/href\s*=\s*"([^"]*#{link.first})"/, %(href="#{link_replaced}"))
         end
       end
 

data/app/helpers/decidim/paginate_helper.rb

@@ -9,16 +9,7 @@ module Decidim
     # collection - a collection of elements that need to be paginated
     # paginate_params - a Hash with options to delegate to the pagination helper.
     def decidim_paginate(collection, paginate_params = {})
-      # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
-      # and unless we remove these params they are added again as query string :(
-      default_params = {
-        participatory_process_slug: nil,
-        assembly_slug: nil,
-        initiative_slug: nil,
-        component_id: nil
-      }
-
-      paginate collection, theme: "decidim", params: paginate_params.merge(default_params)
+      paginate collection, theme: "decidim", params: paginate_params
     end
   end
 end

data/app/helpers/decidim/sanitize_helper.rb

@@ -22,6 +22,14 @@ module Decidim
       end
     end
 
+    def decidim_sanitize_newsletter(html, options = {})
+      if options[:strip_tags]
+        strip_tags sanitize(html, scrubber: Decidim::NewsletterScrubber.new)
+      else
+        sanitize(html, scrubber: Decidim::NewsletterScrubber.new)
+      end
+    end
+
     def decidim_html_escape(text)
       ERB::Util.unwrapped_html_escape(text.to_str)
     end

data/app/helpers/decidim/scopes_helper.rb

@@ -39,7 +39,7 @@ module Decidim
     #
     # Returns nothing.
     def scopes_picker_field(form, name, root: false, options: { checkboxes_on_top: true })
-      root = current_participatory_space.scope if root == false
+      root = try(:current_participatory_space)&.scope if root == false
       form.scopes_picker name, options do |scope|
         { url: decidim.scopes_picker_path(root: root, current: scope&.id, field: form.label_for(name)),
           text: scope_name_for_picker(scope, I18n.t("decidim.scopes.global")) }
@@ -67,7 +67,7 @@ module Decidim
     # checkboxes_on_top - Show picker values on top (default) or below the picker prompt (only for multiple pickers)
     #
     # Returns nothing.
-    def scopes_picker_filter(form, name, checkboxes_on_top = true)
+    def scopes_picker_filter(form, name, checkboxes_on_top: true)
       options = {
         multiple: true,
         legend_title: I18n.t("decidim.scopes.scopes"),

data/app/jobs/decidim/block_user_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  class BlockUserJob < ApplicationJob
+    queue_as :block_user
+
+    def perform(user, justification)
+      BlockUserMailer.notify(user, justification).deliver_now
+    end
+  end
+end

data/app/jobs/decidim/data_portability_export_job.rb

@@ -10,7 +10,7 @@ module Decidim
       password = SecureRandom.urlsafe_base64
 
       generate_zip_file(user, path, password, export_format)
-      save_or_upload_file(path)
+      save_or_upload_file(user, path)
 
       ExportMailer.data_portability_export(user, filename, password).deliver_later
     end
@@ -22,8 +22,8 @@ module Decidim
     end
 
     # Saves to file system or uploads to storage service depending on the configuration.
-    def save_or_upload_file(path)
-      DataPortabilityUploader.new.store!(File.open(path, "rb"))
+    def save_or_upload_file(user, path)
+      DataPortabilityUploader.new(user).store!(File.open(path, "rb"))
     end
   end
 end