decidim-core 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5b30446f8e883cb4610be652a64155471870ba9271583ce5b7061105f8d0c68
-  data.tar.gz: 300643e7aaf06cde799abae047625d5e73217f9669addea64be65b81ca56a194
+  metadata.gz: 524ec4d380f620c07119a6ccbee1b28408f6072799aa32cd74a1836f1ede5070
+  data.tar.gz: 4e1b60ce9a2cb9e340b0db3a22f66b326ade8f05cb8551352b39fe4198a06bbb
 SHA512:
-  metadata.gz: 9bf0e3704aecce6bbf26a5603990f07a2d05b44f1d06cec5f8804b563a71e322cd225ebdaf5b487f001eaa485173b09c07643495e3d58b374ad03e59b0505f8c
-  data.tar.gz: f24a8579f4ce4916b9786c4775cb3e865de4da331860a9105768163d868b0b8fc7191d738c23d9c0e8942a924d2c8c681c2f6db8b09aae6942d233e711d38f3e
+  metadata.gz: c8ff8135707ab3ae9aa1d483cd41d104385c079e8dcbd575c3c618ae05c524c345b340bd4b82c47eccf533dc98e187985ba76ddb2293332977449ed8af95b4b3
+  data.tar.gz: 9188473aa2d7c440f2aa773e9e08824b2c847f8a29a6d1d1ff75900e9a2fd325f860d80d8faad5d2498dc594f20b92ad9e8f7e6b98551ba9f68ffe24a879dcc1

data/app/cells/decidim/activity_cell.rb

@@ -39,9 +39,9 @@ module Decidim
 
       case resource_title
       when String
-        resource_title
+        decidim_html_escape(resource_title)
       when Hash
-        translated_attribute(resource_title)
+        decidim_escape_translated(resource_title)
       end
     end
 

data/app/cells/decidim/address/online.erb

