decidim-core 0.20.1 → 0.23.1

data/app/models/decidim/category.rb

@@ -4,6 +4,10 @@ module Decidim
   # Categories serve as a taxonomy for components to use for while in the
   # context of a participatory process.
   class Category < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :description
+
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :subcategories, foreign_key: "parent_id", class_name: "Decidim::Category", dependent: :destroy, inverse_of: :parent
     belongs_to :parent, class_name: "Decidim::Category", foreign_key: "parent_id", inverse_of: :subcategories, optional: true

data/app/models/decidim/component.rb

@@ -9,6 +9,8 @@ module Decidim
     include Publicable
     include Traceable
     include Loggable
+    include Decidim::ShareableWithToken
+    include ScopableComponent
 
     belongs_to :participatory_space, polymorphic: true
 
@@ -60,6 +62,13 @@ module Decidim
       }
     end
 
+    # Public: The Form Class for this component.
+    #
+    # Returns a ComponentForm.
+    def form_class
+      manifest.component_form_class
+    end
+
     # Public: Returns the value of the registered primary stat.
     def primary_stat
       @primary_stat ||= manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.last
@@ -80,6 +89,11 @@ module Decidim
       participatory_space.can_participate?(user)
     end
 
+    # Public: Public URL for component with given share token as query parameter
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).root_path(self, share_token: share_token.token)
+    end
+
     delegate :serializes_specific_data?, to: :manifest
 
     private

data/app/models/decidim/content_block.rb

@@ -6,6 +6,8 @@ module Decidim
   class ContentBlock < ApplicationRecord
     include Publicable
 
+    attr_accessor :in_preview
+
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
 
     delegate :public_name_key, :has_settings?, :settings_form_cell, :cell, to: :manifest
@@ -13,15 +15,17 @@ module Decidim
     before_save :save_images
     after_save :reload_images
 
+    validate :images_container_valid
+
     # Public: finds the published content blocks for the given scope and
     # organization. Returns them ordered by ascending weight (lowest first).
     def self.for_scope(scope, organization:)
-      where(organization: organization, scope: scope)
+      where(organization: organization, scope_name: scope)
         .order(weight: :asc)
     end
 
     def manifest
-      @manifest ||= Decidim.content_blocks.for(scope).find { |manifest| manifest.name.to_s == manifest_name }
+      @manifest ||= Decidim.content_blocks.for(scope_name).find { |manifest| manifest.name.to_s == manifest_name }
     end
 
     # Public: Uses the `SettingsManifest` class to generate a settings schema
@@ -77,7 +81,7 @@ module Decidim
         attr_reader :content_block
 
         # Needed to calculate uploads URLs
-        delegate :id, to: :content_block
+        delegate :id, :organization, to: :content_block
 
         # Needed to customize the upload URL
         def self.name
@@ -124,12 +128,20 @@ module Decidim
       end
 
       @images_container.manifest = manifest
-      @images_container.manifest_scope = scope
+      @images_container.manifest_scope = scope_name
       @images_container = @images_container.new(self)
     end
 
     private
 
+    def images_container_valid
+      # Note that we cannot call .valid? because it's not an ActiveRecord
+      # object. It's ActiveModel and in that case, CarrierWave will not work
+      # "normally" with the validators. It adds the errors directly after the
+      # uploader was tried to set.
+      errors.add(:images_container, :invalid) if images_container.errors.any?
+    end
+
     # Internal: Since we're using the `images_container` hack to hold the
     # uploaders, we need to manually trigger it to save the attached images.
     def save_images

data/app/models/decidim/contextual_help_section.rb

@@ -2,6 +2,10 @@
 
 module Decidim
   class ContextualHelpSection < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :content
+
     belongs_to :organization, class_name: "Decidim::Organization"
     validates :organization, presence: true
     validates :content, presence: true

data/app/models/decidim/endorsement.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A resource can have an endorsement for each user or group the author/endorser belongs to.
+  class Endorsement < ApplicationRecord
+    include Decidim::Authorable
+
+    belongs_to :resource,
+               polymorphic: true,
+               counter_cache: true
+
+    validates :resource_id, uniqueness: { scope: [:resource_type, :author, :user_group] }
+    validate :author_and_resource_same_organization
+
+    scope :for_listing, -> { order(:decidim_user_group_id, :created_at) }
+
+    private
+
+    def organization
+      resource&.component&.organization
+    end
+
+    # Private: check if the resource and the author have the same organization
+    def author_and_resource_same_organization
+      return if !resource || !author
+
+      errors.add(:resource, :invalid) unless author.organization == resource.organization
+    end
+  end
+end

