decidim-core 0.27.4 → 0.28.0.rc5

data/app/models/decidim/notification.rb

@@ -21,11 +21,11 @@ module Decidim
 
     def event_class_instance
       @event_class_instance ||= event_class.constantize.new(
-        resource: resource,
-        event_name: event_name,
-        user: user,
-        user_role: user_role,
-        extra: extra
+        resource:,
+        event_name:,
+        user:,
+        user_role:,
+        extra:
       )
     end
 

data/app/models/decidim/organization.rb

@@ -18,7 +18,7 @@ module Decidim
     translatable_fields :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_use_body
+                        :admin_terms_of_service_body
 
     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
@@ -35,10 +35,10 @@ module Decidim
 
     has_many :templates, foreign_key: "decidim_organization_id", class_name: "Decidim::Templates::Template", dependent: :destroy if defined? Decidim::Templates
 
-    # Users registration mode. Whether users can register or access the system. Doesn't affect users that access through Omniauth integrations.
+    # Users registration mode. Whether users can register or access the system. Does not affect users that access through Omniauth integrations.
     #  enabled: Users registration and sign in are enabled (default value).
-    #  existing: Users can't be registered in the system. Only existing users can sign in.
-    #  disable: Users can't register or sign in.
+    #  existing: Users cannot be registered in the system. Only existing users can sign in.
+    #  disable: Users cannot register or sign in.
     enum users_registration_mode: [:enabled, :existing, :disabled], _prefix: true
 
     validates :name, :host, uniqueness: true
@@ -46,9 +46,6 @@ module Decidim
     validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
 
-    has_one_attached :official_img_header
-    validates_upload :official_img_header, uploader: Decidim::OfficialImageHeaderUploader
-
     has_one_attached :official_img_footer
     validates_upload :official_img_footer, uploader: Decidim::OfficialImageFooterUploader
 
@@ -117,9 +114,9 @@ module Decidim
         multi_translation("decidim.welcome_notification.default_body", available_locales)
     end
 
-    def admin_terms_of_use_body
-      self[:admin_terms_of_use_body] ||
-        multi_translation("decidim.admin_terms_of_use.default_body", available_locales)
+    def admin_terms_of_service_body
+      self[:admin_terms_of_service_body] ||
+        multi_translation("decidim.admin_terms_of_service.default_body", available_locales)
     end
 
     def sign_up_enabled?
@@ -159,6 +156,15 @@ module Decidim
       static_pages.accessible_for(self, user)
     end
 
+    def favicon_ico
+      return unless favicon.attached?
+      return favicon if favicon.content_type == "image/vnd.microsoft.icon"
+
+      uploader = attached_uploader(:favicon)
+      variant = uploader.variant(:favicon)
+      variant.processed.image
+    end
+
     private
 
     def tenant_disabled_providers_keys

data/app/models/decidim/participatory_space_private_user.rb

@@ -4,12 +4,10 @@ module Decidim
   # This class gives a given User access to a given private ParticipatorySpacePrivateUser
   class ParticipatorySpacePrivateUser < ApplicationRecord
     include Decidim::DownloadYourData
+    include ParticipatorySpaceUser
 
-    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)
@@ -24,29 +22,10 @@ module Decidim
       Decidim::AdminLog::ParticipatorySpacePrivateUserPresenter
     end
 
-    ransacker :name do
-      Arel.sql(%{("decidim_users"."name")::text})
-    end
-
-    ransacker :email do
-      Arel.sql(%{("decidim_users"."email")::text})
-    end
-
     ransacker :invitation_sent_at do
       Arel.sql(%{("invitation_sent_at")::text})
     end
 
-    ransacker :invitation_accepted_at do
-      Arel.sql(%{("invitation_accepted_at")::text})
-    end
-
-    private
-
-    # Private: check if the participatory space and the user have the same organization
-    def user_and_participatory_space_same_organization
-      return if !privatable_to || !user
-
-      errors.add(:privatable_to, :invalid) unless user.organization == privatable_to.organization
-    end
+    def target_space_association = :privatable_to
   end
 end

data/app/models/decidim/permission_action.rb

@@ -32,7 +32,7 @@ module Decidim
     end
 
     def allowed?