@@ -1,9 +1,27 @@
-<div class="address__container">
-  <%= icon "map-pin-line" %>
-  <div class="address">
-    <div class="address__location"><%= t(model.type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values") %></div>
-    <a href="<%= model.online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
-      <%= model.online_meeting_url %>
-    </a>
-  </div>
-</div>
+<ul>
+  <li class="mb-4">
+    <div class="address__container">
+      <%= icon "map-pin-line" %>
+      <div class="address">
+        <div class="address__location"><%= t(model.type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values") %></div>
+        <% if display_online_meeting_url? %>
+          <a href="<%= model.online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
+            <%= model.online_meeting_url %>
+          <% end %>
+          </a>
+      </div>
+    </div>
+  </li>
+  <% if display_start_and_end_time? %>
+    <li>
+      <div class="address__container">
+        <%= icon "time-line" %>
+        <div class="address">
+          <div class="address__location">
+            <%= start_and_end_time %>
+          </div>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>

data/app/cells/decidim/address/show.erb

@@ -1,14 +1,29 @@
-<div class="address__container">
-  <%= icon "map-pin-line" %>
-  <div class="address">
-    <% if has_location? %>
-      <div class="address__location"><%= location %></div>
-    <% end %>
+<ul>
+  <li class="mb-4">
+    <div class="address__container">
+      <%= icon "map-pin-line" %>
+      <div class="address">
+        <% if has_location? %>
+          <div class="address__location"><%= location %></div>
+        <% end %>
 
-    <div class="address__address"><%= address %></div>
+        <div class="address__address"><%= address %></div>
 
-    <% if has_location_hints? %>
-      <div class="address__hints"><%= location_hints %></div>
-    <% end %>
-  </div>
-</div>
+        <% if has_location_hints? %>
+          <div class="address__hints"><%= location_hints %></div>
+        <% end %>
+      </div>
+    </div>
+  </li>
+  <% if display_start_and_end_time? %>
+    <li>
+      <div class="address__container">
+        <%= icon "time-line" %>
+        <div class="address">
+          <div class="address__location">
+            <%= start_and_end_time %>
+          </div>
+        </div>
+    </li>
+  <% end %>
+</ul>

data/app/cells/decidim/address_cell.rb

@@ -32,5 +32,34 @@ module Decidim
     def address
       decidim_sanitize(translated_attribute(model.address))
     end
+
+    def display_start_and_end_time?
+      model.respond_to?(:start_time) && model.respond_to?(:end_time)
+    end
+
+    def start_and_end_time
+      <<~HTML
+        #{with_tooltip(l(model.start_time, format: :tooltip)) { start_time }}
+        -
+        #{with_tooltip(l(model.end_time, format: :tooltip)) { end_time }}
+      HTML
+    end
+
+    def display_online_meeting_url?
+      return true unless model.respond_to?(:online?)
+      return true unless model.respond_to?(:iframe_access_level_allowed_for_user?)
+
+      model.online? && model.iframe_access_level_allowed_for_user?(current_user)
+    end
+
+    private
+
+    def start_time
+      l model.start_time, format: "%H:%M %p"
+    end
+
+    def end_time
+      l model.end_time, format: "%H:%M %p %Z"
+    end
   end
 end

data/app/cells/decidim/announcement/show.erb

@@ -5,7 +5,7 @@
     </div>
   <% end %>
 
-  <span class="flash__message">
+  <div class="flash__message">
     <%= text %>
-  </span>
+  </div>
 <% end %>

data/app/cells/decidim/author/show.erb

@@ -1,16 +1,16 @@
 <% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<div class="author" data-author>
-  <%= content_tag :div, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+<span class="author" data-author>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
-      <div>
+      <span>
         <%= render :name %>
 
         <% context_actions.each do |action| %>
           <%= render action %>
         <% end %>
-      </div>
+      </span>
     <% elsif layout == :avatar %>
       <%= render :avatar %>
     <% else %>
@@ -24,4 +24,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-</div>
+</span>

data/app/cells/decidim/authorization_modal/show.erb

@@ -1,6 +1,10 @@
-<div data-dialog-container>
-  <%= icon "lock-line" %>
-  <h2 id="dialog-title-authorizationModal" tabindex="-1" data-dialog-title><%= title %></h2>
+<% add_decidim_page_title(title) %>
+
+<main data-dialog-container class="text-center mt-8">
+  <div class="flex justify-center">
+    <%= icon "lock-line", class: "w-20 h-20" %>
+  </div>
+  <h1 tabindex="-1" class="h1" data-dialog-title><%= title %></h1>
   <div>
     <div class="authorization-modal__verification-container">
       <% verifications.each do |verification| %>
@@ -25,4 +29,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</main>

data/app/cells/decidim/authorization_modal_cell.rb

@@ -3,6 +3,7 @@
 module Decidim
   class AuthorizationModalCell < Decidim::ViewModel
     include LayoutHelper
+    include Decidim::MetaTagsHelper
 
     delegate :authorize_action_path, to: :controller
 

data/app/cells/decidim/card/show.erb

@@ -1,5 +1,5 @@
 <div class="py-4 space-y-2">
-  <a href="" class="text-lg text-secondary font-semibold hover:underline"><%= title %></a>
+  <a href="" class="text-lg text-secondary font-semibold hover:underline"><%= decidim_html_escape(title) %></a>
   <div class="flex items-center divide-x divide-gray-3">
    <% metadata.first(4).each do |item| %>
     <div class="flex items-center gap-1 px-4 lg:px-6 first:pl-0 last:pr-0 max-w-xs">

data/app/cells/decidim/card_metadata/show.erb

@@ -3,12 +3,12 @@
     <% hook_output = render_hook(item[:hook]) %>
     <% next if hook_output.blank? %>
 
-    <%= content_tag :span, data: item[:data_attributes] do %>
+    <%= content_tag :div, data: item[:data_attributes] do %>
       <%= icon item[:icon] if item[:icon].present? %>
       <%= hook_output %>
     <% end %>
   <% else %>
-    <%= content_tag :span, data: item[:data_attributes] do %>
+    <%= content_tag :div, data: item[:data_attributes] do %>
       <%= icon item[:icon] if item[:icon].present? %>
       <% if item[:text].present? %>
         <%= link_to_if enable_links? && item.has_key?(:url), item[:text], item[:url] %>

data/app/cells/decidim/card_metadata_cell.rb

@@ -75,7 +75,7 @@ module Decidim
 
       {
         cell: "decidim/coauthorships",
-        args: [resource, { stack: true }]
+        args: [resource, { stack: true, context_actions: [] }]
       }
     end
 
@@ -105,11 +105,11 @@ module Decidim
       }
     end
 
-    def duration_item
+    def start_date_item
       return if dates_blank?
 
       {
-        text: distance_of_time_in_words(start_date, end_date, scope: "datetime.distance_in_words.short"),
+        text: I18n.l(start_date, format: "%H:%M %p %Z"),
         icon: "time-line"
       }
     end

data/app/cells/decidim/coauthorships_cell.rb

@@ -16,7 +16,7 @@ module Decidim
         cell(
           "decidim/collapsible_authors",
           presenters_for_identities(model),
-          options
+          options.merge(from: model)
         )
       end
     end

data/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity_cell.rb

@@ -5,6 +5,12 @@ module Decidim
     # A cell to be rendered as a content block with the latest activities performed
     # in a Decidim Organization.
     class MenuBreadcrumbLastActivityCell < LastActivityCell
+      def show
+        return if current_user.blank? && current_organization&.force_users_to_authenticate_before_access_organization
+
+        super
+      end
+
       private
 
       def activities

data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb

@@ -7,19 +7,35 @@ module Decidim
       include Decidim::TranslationsHelper
       include Decidim::TwitterSearchHelper
 
-      attr_reader :cta_text, :cta_path
+      delegate :title, :hashtag, :attached_uploader, to: :resource
 
-      delegate :title, :subtitle, :attached_uploader, :hashtag, to: :resource
+      def cta_text
+        return unless model
+
+        @cta_text ||= translated_attribute(model.settings.button_text).presence
+      end
+
+      def cta_path
+        return unless model
+
+        @cta_path ||= translated_attribute(model.settings.button_url).presence
+      end
 
       def title_text
-        translated_attribute(title)
+        decidim_escape_translated(title)
       end
 
       def subtitle_text
-        translated_attribute(subtitle)
+        return unless resource.respond_to?(:subtitle)
+
+        decidim_escape_translated(resource.subtitle)
       end
 
+      # If it is called from the landing page content block, use the background image defined there
+      # Else, use the banner image defined in the space (for assemblies)
       def image_path
+        return model.images_container.attached_uploader(:background_image).path if model.respond_to?(:images_container)
+
         attached_uploader(:banner_image).path
       end
 

data/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb

@@ -0,0 +1,8 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :text_field, :button_text, label: t("decidim.content_blocks.cta_settings_form.button_text") %>
+  <%= settings_fields.translated :text_field, :button_url, label: t("decidim.content_blocks.cta_settings_form.button_url") %>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image") %>
+<% end %>

data/app/cells/decidim/content_blocks/participatory_space_hero_settings_form_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class ParticipatorySpaceHeroSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/participatory_space_metadata_cell.rb

@@ -11,7 +11,7 @@ module Decidim
 
       def metadata_valued_items
         metadata_items.filter_map do |item|
-          next if (value = translated_attribute(presented_space.send(item))).blank?
+          next if (value = decidim_escape_translated(presented_space.send(item))).blank?
 
           {
             title: t(item, scope: translations_scope),

data/app/cells/decidim/data_consent/category.erb

@@ -2,7 +2,7 @@
   <div class="cookies__category-trigger">
     <label for="dc-<%= category[:slug] %>" class="cookies__category-toggle">
       <input
-        <%= %(checked="checked") if category[:mandatory] %>
+        <%== %(checked="checked") if category[:mandatory] %>
         id="dc-<%= category[:slug] %>"
         type="checkbox"
         name="<%= category[:slug] %>"

data/app/cells/decidim/footer_pages_cell.rb

@@ -42,7 +42,7 @@ module Decidim
         .static_pages_accessible_for(current_user)
         .where(show_in_footer: true, topic_id: nil)
         .where.not(slug: "terms-and-conditions").map do |page|
-        { title: translated_attribute(page.title), path: decidim.page_path(page) }
+        { title: decidim_escape_translated(page.title), path: decidim.page_path(page) }
       end
     end
 
@@ -51,9 +51,9 @@ module Decidim
         next if (topic_pages = topic.accessible_pages_for(current_user).where(show_in_footer: true)).blank?
 
         {
-          title: translated_attribute(topic.title),
+          title: decidim_escape_translated(topic.title),
           pages: topic_pages.map do |page|
-            { title: translated_attribute(page.title), path: decidim.page_path(page) }
+            { title: decidim_escape_translated(page.title), path: decidim.page_path(page) }
           end
         }
       end.compact

data/app/cells/decidim/nav_links/show.erb

@@ -1,10 +1,10 @@
 <div class="participatory-space__nav-container">
-  <button id="dropdown-trigger-participatory-space" data-component="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
+  <button id="dropdown-trigger-participatory-space" data-component="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-scroll-to-menu="true">
     <span><%= t("decidim.searches.filters.jump_to") %></span>
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav">
+  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav" aria-hidden="true">
     <% model.each do |item| %>
       <li>
         <%= link_to item[:url], class: "participatory-space__nav-item" do %>

data/app/cells/decidim/notification/moderated.erb

@@ -0,0 +1,12 @@
+<div class="notification" data-notification>
+  <div class="notification__wrapper">
+    <div class="notification__time" title="<%= l(notification.created_at) %>"> <%= notification.created_at_in_words %></div>
+    <div class="notification__snippet">
+      <span class="notification__snippet-title text-gray"><%= t("decidim.notifications.show.moderated") %></span>
+    </div>
+  </div>
+  <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>
+    <span class="sr-only md:not-sr-only"><%= t("mark_as_read", scope: "layouts.decidim.notifications_dashboard") %></span>
+    <%= icon "check-line", class: "fill-current" %>
+  <% end %>
+</div>

data/app/cells/decidim/notification_cell.rb

@@ -9,7 +9,11 @@ module Decidim
     include Decidim::SanitizeHelper
 
     def show
-      render :show
+      if notification.event_class_instance.try(:hidden_resource?)
+        render :moderated
+      else
+        render :show
+      end
     end
 
     def notification_title

data/app/cells/decidim/profile/details.erb

@@ -9,7 +9,7 @@
         <%= icon detail[:icon] %>
         <span>
           <% if detail[:url].present? %>
-            <%= link_to(detail[:url], detail[:text]) %>
+            <%= link_to(detail[:url], detail[:text], rel: "nofollow noopener noreferrer") %>
           <% else %>
             <%= detail[:text] %>
           <% end %>

data/app/cells/decidim/profile/tabs.erb

@@ -1,6 +1,7 @@
 <% tab_items.each do |tab_item| %>
-  <li class="profile__tab<%= " is-active" if is_active_link?(tab_item[:path]) %>">
-    <%= link_to tab_item[:path], title: tab_item[:text], class: "profile__tab-item" do %>
+  <% active_link = is_active_link?(tab_item[:path]) %>
+  <li class="profile__tab<%= " is-active" if active_link %>">
+    <%= link_to tab_item[:path], title: tab_item[:text], class: "profile__tab-item", aria: { current: active_link ? "page" : nil } do %>
       <%= icon tab_item[:icon] %>
       <span><%= tab_item[:text] %></span>
       <% if tab_item[:count].present? %>

data/app/cells/decidim/progress_bar/show.erb

@@ -7,7 +7,7 @@
   <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
 
   <% if total != 0 %>
-    <div class="progress-bar" role="progressbar" tabindex="0" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> %" aria-valuemax="<%= total %>">
+    <div class="progress-bar" role="progressbar" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= number_with_precision(percentage, separator: ".", precision: 2) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(percentage, precision: 2) %>">
       <div style="width: <%= percentage %>%"></div>
     </div>
   <% end %>

data/app/cells/decidim/progress_bar_cell.rb

@@ -29,6 +29,8 @@ module Decidim
   #      total: 10,
   #    )
   class ProgressBarCell < Decidim::ViewModel
+    include ActionView::Helpers::NumberHelper
+
     private
 
     def element_id

data/app/cells/decidim/report_button/flag_modal.erb

@@ -34,11 +34,15 @@
               <%= f.check_box :hide,
                               label: t("decidim.shared.flag_modal.hide_content"),
                               include_hidden: false,
+                              id: hide_checkbox_id,
                               data: {
                                 label_action: t("decidim.shared.flag_modal.hide"),
                                 label_report: t("decidim.shared.flag_modal.report"),
                                 hide: "true"
-                              }, id: hide_checkbox_id %>
+                              },
+                              label_options: {
+                                for: hide_checkbox_id
+                              } %>
             <% end %>
           <% end %>
 

data/app/cells/decidim/resource_types_filter/show.erb

@@ -1,5 +1,5 @@
 <div id="<%= id %>" class="filter-container">
-  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true" data-disabled-md="true">
+  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true">
     <% resource_types.each do |resource_type| %>
       <span data-value="<%= resource_type[0] %>" class="<%= "is-active" if filter_param == resource_type[0] %>">
         <%= text_with_resource_icon(*resource_type) %>
@@ -8,7 +8,7 @@
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <%= filter_form_for filter, form_path, class: "new_filter", id: "dropdown-menu-resource" do |form| %>
+  <%= filter_form_for filter, form_path, :class => "new_filter", :id => "dropdown-menu-resource", "aria-hidden" => true do |form| %>
     <%= form.collection_radio_buttons(
           filter_param_key,
           resource_types,
@@ -16,7 +16,7 @@
           :last,
           { checked: filter_param }
         ) do |builder|
-            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:div, text_with_resource_icon(builder.value, builder.text), class: "filter") }
+            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:span, text_with_resource_icon(builder.value, builder.text), class: "filter") }
       end %>
   <% end %>
 </div>

