decidim-core 0.27.4 → 0.27.6

data/app/helpers/decidim/newsletters_helper.rb

@@ -8,28 +8,28 @@ module Decidim
     # for example transform "https://es.lipsum.com/" to "https://es.lipsum.com/?utm_source=localhost&utm_campaign=newsletter_11"
     # And replace "%{name}" on the subject or content of newsletter to the user Name
     # for example transform "%{name}" to "User Name"
+    #
+    # @param content [String] - the string to convert
+    # @param user [Decidim::User] - the user to replace
+    # @param id [Integer] - the id of the newsletter to change
+    #
+    # @return [String] - the content converted
     def parse_interpolations(content, user = nil, id = nil)
-      if Decidim.config.track_newsletter_links && id.present? && user.present?
-        host = user.organization.host.to_s
-        campaign = "newsletter_#{id}"
+      host = user&.organization&.host&.to_s
 
-        links = content.scan(/href\s*=\s*"([^"]*)"/)
-
-        links.each do |link|
-          link_replaced = link.first + utm_codes(host, campaign)
-          content = content.gsub(/href\s*=\s*"([^"]*#{link.first})"/, %(href="#{link_replaced}"))
-        end
-      end
-
-      if user.present?
-        content.gsub("%{name}", user.name)
-      else
-        content.gsub("%{name}", "")
-      end
+      content = interpret_name(content, user)
+      content = track_newsletter_links(content, id, host)
+      transform_image_urls(content, host)
     end
 
     # this method is used to generate the root link on mail with the utm_codes
     # If the newsletter_id is nil, it returns the root_url
+    #
+    # @param organization [Decidim::Organization] - the Organization of this newsletter
+    # @param newsletter_id [Integer] - the id of the newsletter
+    #
+    # @return [String] - the root_url converted
+    #
     def custom_url_for_mail_root(organization, newsletter_id = nil)
       decidim = EngineRouter.new("decidim", {})
       if newsletter_id.present?
@@ -39,10 +39,77 @@ module Decidim
       end
     end
 
+    private
+
     # Method to specify the utm_codes.
     # You can change or add utm_codes for track
+    #
+    # @param host [String] - the Decidim::Organization host add to the URL
+    # @param newsletter_id [String] - the ID of the newsletter
+    #
+    # @return [String] - the UTM codes to be added
+    #
     def utm_codes(host, newsletter_id)
       "?utm_source=#{host}&utm_campaign=#{newsletter_id}"
     end
+
+    # Interpret placeholder '%{name}' and replace by the user name
+    # If user is not define, it returns content with blank instead of the placeholder
+    #
+    # @param content [String] - the string to convert
+    # @param user [Decidim::User] - the user to replace
+    #
+    # @return [String] - the content converted
+    #
+    def interpret_name(content, user)
+      return content.gsub("%{name}", "") if user.blank?
+
+      content.gsub("%{name}", user.name)
+    end
+
+    # Find each img HTML tag with relative path in src attribute
+    # For each URL, prepends the decidim.root_url
+    #   If host is not defined it returns full content
+    #
+    # @param content [String] - the string to convert
+    # @param host [String] - the Decidim::Organization host to replace
+    #
+    # @return [String] - the content converted
+    #
+    def transform_image_urls(content, host)
+      return content if host.blank?
+
+      content.scan(/src\s*=\s*"([^"]*)"/).each do |src|
+        root_url = decidim.root_url(host: host)[0..-2]
+        src_replaced = "#{root_url}#{src.first}"
+        content = content.gsub(/src\s*=\s*"([^"]*#{src.first})"/, %(src="#{src_replaced}"))
+      end
+
+      content
+    end
+
+    # Add tracking query params to each links
+    #
+    # @param content [String] - the string to convert
+    # @param id [Integer] - the id of the newsletter
+    # @param host [String] - the Decidim::Organization host
+    #
+    # @return [String] - the content converted
+    #
+    def track_newsletter_links(content, id, host)
+      return content unless Decidim.config.track_newsletter_links
+      return content if id.blank?
+      return content if host.blank?
+
+      campaign = "newsletter_#{id}"
+      links = content.scan(/href\s*=\s*"([^"]*)"/)
+
+      links.each do |link|
+        link_replaced = link.first + utm_codes(host, campaign)
+        content = content.gsub(/href\s*=\s*"([^"]*#{link.first})"/, %(href="#{link_replaced}"))
+      end
+
+      content
+    end
   end
 end

data/app/helpers/decidim/omniauth_helper.rb

@@ -6,6 +6,8 @@ module Decidim
     # Public: normalize providers names to they can be used for buttons
     # and icons.
     def normalize_provider_name(provider)
+      return "x" if provider == :twitter
+
       provider.to_s.split("_").first
     end
 

data/app/helpers/decidim/resource_helper.rb

@@ -67,13 +67,15 @@ module Decidim
 
     # Returns an instance of ResourceLocatorPresenter with the given resource
     def resource_locator(resource)
+      return resource.resource_locator if resource.respond_to?(:resource_locator)
+
       ::Decidim::ResourceLocatorPresenter.new(resource)
     end
 
     # Returns a descriptive title for the resource
     def resource_title(resource)
       title = resource.try(:title) || resource.try(:name) || resource.try(:subject) || "#{resource.model_name.human} ##{resource.id}"
-      title = translated_attribute(title) if title.is_a?(Hash)
+      title = decidim_escape_translated(title) if title.is_a?(Hash)
       title
     end
   end

data/app/helpers/decidim/sanitize_helper.rb

@@ -6,6 +6,7 @@ module Decidim
     def self.included(base)
       base.include ActionView::Helpers::SanitizeHelper
       base.include ActionView::Helpers::TagHelper