data/app/models/decidim/follow.rb

@@ -24,7 +24,9 @@ module Decidim
     end
 
     def self.user_follower_ids_for_participatory_spaces(spaces)
-      joins(:user).where(followable: spaces).pluck(:decidim_user_id).uniq
+      # IF the space has questions it's a Consultations
+      followables = spaces.flat_map { |space| space.try(:questions) || space }
+      joins(:user).where(followable: followables).pluck(:decidim_user_id).uniq
     end
 
     private

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

@@ -24,8 +24,12 @@ module Decidim
 
       has_many :receipts, through: :messages
 
+      scope :unread_messages_by, lambda { |user|
+        joins(:receipts).merge(Receipt.unread_by(user))
+      }
+
       scope :unread_by, lambda { |user|
-        joins(:receipts).merge(Receipt.unread_by(user)).distinct
+        unread_messages_by(user).distinct
       }
 
       default_scope { order(updated_at: :desc) }
@@ -41,11 +45,12 @@ module Decidim
       #
       # @return (see .start)
       #
-      def self.start!(originator:, interlocutors:, body:)
+      def self.start!(originator:, interlocutors:, body:, user: nil)
         conversation = start(
           originator: originator,
           interlocutors: interlocutors,
-          body: body
+          body: body,
+          user: user
         )
 
         conversation.save!
@@ -57,17 +62,18 @@ module Decidim
       # Initiates a conversation between a user and a set of interlocutors with
       # an initial message.
       #
-      # @param originator [Decidim::User] The user starting the conversation
+      # @param originator [Decidim::UserBaseEntity] The user or group starting the conversation
       # @param interlocutors [Array<Decidim::User>] The set of interlocutors in
       #   the conversation (not including the originator).
       # @param body [String] The content of the initial message
+      # @param user [Decidim::User] The user starting the conversation in case originator is a group
       #
       # @return [Decidim::Messaging::Conversation] The newly created conversation
       #
-      def self.start(originator:, interlocutors:, body:)
+      def self.start(originator:, interlocutors:, body:, user: nil)
         conversation = new(participants: [originator] + interlocutors)
 
-        conversation.add_message(sender: originator, body: body)
+        conversation.add_message(sender: originator, body: body, user: user)
 
         conversation
       end
@@ -78,8 +84,8 @@ module Decidim
       #
       # @return (see #add_message)
       #
-      def add_message!(sender:, body:)
-        add_message(sender: sender, body: body)
+      def add_message!(sender:, body:, user: nil)
+        add_message(sender: sender, body: body, user: user)
 
         save!
       end
@@ -87,15 +93,16 @@ module Decidim
       #
       # Appends a message to this conversation
       #
-      # @param sender [Decidim::User] The sender of the message
+      # @param sender [Decidim::UserBaseEntity] The sender of the message
       # @param body [String] The content of the message
+      # @param user [Decidim::User] The user sending the message in case sender is a group
       #
       # @return [Decidim::Messaging::Message] The newly created message
       #
-      def add_message(sender:, body:)
+      def add_message(sender:, body:, user: nil)
         message = messages.build(sender: sender, body: body)
 
-        message.envelope_for(interlocutors(sender))
+        message.envelope_for(recipients: interlocutors(sender), from: user)
 
         message
       end
@@ -111,6 +118,27 @@ module Decidim
         participants.reject { |participant| participant.id == user.id }
       end
 
+      #
+      # Given a user, returns if ALL the interlocutors allow her to join the conversation
+      #
+      # @return Boolean
+      #
+      def accept_user?(user)
+        # if user is a group, members are accepted
+        blocked = interlocutors(user).detect { |participant| !participant.accepts_conversation?(user) }
+        blocked.blank?
+      end
+
+      #
+      # Given a user, returns if the user is participating in the conversation
+      # for groups being part of a conversation all their admin member are accepted
+      #
+      # @return Boolean
+      #
+      def participating?(user)
+        participants.include?(user)
+      end
+
       #
       # The most recent message in this conversation
       #

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

@@ -12,7 +12,7 @@ module Decidim
 
       belongs_to :sender,
                  foreign_key: :decidim_sender_id,
-                 class_name: "Decidim::User"
+                 class_name: "Decidim::UserBaseEntity"
 
       belongs_to :conversation,
                  foreign_key: :decidim_conversation_id,
