decidim-core 0.20.1 → 0.23.1

data/app/commands/decidim/amendable/create_draft.rb

@@ -49,6 +49,8 @@ module Decidim
             visibility: "public-only"
           ) do
             emendation = amendable.class.new(form.emendation_params)
+            emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
+            emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
             emendation.add_author(current_user, user_group)
             emendation.save!

data/app/commands/decidim/amendable/publish_draft.rb

@@ -30,6 +30,7 @@ module Decidim
           set_first_emendation_version
           publish_emendation
           change_amendment_state_to_evaluating
+          notify_emendation_state_change!
           notify_amendable_authors_and_followers
         end
 
@@ -62,6 +63,10 @@ module Decidim
         emendation.amendment.update(state: "evaluating")
       end
 
+      def notify_emendation_state_change!
+        emendation.process_amendment_state_change!
+      end
+
       def notify_amendable_authors_and_followers
         Decidim::EventsManager.publish(
           event: "decidim.events.amendments.amendment_created",

data/app/commands/decidim/amendable/reject.rb

@@ -26,6 +26,7 @@ module Decidim
 
         transaction do
           reject_amendment!
+          notify_emendation_state_change!
           notify_emendation_authors_and_followers
         end
 
@@ -43,6 +44,10 @@ module Decidim
         )
       end
 
+      def notify_emendation_state_change!
+        @emendation.process_amendment_state_change!
+      end
+
       def notify_emendation_authors_and_followers
         affected_users = @emendation.authors + @amendable.notifiable_identities
         followers = @emendation.followers + @amendable.followers - affected_users

data/app/commands/decidim/amendable/update_draft.rb

@@ -45,6 +45,8 @@ module Decidim
       def update_draft
         PaperTrail.request(enabled: false) do
           emendation.assign_attributes(form.emendation_params)
+          emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
+          emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
           emendation.add_author(current_user, user_group)
           emendation.save!
         end

data/app/commands/decidim/amendable/withdraw.rb

@@ -26,7 +26,7 @@ module Decidim
 
         transaction do
           withdraw_amendment!
-          withdraw_emendation!
+          notify_emendation_state_change!
         end
 
         broadcast(:ok, emendation)
@@ -45,17 +45,8 @@ module Decidim
         )
       end
 
-      # Unlike other Amendable commands, we need to update the state of the
-      # emendation for the scope Decidim::Proposals::Proposal::expect_withdrawn
-      # to be able to retrieve rejected emendations.
-      #
-      # Because we are modifying the emendation itself, we need to prevent
-      # PaperTrail from creating an additional version to ensure that this
-      # change does not appear in the diff renderer of the emendation page.
-      def withdraw_emendation!
-        PaperTrail.request(enabled: false) do
-          emendation.update!(state: "withdrawn")
-        end
+      def notify_emendation_state_change!
+        emendation.process_amendment_state_change!
       end
     end
   end

data/app/commands/decidim/attachment_methods.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A module with all the attachment common methods
+  module AttachmentMethods
+    private
+
+    def build_attachment(attached_to = nil)
+      attached_to = @attached_to if attached_to.blank?
+      attached_to = form.current_organization if attached_to.blank? && form.respond_to?(:current_organization)
+
+      @attachment = Attachment.new(
+        title: { I18n.locale => @form.attachment.title },
+        attached_to: attached_to,
+        file: @form.attachment.file # Define attached_to before this
+      )
+    end
+
+    def attachment_invalid?
+      if attachment.invalid? && attachment.errors.has_key?(:file)
+        @form.attachment.errors.add :file, attachment.errors[:file]
+        true
+      end
+    end
+
+    def attachment_present?
+      @form.attachment.file.present?
+    end
+
+    def attachment_file_uploaded?
+      !@form.attachment.file.is_a?(Decidim::ApplicationUploader)
+    end
+
+    def create_attachment
+      attachment.attached_to = @attached_to
+      attachment.save!
+    end
+
+    def attachments_allowed?
+      @form.current_component.settings.attachments_allowed?
+    end
+
+    def process_attachments?
+      attachments_allowed? && attachment_present? && attachment_file_uploaded?
+    end
+  end
+end

data/app/commands/decidim/create_registration.rb

@@ -17,9 +17,12 @@ module Decidim
     #
     # Returns nothing.
     def call
