decidim-core 0.26.7 → 0.27.0.rc1

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

@@ -10,7 +10,7 @@ module Decidim
     class Conversation < ApplicationRecord
       self.table_name = "decidim_messaging_conversations"
 
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       has_many :participations, foreign_key: :decidim_conversation_id,
                                 class_name: "Decidim::Messaging::Participation",
@@ -110,7 +110,7 @@ module Decidim
       end
 
       #
-      # Given a user, returns her interlocutors in this conversation
+      # Given a user, returns their interlocutors in this conversation
       #
       # @param user [Decidim::User] The user to find interlocutors for
       #
@@ -121,7 +121,7 @@ module Decidim
       end
 
       #
-      # Given a user, returns if ALL the interlocutors allow her to join the conversation
+      # Given a user, returns if ALL the interlocutors allow the user to join the conversation
       #
       # @return Boolean
       #
@@ -173,7 +173,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::DataPortabilitySerializers::DataPortabilityConversationSerializer
+        Decidim::DownloadYourDataSerializers::DownloadYourDataConversationSerializer
       end
     end
   end

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

@@ -26,8 +26,7 @@ module Decidim
                foreign_key: :decidim_message_id,
                inverse_of: :message
 
-      validates :sender, :body, presence: true
-      validates :body, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
+      validates :body, presence: true, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
 
       default_scope { order(created_at: :asc) }
 

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

@@ -17,8 +17,6 @@ module Decidim
                  foreign_key: :decidim_participant_id,
                  class_name: "Decidim::UserBaseEntity"
 
-      validates :conversation, :participant, presence: true
-
       validates :decidim_conversation_id, uniqueness: { scope: :decidim_participant_id }
     end
   end

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

@@ -13,8 +13,6 @@ module Decidim
       belongs_to :recipient, foreign_key: "decidim_recipient_id", class_name: "Decidim::User"
       belongs_to :message, foreign_key: "decidim_message_id", class_name: "Decidim::Messaging::Message"
 
-      validates :recipient, :message, presence: true
-
       scope :recipient, ->(recipient) { where(recipient: recipient) }
       scope :unread_by, ->(user) { recipient(user).unread }
       scope :unread, -> { where(read_at: nil) }

data/app/models/decidim/newsletter.rb

@@ -56,24 +56,6 @@ module Decidim
                     .find_by(scoped_resource_id: id)
     end
 
-    def url(**kwargs)
-      proxy_url(:newsletter_url, id: id, **kwargs)
-    end
-
-    def notifications_settings_url(**kwargs)
-      proxy_url(__method__, **kwargs)
-    end
-
-    def unsubscribe_newsletters_url(**kwargs)
-      proxy_url(__method__, **kwargs)
-    end
-
-    def organization_official_url
-      return "#" unless sent?
-
-      organization.official_url || proxy_url(:root_url)
-    end
-
     private
 
     def author_belongs_to_organization
@@ -81,15 +63,5 @@ module Decidim
 
       errors.add(:author, :invalid) unless author.organization == organization
     end
-
-    def proxy_url(method, **kwargs)
-      return "#" unless sent?
-
-      router.public_send(method, host: organization.host, **kwargs)
-    end
-
-    def router
-      @router ||= EngineRouter.new("decidim", {})
-    end
   end
 end

data/app/models/decidim/notification.rb

@@ -2,11 +2,14 @@
 
 module Decidim
   class Notification < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :resource, foreign_key: "decidim_resource_id", foreign_type: "decidim_resource_type", polymorphic: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
 
