decidim-core 0.22.0 → 0.23.0

data/app/jobs/decidim/machine_translation_save_job.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This job is used by machine translation services to store the result of
+  # a field translation. This way services don't need to care about how to
+  # save it and also enables storing translations asynchronously when the
+  # translation service returns the translated text in a webhook.
+  class MachineTranslationSaveJob < ApplicationJob
+    queue_as :default
+
+    # Performs the job. It won't perform anything if the
+    # `Decidim.machine_translation_service` config is not set.
+    #
+    # resource - Any kind of `Decidim::TranslatableResource` model instance
+    # field_name - A Symbol representing the name of the field being translated
+    # target_locale - A Symbol representing the target locale for the translation
+    # translated_text - A String with the value of the field_name, translated
+    #   into the target_locale
+    def perform(resource, field_name, target_locale, translated_text)
+      resource.with_lock do
+        if resource[field_name]["machine_translations"].present?
+          resource[field_name]["machine_translations"] = resource[field_name]["machine_translations"].merge(target_locale => translated_text)
+        else
+          resource[field_name] = resource[field_name].merge("machine_translations" => { target_locale => translated_text })
+        end
+
+        # rubocop:disable Rails/SkipsModelValidations
+        resource.update_column field_name.to_sym, resource[field_name]
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end

data/app/mailers/decidim/reported_mailer.rb

@@ -4,8 +4,9 @@ module Decidim
   # A custom mailer for sending notifications to an admin when a report is created..
   class ReportedMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
+    helper Decidim::TranslationsHelper
 
-    helper_method :reported_content_url, :manage_moderations_url
+    helper_method :reported_content_url, :manage_moderations_url, :author_profile_url
 
     def report(user, report)
       with_user(user) do
@@ -13,6 +14,8 @@ module Decidim
         @participatory_space = @report.moderation.participatory_space
         @organization = user.organization
         @user = user
+        @author = @report.moderation.reportable.try(:creator_identity) || @report.moderation.reportable.try(:author)
+        @content = { title: @report.moderation.reportable.try(:title), body: @report.moderation.reportable.try(:body) }.compact
         subject = I18n.t("report.subject", scope: "decidim.reported_mailer")
         mail(to: user.email, subject: subject)
       end
@@ -38,5 +41,9 @@ module Decidim
     def manage_moderations_url
       @manage_moderations_url ||= EngineRouter.admin_proxy(@participatory_space).moderations_url(host: @organization.host)
     end
+
+    def author_profile_url
+      @author_profile_url ||= @author.is_a?(Decidim::UserBaseEntity) ? decidim.profile_url(@author.nickname, host: @organization.host) : nil
+    end
   end
 end

data/app/models/decidim/action_log.rb

@@ -5,7 +5,7 @@ module Decidim
   # for transparency reasons, to log all actions so all other users can
   # see the actions being performed.
   class ActionLog < ApplicationRecord
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
 
     belongs_to :organization,
                foreign_key: :decidim_organization_id,

data/app/models/decidim/area.rb

@@ -6,6 +6,9 @@ module Decidim
   class Area < ApplicationRecord
     include Traceable
     include Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :name
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

data/app/models/decidim/area_type.rb

@@ -4,6 +4,10 @@ module Decidim
   # Area types allows to use different types of areas in participatory space
   # (terriotrial, sectorial, etc.)
   class AreaType < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :plural
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization",

data/app/models/decidim/attachment.rb

@@ -4,14 +4,42 @@ module Decidim
   # Attachment can be any type of document or images related to a partcipatory
   # process.
   class Attachment < ApplicationRecord
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
     belongs_to :attached_to, polymorphic: true
 
     validates :file, :content_type, presence: true
-    validates :file, file_size: { less_than_or_equal_to: ->(_attachment) { Decidim.maximum_attachment_size } }
+    validates_upload :file
     mount_uploader :file, Decidim::AttachmentUploader
 