-      return broadcast(:invalid) if form.invalid?
+      if form.invalid?
+        user = User.has_pending_invitations?(form.current_organization.id, form.email)
+        user.invite!(user.invited_by) if user
+        return broadcast(:invalid)
+      end
 
-      delete_pending_invited_user
       create_user
 
       broadcast(:ok, @user)
@@ -31,10 +34,6 @@ module Decidim
 
     attr_reader :form
 
-    def delete_pending_invited_user
-      User.invitation_not_accepted.where(email: form.email).delete_all
-    end
-
     def create_user
       @user = User.create!(
         email: form.email,
@@ -46,7 +45,8 @@ module Decidim
         tos_agreement: form.tos_agreement,
         newsletter_notifications_at: form.newsletter_at,
         email_on_notification: true,
-        accepted_tos_version: form.current_organization.tos_version
+        accepted_tos_version: form.current_organization.tos_version,
+        locale: form.current_locale
       )
     end
   end

data/app/commands/decidim/create_user_group.rb

@@ -23,6 +23,7 @@ module Decidim
         create_user_group
         create_membership
       end
+      notify_admins
 
       broadcast(:ok, @user_group)
     end
@@ -53,5 +54,16 @@ module Decidim
         user_group: @user_group
       )
     end
+
+    def notify_admins
+      data = {
+        event: "decidim.events.groups.user_group_created",
+        event_class: Decidim::UserGroupCreatedEvent,
+        resource: @user_group,
+        affected_users: Decidim::User.org_admins_except_me(form.current_user)
+      }
+
+      Decidim::EventsManager.publish(data)
+    end
   end
 end

data/app/commands/decidim/destroy_account.rb

@@ -20,6 +20,8 @@ module Decidim
         destroy_user_identities
         destroy_user_group_memberships
         destroy_follows
+        destroy_participatory_space_private_user
+        delegate_destroy_to_participatory_spaces
       end
 
       broadcast(:ok)
@@ -32,6 +34,7 @@ module Decidim
       @user.nickname = ""
       @user.email = ""
       @user.delete_reason = @form.delete_reason
+      @user.admin = false if @user.admin?
       @user.deleted_at = Time.current
       @user.skip_reconfirmation!
       @user.remove_avatar!
@@ -50,5 +53,15 @@ module Decidim
       Decidim::Follow.where(followable: @user).destroy_all
       Decidim::Follow.where(user: @user).destroy_all
     end
+
+    def destroy_participatory_space_private_user
+      Decidim::ParticipatorySpacePrivateUser.where(user: @user).destroy_all
+    end
+
+    def delegate_destroy_to_participatory_spaces
+      Decidim.participatory_space_manifests.each do |space_manifest|
+        space_manifest.invoke_on_destroy_account(@user)
+      end
+    end
   end
 end

data/app/commands/decidim/endorse_resource.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic related with a user endorsing a resource.
+  # This is a user creates and endorsement.
+  class EndorseResource < Rectify::Command
+    # Public: Initializes the command.
+    #
+    # resource     - An instance of Decidim::Endorsable.
+    # current_user - The current user.
+    # current_group_id- (optional) The current_grup that is endorsing the Resource.
+    def initialize(resource, current_user, current_group_id = nil)
+      @resource = resource
+      @current_user = current_user
+      @current_group_id = current_group_id
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the resource vote.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if existing_group_endorsement?
+
+      endorsement = build_resource_endorsement
+      if endorsement.save
+        notify_endorser_followers
+        broadcast(:ok, endorsement)
+      else
+        broadcast(:invalid)
+      end
+    end
+
+    private
+
+    def existing_group_endorsement?
+      @current_group_id.present? && @resource.endorsements.exists?(decidim_user_group_id: @current_group_id)
+    end
+
+    def build_resource_endorsement
+      endorsement = @resource.endorsements.build(author: @current_user)
+      endorsement.user_group = user_groups.find(@current_group_id) if @current_group_id.present?
+      endorsement
+    end
+
+    def user_groups
+      Decidim::UserGroups::ManageableUserGroups.for(@current_user).verified
+    end
+
+    def notify_endorser_followers
+      Decidim::EventsManager.publish(
+        event: "decidim.events.resource_endorsed",
+        event_class: Decidim::ResourceEndorsedEvent,
+        resource: @resource,
+        followers: @current_user.followers,
+        extra: {
+          endorser_id: @current_user.id
+        }
+      )
+    end
+  end
+end