+    scope :daily, ->(time: Time.now.utc - 1.day) { where(created_at: time.all_day) }
+    scope :weekly, ->(time: Time.now.utc) { where(created_at: (time - 7.days)..time) }
+
     def event_class_instance
       @event_class_instance ||= event_class.constantize.new(
         resource: resource,
@@ -26,7 +29,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityNotificationSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataNotificationSerializer
     end
   end
 end

data/app/models/decidim/oauth_application.rb

@@ -9,7 +9,18 @@ module Decidim
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
     has_one_attached :organization_logo
-    validates_upload :organization_logo, uploader: OAuthApplicationLogoUploader
+
+    # validates_upload cannot be used here because the file is not necessarily
+    # attached to any organization yet when creating a new OAuth application.
+    # The organization becomes mapped after the OAuth application is created
+    # but the logo needs to be uploaded in the front-end already before that.
+    validates(
+      :organization_logo,
+      file_size: { less_than_or_equal_to: ->(record) { record.maximum_upload_size } },
+      uploader_content_type: true,
+      uploader_image_dimensions: true
+    )
+    attached_config[:organization_logo] = OpenStruct.new(uploader: OAuthApplicationLogoUploader)
 
     def owner
       organization

data/app/models/decidim/organization.rb

@@ -22,12 +22,12 @@ module Decidim
 
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization, dependent: :destroy
     has_many :static_page_topics, class_name: "Decidim::StaticPageTopic", inverse_of: :organization, dependent: :destroy
-    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization
-    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization
-    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization
-    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization
-    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
-    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
+    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization, dependent: :destroy
+    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization, dependent: :destroy
+    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization, dependent: :destroy
+    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization, dependent: :destroy
+    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
+    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :user_entities, foreign_key: "decidim_organization_id", class_name: "Decidim::UserBaseEntity", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
@@ -146,7 +146,7 @@ module Decidim
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter
-      Decidim::Debates::OfficialAuthorPresenter.new
+      Decidim::OfficialAuthorPresenter.new
     end
 
     def static_pages_accessible_for(user)

data/app/models/decidim/participatory_space_private_user.rb

@@ -3,19 +3,21 @@
 module Decidim
   # This class gives a given User access to a given private ParticipatorySpacePrivateUser
   class ParticipatorySpacePrivateUser < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
     belongs_to :privatable_to, polymorphic: true
 
     validate :user_and_participatory_space_same_organization
 
+    scope :by_participatory_space, ->(privatable_to) { where(privatable_to_id: privatable_to.id, privatable_to_type: privatable_to.class.to_s) }
+
     def self.user_collection(user)
       where(decidim_user_id: user.id)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityParticipatorySpacePrivateUserSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataParticipatorySpacePrivateUserSerializer
     end
 
     def self.log_presenter_class_for(_log)

data/app/models/decidim/permission_action.rb

@@ -55,6 +55,7 @@ module Decidim
     end
 
     class PermissionNotSetError < StandardError; end
+
     class PermissionCannotBeDisallowedError < StandardError; end
   end
 end

data/app/models/decidim/reminder.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class Reminder < ApplicationRecord
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :component, foreign_key: "decidim_component_id", class_name: "Decidim::Component"
+    has_many :records, foreign_key: "decidim_reminder_id", class_name: "Decidim::ReminderRecord", dependent: :destroy
+    has_many :deliveries, foreign_key: "decidim_reminder_id", class_name: "Decidim::ReminderDelivery", dependent: :destroy
+  end
+end

data/app/models/decidim/reminder_delivery.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReminderDelivery < ApplicationRecord
+    belongs_to :reminder, foreign_key: "decidim_reminder_id", class_name: "Decidim::Reminder"
+  end
+end

data/app/models/decidim/reminder_record.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReminderRecord < ApplicationRecord
+    belongs_to :reminder, foreign_key: "decidim_reminder_id", class_name: "Decidim::Reminder"
+    belongs_to :remindable, foreign_type: "remindable_type", polymorphic: true, optional: true
+
+    scope :active, -> { where(state: "active") }
+    scope :pending, -> { where(state: "pending") }
+    scope :completed, -> { where(state: "completed") }
+    scope :deleted, -> { where(state: "deleted") }
+
+    def active?
+      state == "active"
+    end
+
+    def pending?
+      state == "pending"
+    end
+
+    def completed?
+      state == "completed"
+    end
+
+    def deleted?
+      state == "deleted"
+    end
+  end
+end

data/app/models/decidim/report.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A reportable can be reported one time for each user.
   class Report < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     REASONS = %w(spam offensive does_not_belong).freeze
 
@@ -20,7 +20,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
     private

data/app/models/decidim/scope.rb

@@ -8,6 +8,7 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :name
 
@@ -34,7 +35,7 @@ module Decidim
 
     before_validation :update_part_of, on: :update
 
-    validates :name, :code, :organization, presence: true
+    validates :name, :code, presence: true
     validates :code, uniqueness: { scope: :organization }
     validate :forbid_cycles
 
@@ -73,9 +74,7 @@ module Decidim
     end
 
     # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-    ransacker :name do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
-    end
+    ransacker_i18n :name
 
     private
 

data/app/models/decidim/scope_type.rb

@@ -5,6 +5,7 @@ module Decidim
   # (municipalities, provinces, states, countries, etc.)
   class ScopeType < ApplicationRecord
     include Decidim::TranslatableResource
+    include Traceable
 
     translatable_fields :name, :plural
     belongs_to :organization,
@@ -16,32 +17,8 @@ module Decidim
 
     validates :name, presence: true
 
-    before_destroy :detach_dynamic_associations
-
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::ScopeTypePresenter
     end
-
-    private
-
-    # This method detaches all records that may have association with the scope
-    # type. This cannot be done directly using the `dependent` option in the
-    # `has_many` relation in order to avoid tight coupling between the modules.
-    #
-    # This logic does not have to be applied to any classes that have been
-    # defined as `has_many` associations within this model already as they are
-    # already handled by the `dependent` option.
-    def detach_dynamic_associations
-      ActiveRecord::Base.descendants.each do |cls|
-        next if cls.abstract_class? || !cls.name&.match?(/^Decidim::/)
-        next if [self.class, Decidim::Scope].include?(cls)
-
-        cls.reflect_on_all_associations(:belongs_to).each do |ref|
-          next unless ref.options[:class_name] == self.class.name
-
-          cls.where(ref.options[:foreign_key] => id).update_all(ref.options[:foreign_key] => nil) # rubocop:disable Rails/SkipsModelValidations
-        end
-      end
-    end
   end
 end

data/app/models/decidim/share_token.rb

@@ -2,8 +2,6 @@
 
 module Decidim
   class ShareToken < ApplicationRecord
-    validates :organization, presence: true
-    validates :user, presence: true
     validates :token, presence: true, uniqueness: { scope: [:decidim_organization_id, :token_for_type, :token_for_id] }
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"

data/app/models/decidim/short_link.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Short links are a way to reference specific locations within Decidim with
+  # shorted URLs, similar to the popular link shortening services. The original
+  # reason for creating the feature was to reference long calendar URLs in a
+  # more compact way for the URLs to be compatible with the calendar programs.
+  # When the URL is long with lots of filtering parameters included in it, it
+  # may be too long for specific 3rd party programs.
+  #
+  # This feature can be used to link to any URLs or resources in Decidim with a
+  # short reference.
+  class ShortLink < ApplicationRecord
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
+    belongs_to :target, polymorphic: true
+
+    validates :identifier, presence: true, uniqueness: true
+
+    before_validation :generate_identifier
+
+    # Finds a matching short link to the same target with exactly the same
+    # parameters if it already exists or creates a new one if it doesn't exist.
+    #
+    # @param target [ActiveRecord::Base] The target where this short link should
+    #   link to. Most of the times [Decidim::Organization], [Decidim::Component]
+    #   or some other top-level record.
+    # @param mounted_engine [String] The mounted engine helper name that will be
+    #   used to generate the link.
+    # @param route_name [String, nil] The route name to be linked to. If not
+    #   defined, the short link will be generated for the root URL for the
+    #   mounted engine.
+    # @param params [Hash] The query parameters that should be included in the
+    #   URL where this short link will redirect to.
+    # @return [Decidim::ShortLink] The short link instance to link to.
+    def self.to(target, mounted_engine, route_name: nil, params: {})
+      organization =
+        if target.is_a?(Decidim::Organization)
+          target
+        else
+          target.try(:organization)
+        end
+
+      values = {
+        organization: organization,
+        target: target,
+        mounted_engine_name: mounted_engine,
+        route_name: route_name
+      }
+      existing =
+        if params
+          where(values).find_by("params = ?::jsonb", params.to_json)
+        else
+          find_by(values.merge(params: nil))
+        end
+
+      existing || create!(values.merge(params: params))
+    end
+
+    # Creates a random unique identifier for any new links. Raises an
+    # OutOfCandidatesError if a free candidate cannot be found with 20 tries.
+    # In this situation the older records should be removed from the database.
+    #
+    # @return [String] A new unique identifier.
+    def self.unique_identifier_within(organization)
+      1.step do |n|
+        raise OutOfCandidatesError if n > 20
+
+        # A-Z, a-z and 0-9
+        # 26 + 26 + 10 = 62 possibilities per character
+        # 62^10 ≈ 8×10¹⁷ total possibilities
+        candidate = SecureRandom.alphanumeric(10)
+        next if where(organization: organization, identifier: candidate).any?
+
+        return candidate
+      end
+    end
+
+    # Overrides the route_name method to add a default route name for the "root"
+    # path in case the route name is not defined for the record.
+    #
+    # @return [String] The route name to link to.
+    def route_name
+      super || "root"
+    end
+
+    # Generates the short URL referencing this link.
+    #
+    # @return [String] The short URL that can be used to link to the target.
+    def short_url
+      EngineRouter.new("decidim", default_url_options).short_link_url(id: identifier)
+    end
+
+    # Generates the full long URL to the resource matching this short link.
+    #
+    # @return [String] The target full URL that the short link should link to.
+    def target_url
+      url_helpers.send("#{route_name}_url", **params)
+    end
+
+    private
+
+    # Generates a new identifier for new records.
+    #
+    # @return [void]
+    def generate_identifier
+      return if identifier.present?
+
+      self.identifier = self.class.unique_identifier_within(organization)
+    end
+
+    # Returns the default URL options for the organization. The participatory
+    # space and component related parameters are excluded from the
+    # default_url_options because these are also needed for the short URL
+    # generation.
+    #
+    # @return [Hash] A hash of the default URL options for the links.
+    def default_url_options
+      { host: organization&.host }.compact
+    end
+
+    # Returns the options for the URL helper call against the routes proxy.
+    # The options include the mounted params for the target, such as
+    # participatory space slug and component ID, depending what the target is.
+    #
+    # @return [Hash] The mounted options for the target record that will be used
+    #   to generate the final link.
+    def mounted_options
+      if target.is_a?(Decidim::Participable)
+        # The mounted_params method returns always e.g. participatory_space_slug
+        # assembly_slug, etc. But when we want to link to the space itself, we
+        # only need the `slug` parameter.
+        { host: target.organization.host, slug: target.slug }
+      elsif target.respond_to?(:mounted_params)
+        target.mounted_params
+      elsif target.respond_to?(:component)
+        target.component.mounted_params.merge(id: target.id)
+      elsif target.respond_to?(:participatory_space)
+        target.participatory_space.mounted_params
+      elsif target.respond_to?(:slug)
+        # E.g. Decidim::StaticPage uses the slug as the `:id` parameter.
+        default_url_options.merge(id: target.slug)
+      elsif !target.is_a?(Decidim::Organization)
+        default_url_options.merge(id: target.id)
+      else
+        default_url_options
+      end
+    end
+
+    # Returns the routes helpers for the target engine.
+    #
+    # @return [Decidim::EngineRouter] An instance of the engine router that will
+    #   be used to generate the links to the correct context.
+    def url_helpers
+      @url_helpers ||= EngineRouter.new(mounted_engine_name, mounted_options)
+    end
+
+    # The OutOfCandidatesError is an error class that will be raised when the
+    # short link identifiers are running out and the short link cannot be
+    # generated.
+    class OutOfCandidatesError < StandardError; end
+  end
+end

data/app/models/decidim/user.rb

@@ -5,15 +5,15 @@ require "devise/models/decidim_newsletterable"
 require "valid_email2"
 
 module Decidim
-  # A User is a citizen that wants to join the platform to participate.
+  # A User is a participant that wants to join the platform to engage.
   class User < UserBaseEntity
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
     include Decidim::Searchable
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
     include Decidim::Traceable
 
-    REGEXP_NICKNAME = /\A[\w\-]+\z/.freeze
+    REGEXP_NICKNAME = /\A[\w\-]+\z/
 
     class Roles
       def self.all
@@ -34,6 +34,9 @@ module Decidim
     has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
+    has_many :reminders, foreign_key: "decidim_user_id", class_name: "Decidim::Reminder", dependent: :destroy
+
+    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
     validates :nickname,
@@ -48,7 +51,7 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    has_one_attached :data_portability_file
+    has_one_attached :download_your_data_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -79,12 +82,14 @@ module Decidim
                         # scope_id: :decidim_scope_id,
                         organization_id: :decidim_organization_id,
                         A: :name,
+                        B: :nickname,
                         datetime: :created_at
                       },
                       index_on_create: ->(user) { !(user.deleted? || user.blocked?) },
                       index_on_update: ->(user) { !(user.deleted? || user.blocked?) })
 
     before_save :ensure_encrypted_password