-    default_scope { order(arel_table[:weight].asc) }
+    default_scope { order(arel_table[:weight].asc, arel_table[:id].asc) }
+
+    # Returns the organization related to this attachment in case the
+    # attached_to model belongs to an organization. Otherwise will return nil.
+    #
+    # Returns Decidim::Organization or nil.
+    def organization
+      return unless attached_to
+      return attached_to if attached_to.is_a?(Decidim::Organization)
+      return unless attached_to.respond_to?(:organization)
+
+      attached_to.organization
+    end
+
+    # The context of the attachments defines which file upload settings
+    # constraints should be used when the file is uploaded. The different
+    # contexts can limit for instance which file types the user is allowed to
+    # upload.
+    #
+    # Returns Symbol.
+    def context
+      return attached_to.attachment_context if attached_to.respond_to?(:attachment_context)
+
+      :participant
+    end
 
     # Whether this attachment is a photo or not.
     #

data/app/models/decidim/attachment_collection.rb

@@ -4,6 +4,9 @@ module Decidim
   # Categories serve as a taxonomy for attachments to use for while in the
   # context of a participatory space.
   class AttachmentCollection < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :description
     belongs_to :collection_for, polymorphic: true
     has_many :attachments, foreign_key: "attachment_collection_id", class_name: "Decidim::Attachment", dependent: :nullify
 

data/app/models/decidim/authorization.rb

@@ -12,6 +12,9 @@ module Decidim
   # not.
   class Authorization < ApplicationRecord
     include Decidim::Traceable
+    include Decidim::HasUploadValidations
+
+    validates_upload :verification_attachment
     mount_uploader :verification_attachment, Decidim::Verifications::AttachmentUploader
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"

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
 
@@ -87,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

@@ -15,6 +15,8 @@ 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:)
@@ -79,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
@@ -132,6 +134,14 @@ module Decidim
 
     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/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/message.rb

@@ -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) }
 

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,6 +5,9 @@ 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

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/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.
@@ -34,16 +45,34 @@ module Decidim
     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
@@ -110,6 +139,20 @@ module Decidim
       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
@@ -133,18 +176,19 @@ module Decidim
     end
 
     def omniauth_provider_settings(provider)
-      provider_settings = {}
+      @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)
 
-      omniauth_settings.each do |key, value|
-        next unless key.to_s.include?(provider.to_s)
+            value = Decidim::AttributeEncryptor.decrypt(value) if Decidim::OmniauthProvider.value_defined?(value)
+            setting_key = Decidim::OmniauthProvider.extract_setting_key(key, provider_key)
 
-        value = Decidim::AttributeEncryptor.decrypt(value) if Decidim::OmniauthProvider.value_defined?(value)
-        setting_key = Decidim::OmniauthProvider.extract_setting_key(key, provider)
-
-        provider_settings[setting_key] = value
+            provider_settings[setting_key] = value
+          end
+        end
       end
-
-      provider_settings
+      @omniauth_provider_settings[provider]
     end
   end
 end

data/app/models/decidim/scope.rb

@@ -7,6 +7,9 @@ module Decidim
   class Scope < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :name
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -53,7 +56,7 @@ module Decidim
     end
 
     def descendants
-      organization.scopes.where("? = ANY(decidim_scopes.part_of)", id)
+      @descendants ||= organization.scopes.where("? = ANY(decidim_scopes.part_of)", id)
     end
 
     def ancestor_of?(scope)

data/app/models/decidim/scope_type.rb

@@ -4,6 +4,9 @@ module Decidim
   # Scope types allows to use different types of scopes in participatory process
   # (municipalities, provinces, states, countries, etc.)
   class ScopeType < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :plural
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization",

data/app/models/decidim/share_token.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+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"
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :token_for, foreign_key: "token_for_id", foreign_type: "token_for_type", polymorphic: true
+
+    after_initialize :generate, :set_default_expiration
+
+    def self.use!(token_for:, token:)
+      record = find_by!(token_for: token_for, token: token)
+      record.use!
+    end
+
+    def use!
+      return raise StandardError, "Share token '#{token}' for '#{token_for_type}' with id = #{token_for_id} has expired." if expired?
+
+      update!(times_used: times_used + 1, last_used_at: Time.zone.now)
+    end
+
+    def expired?
+      expires_at.past?
+    end
+
+    def url
+      token_for.shareable_url(self)
+    end
+
+    private
+
+    def generate
+      return if token.present?
+
+      loop do
+        self.token = SecureRandom.hex(32)
+        break if ShareToken.find_by(token: token).blank?
+      end
+    end
+
+    def set_default_expiration
+      self.expires_at ||= 1.day.from_now
+    end
+  end
+end