decidim-core 0.23.3 → 0.24.0.rc1

data/app/models/decidim/user_base_entity.rb

@@ -18,7 +18,7 @@ module Decidim
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@\(\)\[\]\=\+\:\;\"\{\}\\\|])/.freeze
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/.freeze
 
     validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
@@ -34,17 +34,17 @@ module Decidim
     # Returns an Array of Decidim::Followable
     def following
       @following ||= begin
-                       followings = following_follows.pluck(:decidim_followable_type, :decidim_followable_id)
-                       grouped_followings = followings.each_with_object({}) do |(type, following_id), all|
-                         all[type] ||= []
-                         all[type] << following_id
-                         all
-                       end
-
-                       grouped_followings.flat_map do |type, ids|
-                         type.constantize.where(id: ids)
-                       end
-                     end
+        followings = following_follows.pluck(:decidim_followable_type, :decidim_followable_id)
+        grouped_followings = followings.each_with_object({}) do |(type, following_id), all|
+          all[type] ||= []
+          all[type] << following_id
+          all
+        end
+
+        grouped_followings.flat_map do |type, ids|
+          type.constantize.where(id: ids)
+        end
+      end
     end
   end
 end

data/app/models/decidim/user_block.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserBlock < ApplicationRecord
+    MINIMUM_JUSTIFICATION_LENGTH = 15
+
+    belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    belongs_to :blocking_user, class_name: "Decidim::User"
+  end
+end

data/app/models/decidim/user_group.rb

@@ -9,6 +9,7 @@ module Decidim
     include Decidim::Traceable
     include Decidim::DataPortability
     include Decidim::ActsAsAuthor
+    include Decidim::UserReportable
 
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_group_id, dependent: :destroy
     has_many :users, through: :memberships, class_name: "Decidim::User", foreign_key: :decidim_user_id

data/app/models/decidim/user_moderation.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserModeration < ApplicationRecord
+    include Traceable
+    include Loggable
+
+    belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::UserBaseEntity"
+    has_many :reports, class_name: "Decidim::UserReport", dependent: :destroy
+
+    scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
+    scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
+
+    delegate :organization, to: :user
+    scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
+    scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::UserModerationPresenter
+    end
+  end
+end

data/app/models/decidim/user_report.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserReport < ApplicationRecord
+    include Decidim::DataPortability
+
+    REASONS = %w(spam offensive does_not_belong).freeze
+
+    belongs_to :moderation, foreign_key: :user_moderation_id, class_name: "Decidim::UserModeration"
+    belongs_to :user, class_name: "Decidim::User"
+
+    validates :reason, presence: true
+    validates :reason, inclusion: { in: REASONS }
+    validates :user, uniqueness: { scope: :user_moderation_id }
+    validate :user_and_moderation_same_organization
+
+    def self.export_serializer
+      raise NotImplementedError
+      # Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+    end
+
+    private
+
+    # Private: check if the moderation and the user have the same organization
+    def user_and_moderation_same_organization
+      return if !moderation || !user
+
+      errors.add(:moderation, :invalid) unless user.organization == moderation.organization
+    end
+  end
+end

data/app/permissions/decidim/permissions.rb

@@ -127,9 +127,7 @@ module Decidim
       conversation = context.fetch(:conversation)
       interlocutor = context.fetch(:interlocutor, user)
 
-      if [:create, :update].include?(permission_action.action)
-        return disallow! unless conversation&.accept_user? interlocutor
-      end
+      return disallow! if [:create, :update].include?(permission_action.action) && !conversation&.accept_user?(interlocutor)
 
       toggle_allow(conversation&.participating?(interlocutor))
     end