+    before_save :save_password_change
 
     def user_invited?
       invitation_token_changed? && invitation_accepted_at_changed?
@@ -184,10 +189,10 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityUserSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataUserSerializer
     end
 
-    def self.data_portability_images(user)
+    def self.download_your_data_images(user)
       user_collection(user).map(&:avatar)
     end
 
@@ -253,6 +258,18 @@ module Decidim
       Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
     end
 
+    def notifications_subscriptions
+      notification_settings.fetch("subscriptions", {})
+    end
+
+    def needs_password_update?
+      return false unless admin?
+      return false unless Decidim.config.admin_password_strong
+      return true if password_updated_at.blank?
+
+      password_updated_at < Decidim.config.admin_password_expiration_days.days.ago
+    end
+
     protected
 
     # Overrides devise email required validation.
@@ -300,5 +317,18 @@ module Decidim
     def ensure_encrypted_password
       restore_encrypted_password! if will_save_change_to_encrypted_password? && encrypted_password.blank?
     end
+
+    def save_password_change
+      return unless persisted?
+      return unless encrypted_password_changed?
+      return unless admin?
+      return unless Decidim.config.admin_password_strong
+
+      # We don't want to run validations here because that could lead to an endless validation loop.
+      # rubocop:disable Rails/SkipsModelValidations
+      update_column(:password_updated_at, Time.current)
+      update_column(:previous_passwords, [encrypted_password_was, *previous_passwords].first(Decidim.config.admin_password_repetition_times))
+      # rubocop:enable Rails/SkipsModelValidations
+    end
   end
 end

data/app/models/decidim/user_base_entity.rb

@@ -17,10 +17,8 @@ module Decidim
     has_many :notifications, foreign_key: "decidim_user_id", class_name: "Decidim::Notification", dependent: :destroy
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
-    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
-
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/.freeze
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader
@@ -32,7 +30,6 @@ module Decidim
 
     scope :blocked, -> { where(blocked: true) }
     scope :not_blocked, -> { where(blocked: false) }
-    scope :available, -> { where(deleted_at: nil, blocked: false, managed: false) }
 
     # Public: Returns a collection with all the public entities this user is following.
     #

data/app/models/decidim/user_block.rb

@@ -4,7 +4,7 @@ module Decidim
   class UserBlock < ApplicationRecord
     MINIMUM_JUSTIFICATION_LENGTH = 15
 
-    belongs_to :user, class_name: "Decidim::UserBaseEntity", foreign_key: :decidim_user_id
-    belongs_to :blocking_user, class_name: "Decidim::UserBaseEntity"
+    belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    belongs_to :blocking_user, class_name: "Decidim::User"
   end
 end