@@ -25,7 +25,7 @@ module Decidim
                inverse_of: :message
 
       validates :sender, :body, presence: true
-      validates :body, length: { maximum: 1_000 }
+      validates :body, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
 
       default_scope { order(created_at: :asc) }
 
@@ -36,16 +36,42 @@ module Decidim
       # including also a receipt for the remitent (sender) of the message.
       # Receipts are unread by default, except for the sender's receipt.
       #
-      # @param recipients [Array<Decidim::User>]
+      # If the sender is a UserGroup then receipts will be created for its managers
+      # a "from" user can be specified to avoid create a receipt for the real user sending the message
       #
-      def envelope_for(recipients)
-        receipts.build(recipient: sender, read_at: Time.current)
+      # @param recipients [Array<Decidim::UserBaseEntity>] Users or groups receiving the message
+      # @param from [Array<Decidim::User>] the user sending the message in case sender is a group
+      #
+      def envelope_for(recipients:, from: nil)
+        @from = sender.is_a?(User) ? sender : from
+        @already_notified = [@from]
+
+        receipts.build(recipient: @from, read_at: Time.current) if @from.is_a?(User)
 
-        recipients.each { |recipient| receipts.build(recipient: recipient) }
+        all_recipients(recipients).each do |recipient|
+          next if @already_notified.include?(recipient)
+
+          receipts.build(recipient: recipient)
+          @already_notified.push(recipient)
+        end
+      end
+
+      # Public: Returns the comment body with links
+      def body_with_links
+        Decidim::ContentRenderers::LinkRenderer.new(body).render
       end
 
       private
 
+      # returns all posible recipients from a list of users or groups
+      def all_recipients(recipients)
+        users = recipients.flat_map do |recipient|
+          recipient.is_a?(UserGroup) ? recipient.managers : recipient
+        end
+        users += sender.managers if sender.is_a?(UserGroup)
+        users
+      end
+
       def sender_is_participant
         errors.add(:sender, :invalid) unless conversation.participants.include?(sender)
       end

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

@@ -13,7 +13,7 @@ module Decidim
 
       belongs_to :participant,
                  foreign_key: :decidim_participant_id,
-                 class_name: "Decidim::User"
+                 class_name: "Decidim::UserBaseEntity"
 
       validates :conversation, :participant, presence: true
 

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

@@ -22,6 +22,14 @@ module Decidim
         recipient(user).update_all(read_at: Time.current)
       end
       # rubocop:enable Rails/SkipsModelValidations
+
+      # The number of messages unread by a user
+      #
+      # @return [Integer]
+      #
+      def self.unread_count(user)
+        unread_by(user).count
+      end
     end
   end
 end

data/app/models/decidim/moderation.rb

@@ -6,7 +6,7 @@ module Decidim
     include Traceable
     include Loggable
 
-    belongs_to :reportable, foreign_key: "decidim_reportable_id", foreign_type: "decidim_reportable_type", polymorphic: true
+    belongs_to :reportable, foreign_key: "decidim_reportable_id", foreign_type: "decidim_reportable_type", polymorphic: true, touch: true
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :reports, foreign_key: "decidim_moderation_id", class_name: "Decidim::Report", dependent: :destroy
 

data/app/models/decidim/newsletter.rb

@@ -5,11 +5,14 @@ module Decidim
   class Newsletter < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :subject
 
     belongs_to :author, class_name: "User"
     belongs_to :organization
 
-    validates :subject, :body, presence: true
+    validates :subject, presence: true
     validate :author_belongs_to_organization
 
     def self.log_presenter_class_for(_log)
@@ -47,6 +50,12 @@ module Decidim
       extended_data["participatory_space_types"]
     end
 
+    def template
+      @template ||= Decidim::ContentBlock
+                    .for_scope(:newsletter_template, organization: organization)
+                    .find_by(scoped_resource_id: id)
+    end
+
     private
 
     def author_belongs_to_organization

data/app/models/decidim/oauth_application.rb

@@ -4,9 +4,11 @@ module Decidim
   class OAuthApplication < ::Doorkeeper::Application
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
+    validates_upload :organization_logo
     mount_uploader :organization_logo, OAuthApplicationLogoUploader
 
     def owner