-      raise PermissionNotSetError, "Permission hasn't been allowed or disallowed yet: #{inspect}" if @state.blank?
+      raise PermissionNotSetError, "Permission has not been allowed or disallowed yet: #{inspect}" if @state.blank?
 
       @state == :allowed
     end

data/app/models/decidim/reminder_record.rb

@@ -2,28 +2,11 @@
 
 module Decidim
   class ReminderRecord < ApplicationRecord
+    STATES = { active: 0, pending: 10, completed: 20, deleted: -1 }.freeze
+
     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
+    enum state: STATES
   end
 end

data/app/models/decidim/report.rb

@@ -5,7 +5,7 @@ module Decidim
   class Report < ApplicationRecord
     include Decidim::DownloadYourData
 
-    REASONS = %w(spam offensive does_not_belong).freeze
+    REASONS = %w(spam offensive does_not_belong hidden_during_block).freeze
 
     belongs_to :moderation, foreign_key: "decidim_moderation_id", class_name: "Decidim::Moderation"
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"

data/app/models/decidim/share_token.rb

@@ -11,7 +11,7 @@ module Decidim
     after_initialize :generate, :set_default_expiration
 
     def self.use!(token_for:, token:)
-      record = find_by!(token_for: token_for, token: token)
+      record = find_by!(token_for:, token:)
       record.use!
     end
 
@@ -36,7 +36,7 @@ module Decidim
 
       loop do
         self.token = SecureRandom.hex(32)
-        break if ShareToken.find_by(token: token).blank?
+        break if ShareToken.find_by(token:).blank?
       end
     end
 

data/app/models/decidim/short_link.rb

@@ -19,7 +19,7 @@ module Decidim
     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.
+    # parameters if it already exists or creates a new one if it does not exist.
     #
     # @param target [ActiveRecord::Base] The target where this short link should
     #   link to. Most of the times [Decidim::Organization], [Decidim::Component]
@@ -41,10 +41,10 @@ module Decidim
         end
 
       values = {
-        organization: organization,
-        target: target,
+        organization:,
+        target:,
         mounted_engine_name: mounted_engine,
-        route_name: route_name
+        route_name:
       }
       existing =
         if params
@@ -53,7 +53,7 @@ module Decidim
           find_by(values.merge(params: nil))
         end
 
-      existing || create!(values.merge(params: params))
+      existing || create!(values.merge(params:))
     end
 
     # Creates a random unique identifier for any new links. Raises an
@@ -69,7 +69,7 @@ module Decidim
         # 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?
+        next if where(organization:, identifier: candidate).any?
 
         return candidate
       end

data/app/models/decidim/static_page.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A page is used to add static content to the website, it can be useful so
-  # organization can add their own terms and conditions, privacy policy or
+  # organization can add their own terms of service, privacy policy or
   # other pages they might need from an admin panel.
   #
   # Pages with a default slug cannot be destroyed and its slug cannot be
@@ -22,7 +22,7 @@ module Decidim
 
     # These pages will be created by default when registering an organization
     # and cannot be deleted.
-    DEFAULT_PAGES = %w(terms-and-conditions).freeze
+    DEFAULT_PAGES = %w(terms-of-service).freeze
 
     after_create :update_organization_tos_version
     before_destroy :can_be_destroyed?