data/app/permissions/decidim/report_user_permissions.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReportUserPermissions < DefaultPermissions
+    def permissions
+      return permission_action unless user
+
+      allow! if permission_action.subject == :user_report && permission_action.action == :create
+
+      permission_action
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ImpersonationLog`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ImpersonationLogPresenter.new(action_log, view_helpers).present
+    class ImpersonationLogPresenter < Decidim::Log::BasePresenter
+      alias h view_helpers
+
+      private
+
+      def action_string
+        case action
+        when "manage"
+          "decidim.admin_log.impersonation_log.#{action}"
+        else
+          super
+        end
+      end
+
+      def i18n_params
+        super.merge(
+          reason: action_log.extra["reason"]
+        )
+      end
+
+      def resource_presenter
+        @resource_presenter ||= Decidim::Log::UserPresenter.new(action_log.resource.user, h, action_log.extra["resource"])
+      end
+    end
+  end
+end

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

@@ -67,8 +67,7 @@ module Decidim
           favicon: :string,
           official_img_header: :string,
           official_img_footer: :string,
-          official_url: :string,
-          show_statistics: :boolean
+          official_url: :string
         }
       end
 

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::UserModeration`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ModerationPresenter.new(action_log, view_helpers).present
+    class UserModerationPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          hidden_at: :date,
+          report_count: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "hide", "unreport"
+          "decidim.admin_log.user_moderation.#{action}"
+        else
+          super
+        end
+      end
+
+      def i18n_labels_scope
+        "decidim.moderations.models.moderation.fields"
+      end
+
+      def i18n_params
+        super.merge(
+          resource_type: action_log.extra.dig("extra", "reportable_type").try(:demodulize),
+          unreported_user_name: unreported_user_presenter.try(:present)
+        )
+      end
+
+      # Private: Caches the object that will be responsible of presenting the user
+      # that performed the given action.
+      #
+      # Returns an object that responds to `present`.
+      def unreported_user_presenter
+        @unreported_user_presenter ||= Decidim::Log::UserPresenter.new(unreported_user, h,
+                                                                       "name" => unreported_user.name,
+                                                                       "nickname" => unreported_user.nickname)
+      end
+
+      def unreported_user
+        @unreported_user ||= Decidim::User.find_by(id: action_log.extra.dig("extra", "user_id"))
+      end
+
+      def has_diff?
+        action == "unreport" || super
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Decidim
 
       def action_string
         case action
-        when "grant_id_documents_offline_verification", "invite", "officialize", "remove_from_admin", "show_email", "unofficialize"
+        when "grant_id_documents_offline_verification", "invite", "officialize", "remove_from_admin", "show_email", "unofficialize", "block", "unblock", "promote", "transfer"
           "decidim.admin_log.user.#{action}"
         else
           super
@@ -41,18 +41,27 @@ module Decidim
         action_log.extra.dig("extra", "officialized_user_badge_previous") || Hash.new("")
       end
 
-      # We fake the changeset for officialization actions.
+      def previous_justification
+        action_log.extra.dig("extra", "previous_justification") || ""
+      end
+
+      def current_justification
+        action_log.extra.dig("extra", "current_justification") || Hash.new("")
+      end
+
+      # Overwrite the changeset for officialization and block actions.
       def changeset
-        Decidim::Log::DiffChangesetCalculator.new(
-          { badge: [previous_user_badge, user_badge] },
-          { badge: :i18n },
-          i18n_labels_scope
-        ).changeset
+        original = { badge: [previous_user_badge, user_badge] }
+        fields = { badge: :i18n }
+        if action.to_s == "block"
+          original = { justification: [previous_justification, current_justification] }
+          fields = { justification: :string }
+        end
+        Decidim::Log::DiffChangesetCalculator.new(original, fields, i18n_labels_scope).changeset
       end
 
-      # If the action is officialization, then we want to show the diff
       def diff_actions
-        %w(officialize unofficialize)
+        %w(officialize unofficialize block)
       end
     end
   end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -8,8 +8,8 @@ module Decidim
     # Public: Render a collection of primary stats.
     def highlighted
       highlighted_stats = Decidim.stats.only([:users_count, :processes_count]).with_context(organization).map { |name, data| [name, data] }