data/app/cells/decidim/statistic/show.erb

@@ -1,7 +1,7 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
-  <h3 class="statistic__title" title="<%= stat_title %>">
+  <span class="statistic__title" title="<%= stat_title %>">
     <%= stat_title %>
-  </h3>
+  </span>
   <span class="statistic__number">
     <%= stat_number %>
   </span>

data/app/cells/decidim/tags_cell.rb

@@ -9,6 +9,8 @@ module Decidim
   #   <%= cell("decidim/category", model.category, context: {resource: model}) %>
   #
   class TagsCell < Decidim::ViewModel
+    include Decidim::SanitizeHelper
+
     def show
       render if category? || scope?
     end
@@ -69,7 +71,7 @@ module Decidim
     end
 
     def category_name
-      model.category.translated_name
+      decidim_html_escape model.category.translated_name
     end
 
     def category_path

data/app/cells/decidim/upload_modal/modal.erb

@@ -60,8 +60,7 @@
     <%= t("decidim.shared.confirm_modal.cancel") %>
   </button>
   <button type="button" class="button button__sm md:button__lg button__secondary" data-dropzone-save data-dialog-close="<%= modal_id %>" disabled>
-    <%= t("next", scope: "decidim.messaging.conversations.index") %>
-    <%= icon "arrow-right-line", class: "fill-current" %>
+    <%= t("save", scope: "decidim.forms.upload.labels") %>
   </button>
 </div>
 <% end %>