@@ -31,7 +31,7 @@ module Decidim
     default_scope { order(arel_table[:weight].asc) }
 
     scope :accessible_for, lambda { |organization, user|
-      collection = where(organization: organization)
+      collection = where(organization:)
 
       if user.blank? && organization.force_users_to_authenticate_before_access_organization
         collection.where(allow_public_access: true)
@@ -74,10 +74,10 @@ module Decidim
 
     private
 
-    # When creating a terms-and-conditions page
+    # When creating a terms-of-service page
     # set the organization tos_version
     def update_organization_tos_version
-      return unless slug == "terms-and-conditions"
+      return unless slug == "terms-of-service"
 
       organization.update!(tos_version: created_at)
     end

data/app/models/decidim/user.rb

@@ -13,7 +13,7 @@ module Decidim
     include Decidim::UserReportable
     include Decidim::Traceable
 
-    REGEXP_NICKNAME = /\A[\w\-]+\z/
+    REGEXP_NICKNAME = /\A[\w-]+\z/
 
     class Roles
       def self.all
@@ -106,7 +106,7 @@ module Decidim
     # Returns the user corresponding to the given +email+ if it exists and has pending invitations,
     #   otherwise returns nil.
     def self.has_pending_invitations?(organization_id, email)
-      invitation_not_accepted.find_by(decidim_organization_id: organization_id, email: email)
+      invitation_not_accepted.find_by(decidim_organization_id: organization_id, email:)
     end
 
     # Returns the presenter for this author, to be used in the views.
@@ -150,7 +150,7 @@ module Decidim
     end
 
     def follows?(followable)
-      Decidim::Follow.where(user: self, followable: followable).any?
+      Decidim::Follow.where(user: self, followable:).any?
     end
 
     # Public: whether the user accepts direct messages from another
@@ -198,14 +198,14 @@ module Decidim
       return true if managed
       return false if accepted_tos_version.nil?
 
-      # For some reason, if we don't use `#to_i` here we get some
+      # For some reason, if we do not use `#to_i` here we get some
       # cases where the comparison returns false, but calling `#to_i` returns
       # the same number :/
       accepted_tos_version.to_i >= organization.tos_version.to_i
     end
 
     def admin_terms_accepted?
-      return true if admin_terms_accepted_at
+      admin_terms_accepted_at.present?
     end
 
     # Whether this user can be verified against some authorization or not.
@@ -264,11 +264,20 @@ module Decidim
       return false if organization.users_registration_mode == "disabled"
       return false unless admin?
       return false unless Decidim.config.admin_password_strong
+      return false if Decidim.config.admin_password_expiration_days.zero?
       return identities.none? if password_updated_at.blank?
 
       password_updated_at < Decidim.config.admin_password_expiration_days.days.ago
     end
 
+    def moderator?
+      Decidim.participatory_space_manifests.map do |manifest|
+        participatory_space_type = manifest.model_class_name.constantize
+        return true if participatory_space_type.moderators(organization).exists?(id:)
+      end
+      false
+    end
+
     protected
 
     # Overrides devise email required validation.
@@ -324,7 +333,7 @@ module Decidim
       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.
+      # We do not 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))

data/app/models/decidim/user_base_entity.rb

@@ -36,8 +36,8 @@ module Decidim
 
     # Public: Returns a collection with all the public entities this user is following.
     #
-    # This can't be done as with a `has_many :following, through: :following_follows`
-    # since it's a polymorphic relation and Rails doesn't know how to load it. With
+    # This cannot be done as with a `has_many :following, through: :following_follows`
+    # since it is a polymorphic relation and Rails does not know how to load it. With
     # this implementation we only query the database once for each kind of following.
     #
     # Returns an Array of Decidim::Followable
@@ -51,6 +51,20 @@ module Decidim
       end
     end
 
+    def public_users_followings
+      # To include users and groups self.class is not valid because for a user
+      # self.class.joins(:follows)... only return users
+      @public_users_followings ||= users_followings.not_blocked
+    end
+
+    def users_followings
+      @users_followings ||= Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self })
+    end
+
+    def followings_blocked?
+      Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self }).blocked.exists?
+    end
+
     private
 
     def only_public(klass, ids)

data/app/models/decidim/user_group.rb

@@ -131,7 +131,7 @@ module Decidim
     # Currently, groups always accept conversations from anyone.
     # This may change in the future in case the desired behaviour
     # is to check if all (or any) of the administrators accepts conversations
-    # or there's simply and option for this in the group preferences.
+    # or there is simply and option for this in the group preferences.
     def accepts_conversation?(_user)
       true
     end
@@ -192,7 +192,7 @@ module Decidim
       is_repeated = self
                     .class
                     .with_document_number(organization, document_number)
-                    .where.not(id: id)
+                    .where.not(id:)
                     .any?
 
       errors.add(:document_number, :taken) if is_repeated
@@ -202,13 +202,13 @@ module Decidim
       document_number.present?
     end
 
-    # Overwites method in `Decidim::Validatable`, as user groups don't have a
+    # Overwites method in `Decidim::Validatable`, as user groups do not have a
     # password.
     def password_required?
       false
     end
 