-      highlighted_stats = highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
-      highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
+      highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
+      highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
       highlighted_stats = highlighted_stats.reject(&:empty?)
       highlighted_stats = highlighted_stats.reject { |_name, data| data.zero? }
 
@@ -29,7 +29,7 @@ module Decidim
     # Public: Render a collection of stats that are not primary.
     def not_highlighted
       not_highlighted_stats = global_stats(priority: StatsRegistry::MEDIUM_PRIORITY)
-      not_highlighted_stats = not_highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      not_highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
       not_highlighted_stats = not_highlighted_stats.reject(&:empty?)
       not_highlighted_stats = not_highlighted_stats.reject { |_name, data| data.zero? }
 

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

@@ -103,14 +103,15 @@ module Decidim
         default_klass = Decidim::Log::ValueTypes::DefaultPresenter
         klass = ""
 
-        if type.is_a?(Symbol)
+        case type
+        when Symbol
           klass = "Decidim::Log::ValueTypes::#{type.to_s.camelize}Presenter"
-        elsif type.is_a?(String)
+        when String
           klass = type
         end
 
         begin
-          return klass.constantize
+          klass.constantize
         rescue NameError => _e
           default_klass
         end

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

@@ -55,10 +55,10 @@ module Decidim
       # present, it returns `nil`.
       def resource_path
         @resource_path ||= begin
-                             Decidim::ResourceLocatorPresenter.new(resource).path
-                           rescue NoMethodError
-                             nil
-                           end
+          Decidim::ResourceLocatorPresenter.new(resource).path
+        rescue NoMethodError
+          nil
+        end
       end
 
       # Private: Presents resource name.

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

@@ -51,7 +51,7 @@ module Decidim
           present_user_name,
           user_path,
           class: "logs__log__author",
-          title: "@" + user.nickname,
+          title: "@#{user.nickname}",
           data: {
             tooltip: true,
             "disable-hover": false

data/app/presenters/decidim/menu_presenter.rb

@@ -22,22 +22,27 @@ module Decidim
 
     def evaluated_menu
       @evaluated_menu ||= begin
-                            menu = Menu.new(@name)
-                            menu.build_for(@view)
-                            menu
-                          end
+        menu = Menu.new(@name)
+        menu.build_for(@view)
+        menu
+      end
     end
 
     def render
       content_tag :nav, class: "main-nav" do
-        content_tag :ul do
-          safe_join(menu_items)
-        end
+        render_menu
       end
     end
 
     protected
 
+    def render_menu(&block)
+      content_tag :ul do
+        elements = block_given? ? [block.call(@view)] : []
+        safe_join(elements + menu_items)
+      end
+    end
+
     def menu_items
       items.map do |menu_item|
         MenuItemPresenter.new(menu_item, @view, @options).render

data/app/presenters/decidim/nil_presenter.rb

@@ -20,10 +20,8 @@ module Decidim
       true
     end
 
-    # rubocop:disable Style/MethodMissingSuper
     def method_missing(_method, *_args)
       ""
     end
-    # rubocop:enable Style/MethodMissingSuper
   end
 end

data/app/presenters/decidim/user_presenter.rb

@@ -43,7 +43,7 @@ module Decidim
     end
 
     def display_mention
-      link_to nickname, profile_path, class: "user-mention"
+      link_to nickname, profile_url, class: "user-mention"
     end
 
     def can_be_contacted?

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Metrics
+    # Metric manager for User's registries
+    class BlockedUsersMetricManage < Decidim::MetricManage
+      def metric_name
+        "blocked_users"
+      end
+
+      private
+
+      def query
+        return @query if @query
+
+        @query = Decidim::User.blocked.where(organization: @organization)
+        @query = @query.where("blocked_at <= ?", end_time)
+        @query
+      end
+
+      def quantity
+        @quantity ||= @query.where("blocked_at >= ?", start_time).count
+      end
+    end
+  end
+end