+      base.include Decidim::TranslatableAttributes
     end
 
     # Public: It sanitizes a user-inputted string with the
@@ -53,6 +54,14 @@ module Decidim
       decidim_html_escape(text).sub(/^javascript:/, "")
     end
 
+    def decidim_sanitize_translated(text)
+      decidim_sanitize(translated_attribute(text))
+    end
+
+    def decidim_escape_translated(text)
+      decidim_html_escape(translated_attribute(text))
+    end
+
     private
 
     # Maintains the paragraphs and lists separations with their bullet points and

data/app/helpers/decidim/short_link_helper.rb

@@ -21,7 +21,7 @@ module Decidim
       target ||= respond_to?(:current_organization) && current_organization
       target ||= Rails.application
 
-      mounted_engine = EngineResolver.new(_routes).mounted_name
+      mounted_engine = target.try(:mounted_engine) || EngineResolver.new(_routes).mounted_name
       ShortLink.to(target, mounted_engine, **kwargs).short_url
     end
   end

data/app/helpers/decidim/user_profile_helper.rb

@@ -14,9 +14,14 @@ module Decidim
     #
     # Returns a String with the menu tab.
     def user_profile_tab(text, link, options = {})
-      active = is_active_link?(link, (options[:aria_link_type] || :inclusive))
+      aria = {}
+      cls = %w(tabs-title)
+      if is_active_link?(link, (options[:aria_link_type] || :inclusive))
+        cls << "is-active"
+        aria[:current] = "page"
+      end
 
-      content_tag(:li, class: "tabs-title#{active ? " is-active" : nil}") do
+      content_tag(:li, class: cls.join(" "), aria: aria) do
         link_to(text, link, options)
       end
     end

data/app/jobs/decidim/download_your_data_export_job.rb

@@ -11,7 +11,8 @@ module Decidim
 
       generate_zip_file(user, path, password, export_format)
       save_or_upload_file(user, path)
-
+      # Deletes temporary file
+      File.delete(path)
       ExportMailer.download_your_data_export(user, filename, password).deliver_later
     end
 

data/app/jobs/decidim/open_data_job.rb

@@ -11,6 +11,8 @@ module Decidim
       raise "Couldn't generate Open Data export" unless exporter.export.positive?
 
       organization.open_data_file.attach(io: File.open(path, "rb"), filename: organization.open_data_file_path)
+      # Deletes the temporary file file
+      File.delete(path)
     end
   end
 end

data/app/mailers/decidim/messaging/conversation_mailer.rb

@@ -5,74 +5,12 @@ module Decidim
     # A custom mailer for sending notifications to users when they receive
     # private messages
     class ConversationMailer < Decidim::ApplicationMailer
-      def new_conversation(originator, user, conversation)
-        notification_mail(
-          from: originator,
-          to: user,
-          conversation: conversation,
-          message: conversation.messages.first.body,
-          action: "new_conversation"
-        )
-      end
-
-      def new_group_conversation(originator, manager, conversation, group)
-        notification_mail(
-          from: originator,
-          to: manager,
-          conversation: conversation,
-          message: conversation.messages.first.body,
-          action: "new_group_conversation",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_conversation(group, user, conversation, manager)
-        notification_mail(
-          from: group,
-          to: user,
-          conversation: conversation,
-          message: conversation.messages.first.body,
-          action: "comanagers_new_conversation",
-          third_party: manager
-        )
-      end
-
-      def new_message(sender, user, conversation, message)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation: conversation,
-          message: message.body,
-          action: "new_message"
-        )
-      end
-
-      def new_group_message(sender, user, conversation, message, group)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation: conversation,
-          message: message.body,
-          action: "new_group_message",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_message(sender, user, conversation, message, manager)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation: conversation,
-          message: message.body,
-          action: "comanagers_new_message",
-          third_party: manager
-        )
-      end
+      include HasConversations
 
       private
 
       # rubocop:disable Metrics/ParameterLists
-      def notification_mail(from:, to:, conversation:, action:, message: nil, third_party: nil)
+      def send_notification(from:, to:, conversation:, action:, message: nil, third_party: nil)
         with_user(to) do
           @organization = to.organization
           @conversation = conversation
@@ -81,14 +19,7 @@ module Decidim
           @third_party = third_party
           @message = message
           @host = @organization.host
-
-          subject = I18n.t(
-            "conversation_mailer.#{action}.subject",
-            scope: "decidim.messaging",
-            sender: @sender.name,
-            manager: @third_party&.name,
-            group: @third_party&.name
-          )
+          subject = get_subject(action: action, sender: @sender, third_party: @third_party)
 
           mail(to: to.email, subject: subject)
         end

data/app/models/decidim/push_notification_message.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A messsage from a conversation that will be sent as a push notification
+  class PushNotificationMessage
+    class InvalidActionError < StandardError; end
+
+    include SanitizeHelper
+    include Decidim::TranslatableAttributes
+
+    def initialize(recipient:, conversation:, message:)
+      @recipient = recipient
+      @conversation = conversation
+      @message = message
+    end
+
+    attr_reader :recipient, :conversation, :message
+
+    alias user recipient
+
+    def body
+      decidim_html_escape(translated_attribute(message))
+    end
+
+    def icon
+      organization.attached_uploader(:favicon).variant_url(:big, host: organization.host)
+    end
+
+    def url
+      EngineRouter.new("decidim", {}).public_send(:conversation_path, host: organization.host, id: @conversation)
+    end
+
+    private
+
+    def organization
+      @organization ||= recipient.organization
+    end
+  end
+end

data/app/models/decidim/user.rb

@@ -205,7 +205,7 @@ module Decidim
     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.
@@ -269,6 +269,14 @@ module Decidim
       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: id)
+      end
+      false
+    end
+
     protected
 
     # Overrides devise email required validation.