data/app/commands/decidim/gallery_methods.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A module with all the gallery common methods
+  # Allows to create several image attachments at once
+  module GalleryMethods
+    private
+
+    def build_gallery(attached_to = nil)
+      @gallery = []
+      @form.add_photos.each do |photo|
+        next unless image? photo
+
+        @gallery << Attachment.new(
+          title: { I18n.locale => photo.original_filename },
+          attached_to: attached_to || gallery_attached_to,
+          file: photo # Define attached_to before this
+        )
+      end
+    end
+
+    def image?(image)
+      return unless image.respond_to? :content_type
+
+      image.content_type.start_with? "image"
+    end
+
+    def gallery_invalid?
+      @gallery.each do |photo|
+        if photo.invalid? && photo.errors.has_key?(:file)
+          @form.errors.add(:add_photos, photo.errors[:file])
+          return true
+        end
+      end
+      false
+    end
+
+    def create_gallery
+      @gallery.map! do |photo|
+        photo.attached_to = gallery_attached_to
+        photo.save!
+        @form.photos << photo.id.to_s
+      end
+    end
+
+    def photo_cleanup!
+      gallery_attached_to.photos.each do |photo|
+        photo.destroy! if @form.photos.exclude? photo.id.to_s
+      end
+      # manually reset cached photos
+      gallery_attached_to.reload
+      gallery_attached_to.instance_variable_set(:@photos, nil)
+    end
+
+    # maybe a custom settings options would be nice
+    def gallery_allowed?
+      true
+    end
+
+    def process_gallery?
+      gallery_allowed? && @form.add_photos.any?
+    end
+
+    def gallery_attached_to
+      return @attached_to if @attached_to.present?
+      return form.current_organization if form.respond_to?(:current_organization)
+
+      form.current_component.organization if form.respond_to?(:current_component)
+    end
+  end
+end

data/app/commands/decidim/invite_user_again.rb

@@ -5,17 +5,15 @@ module Decidim
   class InviteUserAgain < Rectify::Command
     # Public: Initializes the command.
     #
-    # form - A form object with the params.
+    # user         - The user that receives the invitation instructions.
+    # instructions - The invitation instructions that is sent to the user.
     def initialize(user, instructions)
       @user = user
       @instructions = instructions
     end
 
     def call
-      return broadcast(:invalid) unless user&.invited_to_sign_up?
-
       user.invite!(user.invited_by, invitation_instructions: instructions)
-
       broadcast(:ok)
     end
 

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -24,29 +24,60 @@ module Decidim
 
         if message.save
           notify_interlocutors
+          notify_comanagers if sender.is_a?(UserGroup)
 
           broadcast(:ok, message)
         else
-          broadcast(:invalid)
+          broadcast(:invalid, message.errors.full_messages)
         end
       end
 
       private
 
       def sender
-        form.current_user
+        form.context.sender
       end
 
       def message
-        @message ||= conversation.add_message(sender: sender, body: form.body)
+        @message ||= conversation.add_message(sender: sender, body: form.body, user: form.context.current_user)
       end
 
       def notify_interlocutors
+        @already_notified = [form.context.current_user]
+
         conversation.interlocutors(sender).each do |recipient|
-          ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later if conversation.unread_count(recipient) == 1
+          if recipient.is_a?(UserGroup)
+            recipient.managers.each do |manager|
+              notify(manager) do
+                ConversationMailer.new_group_message(sender, manager, conversation, message, recipient).deliver_later
+              end
+            end
+          else
+            notify(recipient) do
+              ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later
+            end
+          end
+        end
+      end
+
+      def notify_comanagers
+        sender.managers.each do |recipient|
+          notify(recipient) do
+            ConversationMailer.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver_later
+          end
         end
       end
 
+      # in order for a recipient to receive an email it should not have direct-messages disabled
+      # if direct-messages are disabled, only send if he follows the sending user
+      def notify(recipient)
+        return unless conversation.unread_count(recipient) == 1
+        return unless recipient.accepts_conversation?(form.context.current_user)
+
+        yield unless @already_notified.include?(recipient)
+        @already_notified.push(recipient)
+      end
+
       attr_reader :conversation, :form
     end
   end