data/app/commands/decidim/create_omniauth_registration.rb

@@ -57,13 +57,11 @@ module Decidim
         # to be marked confirmed.
         @user.skip_confirmation! if !@user.confirmed? && @user.email == verified_email
       else
-        generated_password = SecureRandom.hex
-
         @user.email = (verified_email || form.email)
         @user.name = form.name
         @user.nickname = form.normalized_nickname
         @user.newsletter_notifications_at = nil
-        @user.password = generated_password
+        @user.password = SecureRandom.hex
         if form.avatar_url.present?
           url = URI.parse(form.avatar_url)
           filename = File.basename(url.path)

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

@@ -54,11 +54,13 @@ module Decidim
               notify(manager) do
                 ConversationMailer.new_group_message(sender, manager, conversation, message, recipient).deliver_later
               end
+              Decidim::PushNotificationMessageSender.new.new_group_message(sender, manager, conversation, message, recipient).deliver
             end
           else
             notify(recipient) do
               ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later
             end
+            Decidim::PushNotificationMessageSender.new.new_message(sender, recipient, conversation, message).deliver
           end
         end
       end
@@ -68,6 +70,7 @@ module Decidim
           notify(recipient) do
             ConversationMailer.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver_later
           end
+          Decidim::PushNotificationMessageSender.new.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver
         end
       end
 

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

@@ -54,11 +54,13 @@ module Decidim
               notify(manager) do
                 ConversationMailer.new_group_conversation(originator, manager, conversation, recipient).deliver_later
               end
+              Decidim::PushNotificationMessageSender.new.new_group_conversation(originator, manager, conversation, recipient).deliver
             end
           else
             notify(recipient) do
               ConversationMailer.new_conversation(originator, recipient, conversation).deliver_later
             end
+            Decidim::PushNotificationMessageSender.new.new_conversation(originator, recipient, conversation).deliver
           end
         end
       end
@@ -68,6 +70,7 @@ module Decidim
           notify(recipient) do
             ConversationMailer.comanagers_new_conversation(originator, recipient, conversation, form.context.current_user).deliver_later
           end
+          Decidim::PushNotificationMessageSender.new.comanagers_new_conversation(originator, recipient, conversation, form.context.current_user).deliver
         end
       end