-    # Overwites method in `Decidim::Validatable`, as user groups don't have a
+    # Overwites method in `Decidim::Validatable`, as user groups do not have a
     # password.
     def password
       nil

data/app/packs/entrypoints/decidim_conference_diploma.scss

@@ -1 +1,3 @@
-@import "stylesheets/decidim/conference-diploma.scss";
+// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
+@import "stylesheets/decidim/legacy/conference-diploma.scss";

data/app/packs/entrypoints/decidim_core.js

@@ -1,73 +1,11 @@
-/* eslint no-unused-vars: 0 */
-/* eslint id-length: ["error", { "exceptions": ["$"] }] */
-
-import $ from "jquery"
-import Quill from "quill"
-import Rails from "@rails/ujs"
-
-import "core-js/stable";
-import "regenerator-runtime/runtime";
-import morphdom from "morphdom"
-// Export variable to make it available in .js.erb templates
-window.morphdom = morphdom
-import "src/decidim/vendor/foundation-datepicker"
-import "src/decidim/foundation_datepicker_locales"
-import "src/decidim/vendor/modernizr"
-import "src/decidim/vendor/social-share-button"
-
-import "src/decidim/input_tags"
-import "src/decidim/input_hashtags"
-import "src/decidim/input_mentions"
-import "src/decidim/input_multiple_mentions"
-import "src/decidim/input_character_counter"
-import "src/decidim/input_autojump"
+// DO NOT include any javascript file here, but inside the following file instead
 import "src/decidim/index"
-import "src/decidim/history"
-import "src/decidim/callout"
-import "src/decidim/clipboard"
-import "src/decidim/append_elements"
-import "src/decidim/user_registrations"
-import "src/decidim/account_form"
-import "src/decidim/data_picker"
-import "src/decidim/dropdowns_menus"
-import "src/decidim/append_redirect_url_to_modals"
-import "src/decidim/form_attachments"
-import "src/decidim/form_validator"
-import "src/decidim/form_remote"
-import "src/decidim/ajax_modals"
-import "src/decidim/conferences"
-import "src/decidim/tooltip_keep_on_hover"
-import "src/decidim/diff_mode_dropdown"
-import "src/decidim/conversations"
-import "src/decidim/delayed"
-import "src/decidim/icon"
-import "src/decidim/vizzs"
-import "src/decidim/responsive_horizontal_tabs"
-import "src/decidim/security/selfxss_warning"
-import "src/decidim/session_timeouter"
-import "src/decidim/configuration"
-import "src/decidim/floating_help"
-import "src/decidim/confirm"
-import "src/decidim/comments/comments"
-import "src/decidim/results_listing"
-import "src/decidim/represent_user_group"
-import "src/decidim/impersonation"
-import "src/decidim/start_conversation_dialog"
-import "src/decidim/notifications"
-import "src/decidim/identity_selector_dialog"
-import "src/decidim/gallery"
-import "src/decidim/direct_uploads/upload_field"
-import "src/decidim/back_to_list"
-import "src/decidim/data_consent"
+
+// Place for custom scripts
+import "src/decidim/decidim_application"
 
 // CSS
 import "entrypoints/decidim_core.scss"
 
-// Import from the Rails instance application
-import "src/decidim/decidim_application"
-
 // Images
 require.context("../images", true)
-
-// This needs to be loaded after confirm dialog to bind properly
-Rails.start()

data/app/packs/entrypoints/decidim_core.scss

@@ -1 +1,3 @@
+// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
 @import "stylesheets/decidim/application.scss";

data/app/packs/entrypoints/decidim_editor.js

@@ -0,0 +1,7 @@
+import createEditor from "src/decidim/editor";
+
+// CSS
+import "stylesheets/decidim/editor.scss"
+
+// Global exports
+window.createEditor = createEditor;

data/app/packs/entrypoints/decidim_email.js

@@ -1 +1,2 @@
-import "entrypoints/decidim_email.scss";
+// CSS
+import "stylesheets/decidim/legacy/email.scss";

data/app/packs/entrypoints/decidim_map.scss

@@ -1 +1,3 @@
+// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
 @import "stylesheets/decidim/map.scss";