data/app/models/decidim/omniauth_provider.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OmniauthProvider
+    def self.available
+      Rails.application.secrets[:omniauth] || {}
+    end
+
+    def self.enabled
+      available.select do |_provider, settings|
+        settings[:enabled] == true
+      end
+    end
+
+    def self.extract_provider_key(enabled_setting_key)
+      enabled_setting_key.gsub("omniauth_settings_", "")
+                         .gsub("_enabled", "").to_sym
+    end
+
+    def self.extract_setting_key(setting_key, provider)
+      setting_key.gsub("omniauth_settings_#{provider}_", "").to_sym
+    end
+
+    def self.value_defined?(value)
+      value.is_a?(String) && value.present?
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -8,8 +8,17 @@ module Decidim
     include TranslationsHelper
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+    include Decidim::ActsAsAuthor
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
+    AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES = %w(original translation).freeze
+
+    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
 
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization, dependent: :destroy
     has_many :static_page_topics, foreign_key: "organization_id", class_name: "Decidim::StaticPageTopic", inverse_of: :organization, dependent: :destroy
@@ -23,6 +32,8 @@ module Decidim
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
     has_many :hashtags, foreign_key: "decidim_organization_id", class_name: "Decidim::Hashtag", dependent: :destroy
 
+    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.
     #  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.
@@ -31,18 +42,37 @@ module Decidim
 
     validates :name, :host, uniqueness: true
     validates :reference_prefix, presence: true
+    validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
 
+    validates_upload :official_img_header
     mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
+
+    validates_upload :official_img_footer
     mount_uploader :official_img_footer, Decidim::OfficialImageFooterUploader
+
+    validates_upload :logo
     mount_uploader :logo, Decidim::OrganizationLogoUploader
+
+    validates_upload :favicon
     mount_uploader :favicon, Decidim::OrganizationFaviconUploader
+
+    validates_upload :highlighted_content_banner_image
     mount_uploader :highlighted_content_banner_image, ImageUploader
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::OrganizationPresenter
     end
 
+    def settings
+      Decidim::OrganizationSettings.for(self)
+    end
+
+    # This is needed for the upload validations
+    def maximum_upload_size
+      settings.upload_maximum_file_size
+    end
+
     def available_authorization_handlers
       available_authorizations & Decidim.authorization_handlers.map(&:name)
     end
@@ -78,6 +108,11 @@ 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)
+    end
+
     def sign_up_enabled?
       users_registration_mode_enabled?
     end
@@ -96,5 +131,64 @@ module Decidim
     def open_data_file_path
       "#{host}-open-data.zip"
     end
+
+    def enabled_omniauth_providers
+      return Decidim::OmniauthProvider.enabled || {} if omniauth_settings.nil?
+
+      default_except_disabled = Decidim::OmniauthProvider.enabled.except(*tenant_disabled_providers_keys)
+      default_except_disabled.merge(tenant_enabled_providers)
+    end
+
+    def machine_translation_prioritizes_original?
+      machine_translation_display_priority == "original"
+    end
+
+    def machine_translation_prioritizes_translation?
+      machine_translation_display_priority == "translation"
+    end
+
+    # Returns the presenter for this author, to be used in the views.
+    # Required by ActsAsAuthor.
+    def presenter
+      Decidim::Debates::OfficialAuthorPresenter.new
+    end
+
+    private
+
+    def tenant_disabled_providers_keys
+      omniauth_settings.collect do |key, value|
+        next unless key.match?(/omniauth_settings_.*_enabled/) && value == false
+
+        Decidim::OmniauthProvider.extract_provider_key(key)
+      end.compact.uniq
+    end
+
+    def tenant_enabled_providers
+      tenant_enabled_providers_keys = omniauth_settings.map do |key, value|
+        next unless key.match?(/omniauth_settings_.*_enabled/) && value == true
+
+        Decidim::OmniauthProvider.extract_provider_key(key)
+      end.compact.uniq
+
+      Hash[tenant_enabled_providers_keys.map do |key|
+        [key, omniauth_provider_settings(key)]
+      end]
+    end
+
+    def omniauth_provider_settings(provider)
+      @omniauth_provider_settings ||= Hash.new do |hash, provider_key|
+        hash[provider_key] = begin
+          omniauth_settings.each_with_object({}) do |(key, value), provider_settings|
+            next unless key.to_s.include?(provider_key.to_s)
+
+            value = Decidim::AttributeEncryptor.decrypt(value) if Decidim::OmniauthProvider.value_defined?(value)
+            setting_key = Decidim::OmniauthProvider.extract_setting_key(key, provider_key)
+
+            provider_settings[setting_key] = value
+          end
+        end
+      end
+      @omniauth_provider_settings[provider]
+    end
   end
 end