decidim-core 0.27.5 → 0.27.7

data/app/mailers/decidim/application_mailer.rb

@@ -7,23 +7,57 @@ module Decidim
     include LocalisedMailer
     include MultitenantAssetHost
     after_action :set_smtp
+    after_action :set_from
 
     default from: Decidim.config.mailer_sender
     layout "decidim/mailer"
 
     private
 
+    attr_reader :organization
+
     def set_smtp
-      return if @organization.nil? || @organization.smtp_settings.blank?
+      return if organization.nil? || organization.smtp_settings.blank? || organization.smtp_settings.except("from", "from_label", "from_email").all?(&:blank?)
 
-      mail.from = @organization.smtp_settings["from"].presence || mail.from
       mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
       mail.delivery_method.settings.merge!(
-        address: @organization.smtp_settings["address"],
-        port: @organization.smtp_settings["port"],
-        user_name: @organization.smtp_settings["user_name"],
-        password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
+        address: organization.smtp_settings["address"],
+        port: organization.smtp_settings["port"],
+        user_name: organization.smtp_settings["user_name"],
+        password: Decidim::AttributeEncryptor.decrypt(organization.smtp_settings["encrypted_password"])
       ) { |_k, o, v| v.presence || o }.compact_blank!
     end
+
+    def set_from
+      return if organization.nil?
+      return if already_defined_name_in_mail?(mail.from.first)
+
+      mail.from = sender
+    end
+
+    def sender
+      return Decidim.config.mailer_sender if return_mailer_sender?
+      return default_sender if organization.smtp_settings.blank?
+      return default_sender if organization.smtp_settings["from"].nil?
+      return default_sender if organization.smtp_settings["from"].empty?
+
+      smtp_settings_from = organization.smtp_settings["from"]
+      return smtp_settings_from if already_defined_name_in_mail?(smtp_settings_from)
+
+      email_address_with_name(smtp_settings_from, organization.name)
+    end
+
+    def default_sender
+      email_address_with_name(Decidim.config.mailer_sender, organization.name)
+    end
+
+    def already_defined_name_in_mail?(mail_address)
+      # if there is an space, there is already a name in the address
+      mail_address.match?(/ /)
+    end
+
+    def return_mailer_sender?
+      already_defined_name_in_mail?(Decidim.config.mailer_sender) && organization.smtp_settings.present?
+    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/packs/src/decidim/input_hashtags.js

@@ -26,7 +26,7 @@ $(() => {
 
   /* eslint no-use-before-define: ["error", { "variables": false }]*/
   let remoteSearch = function(text, cb) {
-    $.post("/api", {query: `{hashtags(name:"${text}") {name}}`}).
+    $.post(window.Decidim.config.get("api_path"), {query: `{hashtags(name:"${text}") {name}}`}).
 
       then((response) => {
         let data = response.data.hashtags || {};

data/app/packs/src/decidim/input_mentions.js

@@ -42,7 +42,7 @@ $(() => {
   /* eslint no-use-before-define: ["error", { "variables": false }]*/
   let remoteSearch = function(text, cb) {
     let query = `{users(filter:{wildcard:"${text}"}){nickname,name,avatarUrl,__typename,...on UserGroup{membersCount}}}`;
-    $.post("/api", {query: query}).
+    $.post(window.Decidim.config.get("api_path"), {query: query}).
       then((response) => {
         let data = response.data.users || {};
         cb(data)

data/app/packs/src/decidim/input_multiple_mentions.js

@@ -42,7 +42,7 @@ $(() => {
   const autoComplete = new AutoComplete($searchInput[0], {
     dataMatchKeys: ["name", "nickname"],
     dataSource: (query, callback) => {
-      $.post("/api", {
+      $.post(window.Decidim.config.get("api_path"), {
         "query": `
           {
             users(filter:{wildcard:"${query}",excludeIds:[]})

data/app/packs/src/decidim/vizzs/index.js

@@ -19,7 +19,7 @@ $(() => {
     metricsParams.spaceId = $("#metrics #metrics-space_id").val() || null;
   }
 
-  const fetch = (metrics) => $.post("/api", query(metrics));
+  const fetch = (metrics) => $.post(window.Decidim.config.get("api_path"), query(metrics));
 
   const downloadMetricData = (event) => {
     event.preventDefault();

data/app/packs/stylesheets/decidim/plugins/leaflet.scss

@@ -22,8 +22,6 @@
 .leaflet-tile,
 .leaflet-marker-icon,
 .leaflet-marker-shadow{
-  -webkit-user-select: none;
-  -moz-user-select: none;
   user-select: none;
   -webkit-user-drag: none;
 }
@@ -45,34 +43,53 @@
   display: block;
 }
 
-/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
+/* .leaflet-container svg: reset svg max-width declaration shipped in Joomla! (joomla.org) 3.x */
 
 /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-overlay-pane svg{
+  max-width: none !important;
+  max-height: none !important;
+}
+
 .leaflet-container .leaflet-marker-pane img,
 .leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
-.leaflet-container img.leaflet-image-layer{
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile{
   max-width: none !important;
+  max-height: none !important;
+  width: auto;
+  padding: 0;
+}
+
+.leaflet-container img.leaflet-tile{
+  /* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+  mix-blend-mode: plus-lighter;
 }
 
 .leaflet-container.leaflet-touch-zoom{
-  -ms-touch-action: pan-x pan-y;
   touch-action: pan-x pan-y;
 }
 
 .leaflet-container.leaflet-touch-drag{
-  -ms-touch-action: pinch-zoom;
+  /* Fallback for FF which does not support pinch-zoom */
+  touch-action: none;
   touch-action: pinch-zoom;
 }
 
 .leaflet-container.leaflet-touch-drag.leaflet-touch-zoom{
-  -ms-touch-action: none;
   touch-action: none;
 }
 
+.leaflet-container{
+  -webkit-tap-highlight-color: transparent;
+}
+
+.leaflet-container a{
+  -webkit-tap-highlight-color: rgba(51, 181, 229, .4);
+}
+
 .leaflet-tile{
-  filter: inherit;
   visibility: hidden;
 }
 
@@ -83,7 +100,6 @@
 .leaflet-zoom-box{
   width: 0;
   height: 0;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
   z-index: 800;
 }
@@ -94,27 +110,40 @@
   user-select: none;
 }
 
-.leaflet-pane{ z-index: 400; }
+.leaflet-pane{
+  z-index: 400;
+}
 
-.leaflet-tile-pane{ z-index: 200; }
-.leaflet-overlay-pane{ z-index: 400; }
-.leaflet-shadow-pane{ z-index: 500; }
-.leaflet-marker-pane{ z-index: 600; }
-.leaflet-tooltip-pane{ z-index: 650; }
-.leaflet-popup-pane{ z-index: 700; }
+.leaflet-tile-pane{
+  z-index: 200;
+}
 
-.leaflet-map-pane canvas{ z-index: 100; }
-.leaflet-map-pane svg{ z-index: 200; }
+.leaflet-overlay-pane{
+  z-index: 400;
+}
 
-.leaflet-vml-shape{
-  width: 1px;
-  height: 1px;
+.leaflet-shadow-pane{
+  z-index: 500;
 }
 
-.lvml{
-  behavior: url(#default#VML);
-  display: inline-block;
-  position: absolute;
+.leaflet-marker-pane{
+  z-index: 600;
+}
+
+.leaflet-tooltip-pane{
+  z-index: 650;
+}
+
+.leaflet-popup-pane{
+  z-index: 700;
+}
+
+.leaflet-map-pane canvas{
+  z-index: 100;
+}
+
+.leaflet-map-pane svg{
+  z-index: 200;
 }
 
 /* control positioning */
@@ -122,7 +151,6 @@
 .leaflet-control{
   position: relative;
   z-index: 800;
-  pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
   pointer-events: auto;
 }
 
@@ -176,15 +204,8 @@
 
 /* zoom and fade animations */
 
-.leaflet-fade-anim .leaflet-tile{
-  will-change: opacity;
-}
-
 .leaflet-fade-anim .leaflet-popup{
   opacity: 0;
-  -webkit-transition: opacity .2s linear;
-  -moz-transition: opacity .2s linear;
-  -o-transition: opacity .2s linear;
   transition: opacity .2s linear;
 }
 
@@ -193,8 +214,6 @@
 }
 
 .leaflet-zoom-animated{
-  -webkit-transform-origin: 0 0;
-  -ms-transform-origin: 0 0;
   transform-origin: 0 0;
 }
 
@@ -203,17 +222,11 @@
 }
 
 .leaflet-zoom-anim .leaflet-zoom-animated{
-  -webkit-transition: -webkit-transform .25s cubic-bezier(0, 0, .25, 1);
-  -moz-transition: -moz-transform .25s cubic-bezier(0, 0, .25, 1);
-  -o-transition: -o-transform .25s cubic-bezier(0, 0, .25, 1);
   transition: transform .25s cubic-bezier(0, 0, .25, 1);
 }
 
 .leaflet-zoom-anim .leaflet-tile,
 .leaflet-pan-anim .leaflet-tile{
-  -webkit-transition: none;
-  -moz-transition: none;
-  -o-transition: none;
   transition: none;
 }
 
@@ -228,8 +241,7 @@
 }
 
 .leaflet-grab{
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
+  cursor: grab;
 }
 
 .leaflet-crosshair,
@@ -245,9 +257,7 @@
 .leaflet-dragging .leaflet-grab,
 .leaflet-dragging .leaflet-grab .leaflet-interactive,
 .leaflet-dragging .leaflet-marker-draggable{
-  cursor: move;
-  cursor: -webkit-grabbing;
-  cursor: -moz-grabbing;
+  cursor: grabbing;
 }
 
 /* marker & overlays interactivity */
@@ -262,7 +272,6 @@
 .leaflet-marker-icon.leaflet-interactive,
 .leaflet-image-layer.leaflet-interactive,
 .leaflet-pane > svg path.leaflet-interactive{
-  pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
   pointer-events: auto;
 }
 
@@ -277,10 +286,6 @@
   color: #0078a8;
 }
 
-.leaflet-container a.leaflet-active{
-  outline: 2px solid orange;
-}
-
 .leaflet-zoom-box{
   border: 2px dotted #38f;
   background: rgba(255, 255, 255, .5);
@@ -288,7 +293,10 @@
 
 /* general typography */
 .leaflet-container{
-  font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  font-size: .75rem;
+  line-height: 1.5;
 }
 
 /* general toolbar styles */
@@ -318,7 +326,8 @@
   display: block;
 }
 
-.leaflet-bar a:hover{
+.leaflet-bar a:hover,
+.leaflet-bar a:focus{
   background-color: #f4f4f4;
 }
 
@@ -345,24 +354,27 @@
   line-height: 30px;
 }
 
+.leaflet-touch .leaflet-bar a:first-child{
+  border-top-left-radius: 2px;
+  border-top-right-radius: 2px;
+}
+
+.leaflet-touch .leaflet-bar a:last-child{
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
 /* zoom control */
 
 .leaflet-control-zoom-in,
 .leaflet-control-zoom-out{
-  font: bold 18px 'Lucida Console', Monaco, monospace;
+  font: bold 18px "Lucida Console", Monaco, monospace;
   text-indent: 1px;
 }
 
-.leaflet-control-zoom-out{
-  font-size: 20px;
-}
-
-.leaflet-touch .leaflet-control-zoom-in{
-  font-size: 22px;
-}
-
+.leaflet-touch .leaflet-control-zoom-in,
 .leaflet-touch .leaflet-control-zoom-out{
-  font-size: 24px;
+  font-size: 22px;
 }
 
 /* layers control */
@@ -399,6 +411,12 @@
   position: relative;
 }
 
+.leaflet-control-layers-list{
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
 .leaflet-control-layers-expanded{
   padding: 6px 10px 6px 6px;
   color: #333;
@@ -406,7 +424,7 @@
 }
 
 .leaflet-control-layers-scrollbar{
-  overflow-y: scroll;
+  overflow: hidden scroll;
   padding-right: 5px;
 }
 
@@ -418,6 +436,8 @@
 
 .leaflet-control-layers label{
   display: block;
+  font-size: 13px;
+  font-size: 1.08333em;
 }
 
 .leaflet-control-layers-separator{
@@ -443,19 +463,24 @@
 .leaflet-control-scale-line{
   padding: 0 5px;
   color: #333;
+  line-height: 1.4;
 }
 
 .leaflet-control-attribution a{
   text-decoration: none;
 }
 
-.leaflet-control-attribution a:hover{
+.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:focus{
   text-decoration: underline;
 }
 
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale{
-  font-size: 11px;
+.leaflet-attribution-flag{
+  display: inline !important;
+  vertical-align: baseline !important;
+  width: 1em;
+  height: .6669em;
+  margin-right: .277em;
 }
 
 .leaflet-left .leaflet-control-scale{
@@ -471,13 +496,10 @@
   border-top: none;
   line-height: 1.1;
   padding: 2px 5px 1px;
-  font-size: 11px;
   white-space: nowrap;
-  overflow: hidden;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
-  background: #fff;
   background: rgba(255, 255, 255, .5);
+  text-shadow: 1px 1px #fff;
 }
 
 .leaflet-control-scale-line:not(:first-child){
@@ -517,8 +539,11 @@
 }
 
 .leaflet-popup-content{
-  margin: 13px 19px;
-  line-height: 1.4;
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  font-size: 1.08333em;
+  min-height: 1px;
 }
 
 .leaflet-popup-content p{
@@ -530,6 +555,7 @@
   height: 20px;
   position: absolute;
   left: 50%;
+  margin-top: -1px;
   margin-left: -20px;
   overflow: hidden;
   pointer-events: none;
@@ -540,10 +566,7 @@
   height: 17px;
   padding: 1px;
   margin: -10px auto 0;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
+  pointer-events: auto;
   transform: rotate(45deg);
 }
 
@@ -558,48 +581,23 @@
   position: absolute;
   top: 0;
   right: 0;
-  padding: 4px 4px 0 0;
   border: none;
   text-align: center;
-  width: 18px;
-  height: 14px;
+  width: 24px;
+  height: 24px;
   font: 16px/14px Tahoma, Verdana, sans-serif;
-  color: #c3c3c3;
+  color: #757575;
   text-decoration: none;
-  font-weight: bold;
   background: transparent;
 }
 
-.leaflet-container a.leaflet-popup-close-button:hover{
-  color: #999;
+.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:focus{
+  color: #585858;
 }
 
 .leaflet-popup-scrolled{
   overflow: auto;
-  border-bottom: 1px solid #ddd;
-  border-top: 1px solid #ddd;
-}
-
-.leaflet-oldie .leaflet-popup-content-wrapper{
-  zoom: 1;
-}
-
-.leaflet-oldie .leaflet-popup-tip{
-  width: 24px;
-  margin: 0 auto;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-  filter: progid:dximagetransform.microsoft.matrix(M11=.70710678, M12=.70710678, M21=-.70710678, M22=.70710678);
-}
-
-.leaflet-oldie .leaflet-popup-tip-container{
-  margin-top: -1px;
-}
-
-.leaflet-oldie .leaflet-control-zoom,
-.leaflet-oldie .leaflet-control-layers,
-.leaflet-oldie .leaflet-popup-content-wrapper,
-.leaflet-oldie .leaflet-popup-tip{
-  border: 1px solid #999;
 }
 
 /* div icon */
@@ -620,15 +618,12 @@
   border-radius: 3px;
   color: #222;
   white-space: nowrap;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   pointer-events: none;
   box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
 }
 
-.leaflet-tooltip.leaflet-clickable{
+.leaflet-tooltip.leaflet-interactive{
   cursor: pointer;
   pointer-events: auto;
 }
@@ -698,3 +693,12 @@
   margin-left: -12px;
   border-right-color: #fff;
 }
+
+/* Printing */
+
+@media print{
+  /* Prevent printers from removing background-images of controls. */
+  .leaflet-control{
+    -webkit-print-color-adjust: exact;
+  }
+}