decidim-core 0.29.1 → 0.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a3dc5c9feb9a081fb911d75e25eba2847b1d159837b23853140d96f3c6754b
-  data.tar.gz: 18e41bc984ad456282a1b0c9d3ec3fef7fc89376b330b79198fe3e650cee1301
+  metadata.gz: 28b3c4ae291bd29e865f8c3d4b18ac88f4e1e28e5f40b658b650c8fbff2773be
+  data.tar.gz: 4e3784db851ce1e0b3c857aba4bfbc4afae28f9b4c0567d071dfaa5bd37aa3eb
 SHA512:
-  metadata.gz: 1c3e01dc59cb7b999828421bfad4e0bdbbddc813200b4b99de17bd89c4b6a664ad0f98af080ec0f84bcd335b89f99fa871c851d56429ee998979ad68bbec4c3c
-  data.tar.gz: 593fff36a401ad9116314865972323861374a70b53883c5c7421f902899d3ea0b934f64aaec1f2c9ed8879440fd647344e60a67beab12e76924851f7b377e788
+  metadata.gz: fa92b90aaaee207b64a405dabfc14217e5e10138de033c3a06fcd5261209840a34b28a41efa8139c9c83dea1f0b7bf4ade861058855f575505feb1f3740b2da1
+  data.tar.gz: d2714c0d00b670dc1e7245088175d6a8b1d84f1f34d30234cb55a5834940f53ca14c5c170ae913732d5ee6d6c8de8024c3e5c16e5e1697f8a2c3b3e0f8ee7999

data/app/cells/decidim/activity_cell.rb

@@ -105,9 +105,6 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version if model.respond_to?(:cache_key_with_version)
-      if (author_cell = author)
-        hash.push(Digest::MD5.hexdigest(author_cell.send(:cache_hash)))
-      end
 
       hash.join(Decidim.cache_key_separator)
     end

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

@@ -1,6 +1,7 @@
-<% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<span class="author" data-author>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
+<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
+<%= content_tag(:span, class: :author, data: ) do %>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
@@ -24,4 +25,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-</span>
+<% end %>

data/app/cells/decidim/author_cell.rb

@@ -47,8 +47,26 @@ module Decidim
       @context_actions_options ||= options[:context_actions].map(&:to_sym)
     end
 
+    def profile_minicard
+      render
+    end
+
     private
 
+    # If the options hash has the demo key it means we are in the decidim-design engine,
+    # so it is not a real-world scenario with actual users
+    def data
+      @data ||= begin
+        internal_data = { author: true }
+        if has_tooltip? && !options.has_key?(:demo)
+          internal_data["remote_tooltip"] = true
+          internal_data["tooltip-url"] = decidim.profile_tooltip_path(raw_model.nickname)
+        end
+
+        internal_data
+      end
+    end
+
     def layout
       @layout ||= LAYOUTS.include?(options[:layout]) ? options[:layout] : :default
     end
@@ -160,5 +178,13 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
+
+    def has_tooltip?
+      return false if model.deleted?
+      return false if model.respond_to?(:blocked?) && model.blocked?
+      return true if options.has_key?(:tooltip)
+
+      model.has_tooltip?
+    end
   end
 end

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

@@ -1,10 +1,12 @@
-<%= link_to resource_path, class: "card__search", id: dom_id(resource) do %>
+<%= content_tag :div, id: dom_id(resource), class: "card__search" do %>
   <%= content_tag title_tag, class: "h4 card__search-title" do %>
-    <%= title %>
+    <%= link_to resource_path, class: "card__search" do %>
+      <%= title %>
+    <% end %>
   <% end %>
   <% if metadata_cell.present? %>
     <div class="card__search-metadata">
-      <%= cell metadata_cell, resource, links: false %>
+     <%= cell metadata_cell, resource, links: false %>
     </div>
   <% end %>
 <% end %>

data/app/cells/decidim/diff_cell.rb

@@ -70,6 +70,10 @@ module Decidim
 
     # DiffRenderer class for the current_version's item; falls back to `BaseDiffRenderer`.
     def diff_renderer_class
+      renderer_class = "#{current_version.item_type}DiffRenderer".safe_constantize
+
+      return renderer_class if renderer_class
+
       if current_version.item_type.deconstantize == "Decidim"
         "#{current_version.item_type.pluralize}::DiffRenderer".constantize
       else

data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb

@@ -50,7 +50,7 @@ module Decidim
       end
 
       def main_image_url
-        newsletter.template.images_container.attached_uploader(:main_image).url(host: organization.host)
+        newsletter.template.images_container.attached_uploader(:main_image).url
       end
 
       def organization_primary_color

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

@@ -3,7 +3,9 @@
     <%= render :metadata %>
     <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
   </div>
-  <ul class="menu-bar__secondary-dropdown__menu">
-    <%= render :links %>
-  </ul>
+  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
+    <ul class="menu-bar__secondary-dropdown__menu">
+      <%= render :links %>
+    </ul>
+  </nav>
 </div>

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

@@ -7,6 +7,6 @@
   <%= cell("decidim/follow_button", profile_holder) %>
 
   <% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-    <%= cell("decidim/report_button", profile_holder) %>
+    <%= cell("decidim/report_user_button", profile_holder) %>
   <% end %>
 </div>

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

@@ -1,10 +1,10 @@
 <%= decidim_modal id: modal_id, class: "flag-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 id="dialog-title-flagModal" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
-        <p id="dialog-desc-flagModal" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
+        <p class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
       </div>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
   <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>
@@ -18,32 +18,18 @@
           <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
 
           <% if frontend_administrable? %>
-            <% if user_reportable? %>
-              <% if current_user&.admin? %>
-                <%= f.check_box :block,
-                                label: t("decidim.shared.flag_user_modal.block"),
-                                include_hidden: false,
-                                data: {
-                                  label_action: t("decidim.shared.flag_user_modal.block"),
-                                  label_report: t("decidim.shared.flag_user_modal.report"),
-                                  block: "true"
-                                } %>
-                <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { class: :invisible, id: "block_and_hide" } %>
-              <% end %>
-            <% else %>
-              <%= 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"
-                              },
-                              label_options: {
-                                for: hide_checkbox_id
-                              } %>
-            <% end %>
+            <%= 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"
+                            },
+                            label_options: {
+                              for: hide_checkbox_id
+                            } %>
           <% end %>
 
         </div>

data/app/cells/decidim/report_button_cell.rb

@@ -11,8 +11,6 @@ module Decidim
     end
 
     def frontend_administrable?
-      return true if user_reportable? && current_user&.admin?
-
       user_entity? &&
         model.can_be_administered_by?(current_user) &&
         (model.respond_to?(:official?) && !model.official?)
@@ -47,16 +45,12 @@ module Decidim
       options[:modal_id] || "flagModal"
     end
 
-    def user_reportable?
-      model.is_a?(Decidim::UserReportable)
-    end
-
     def report_form
-      @report_form ||= user_reportable? ? Decidim::ReportForm.from_params(reason: "spam") : Decidim::ReportForm.new(reason: "spam")
+      @report_form ||= Decidim::ReportForm.new(reason: "spam")
     end
 
     def report_path
-      @report_path ||= user_reportable? ? decidim.report_user_path(sgid: model.to_sgid.to_s) : decidim.report_path(sgid: model.to_sgid.to_s)
+      @report_path ||= decidim.report_path(sgid: model.to_sgid.to_s)
     end
 
     def builder

data/app/cells/decidim/report_user_button/already_reported_modal.erb

@@ -0,0 +1,11 @@
+<%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
+  <div data-dialog-container>
+    <%= icon "flag-line" %>
+    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+    <div>
+      <div class="form__wrapper flag-modal__form">
+        <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.already_reported") %></p>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,46 @@
+<%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
+  <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
+    <div data-dialog-container>
+      <%= icon "flag-line" %>
+      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+      <div>
+        <div class="form__wrapper flag-modal__form">
+          <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.description") %></p>
+          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
+          <%= f.collection_radio_buttons :reason, [
+            [:spam, t("decidim.shared.flag_user_modal.spam")],
+            [:offensive, t("decidim.shared.flag_user_modal.offensive")],
+            [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization_name)]
+          ], :first, :last do |builder|
+            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
+          end %>
+
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+
+          <% if frontend_administrable? %>
+            <%= f.check_box :block,
+                            label: t("decidim.shared.flag_user_modal.block"),
+                            include_hidden: false,
+                            data: {
+                              label_action: t("decidim.shared.flag_user_modal.block"),
+                              label_report: t("decidim.shared.flag_user_modal.report"),
+                              block: "true"
+                            } %>
+            <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { class: :invisible, id: "block_and_hide" } %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div data-dialog-actions>
+      <button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="<%= modal_id %>">
+        <%= t("decidim.shared.confirm_modal.cancel") %>
+      </button>
+
+      <button type="submit" class="button button__lg button__secondary">
+        <span><%= t("decidim.shared.flag_modal.report") %></span>
+        <%= icon "arrow-right-line", class: "fill-current" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<%= render :button %>
+<%= flag_modal unless only_button? %>

data/app/cells/decidim/report_user_button_cell.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReportUserButtonCell < ButtonCell
+    include ActionView::Helpers::FormOptionsHelper
+
+    def flag_modal
+      return render :already_reported_modal if model.reported_by?(current_user)
+
+      render
+    end
+
+    private
+
+    def report_form
+      @report_form ||= Decidim::ReportForm.from_params(reason: "spam")
+    end
+
+    def report_path
+      @report_path ||= decidim.report_user_path(sgid: model.to_sgid.to_s)
+    end
+
+    def user_reportable?
+      model.is_a?(Decidim::UserReportable)
+    end
+
+    def frontend_administrable?
+      current_user&.admin?
+    end
+
+    def builder
+      Decidim::FormBuilder
+    end
+
+    def only_button?
+      options[:only_button]
+    end
+
+    def modal_id
+      options[:modal_id] || "flagUserModal"
+    end
+
+    def button_classes
+      options[:button_classes] || "button button__sm button__text button__text-secondary"
+    end
+
+    def text
+      t("decidim.shared.flag_modal.report")
+    end
+
+    def icon_name
+      "flag-line"
+    end
+
+    def html_options
+      { data: { "dialog-open": current_user ? modal_id : "loginModal" } }
+    end
+  end
+end

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

@@ -11,7 +11,7 @@
   <ul id="dropdown-menu-resource">
     <% resource_types.each do |resource_type| %>
       <li role="menuitem">
-        <%= link_to decidim.last_activities_path(filter: { with_resource_type: resource_type[0] } ), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
+        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
           <span class="sr-only"><%= resource_type[1] %></span>
           <%= text_with_resource_icon(*resource_type) %>
         <% end %>

data/app/cells/decidim/resource_types_filter_cell.rb

@@ -27,8 +27,12 @@ module Decidim
       options[:id] || "filters"
     end
 
-    def form_path
-      options[:form_path]
+    def filter_url(resource_type)
+      if options[:source] == :last_activities
+        last_activities_path(filter: { with_resource_type: resource_type })
+      else
+        profile_activity_path(nickname: params[:nickname], filter: { resource_type: })
+      end
     end
 
     def filter_param_key
@@ -39,10 +43,6 @@ module Decidim
       @filter_param ||= params.dig(:filter, filter_param_key) || all_types_key
     end
 
-    def filter
-      options[:filter]
-    end
-
     def all_resource_types_option
       [all_types_key, I18n.t("all", scope: "decidim.last_activities")]
     end

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

@@ -1,6 +1,6 @@
 <div>
-  <div class="row column">
+  <div class="pt-4 pb-4 text-center bg-background">
     <%= link %>
-    <span class="translation-button-help"><%= help_text %></span>
+    <span class="translation-button-help ml-4"><%= help_text %></span>
   </div>
 </div>

data/app/cells/decidim/translation_bar_cell.rb

@@ -32,7 +32,7 @@ module Decidim
       parsed_url.query = new_query
       url = parsed_url.to_s
 
-      link_to button_text, url, class: "button small hollow"
+      link_to button_text, url, class: "button button__sm button__transparent-secondary"
     end
 
     def button_text

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

@@ -1,5 +1,5 @@
 <div class="profile__activity">
-  <%= cell "decidim/resource_types_filter", resource_types, form_path: url_for, filter: %>
+  <%= cell "decidim/resource_types_filter", resource_types, source: :profile_activity %>
   <div class="profile__activity__container" id="activities-container">
     <% if activities.length == 0 %>
       <%= cell "decidim/announcement", t("decidim.user_activity.index.no_activities_warning") %>

data/app/commands/decidim/create_omniauth_registration.rb

@@ -45,6 +45,8 @@ module Decidim
 
     attr_reader :form, :verified_email
 
+    REGEXP_SANITIZER = /[<>?%&\^*#@()\[\]=+:;"{}\\|]/
+
     def create_or_find_user
       @user = User.find_or_initialize_by(
         email: verified_email,
@@ -63,16 +65,11 @@ module Decidim
         @user.save!
       else
         @user.email = (verified_email || form.email)
-        @user.name = form.name
+        @user.name = form.name.gsub(REGEXP_SANITIZER, "")
         @user.nickname = form.normalized_nickname
         @user.newsletter_notifications_at = nil
         @user.password = SecureRandom.hex
-        if form.avatar_url.present?
-          url = URI.parse(form.avatar_url)
-          filename = File.basename(url.path)
-          file = url.open
-          @user.avatar.attach(io: file, filename:)
-        end
+        attach_avatar(form.avatar_url) if form.avatar_url.present?
         @user.skip_confirmation! if verified_email
         @user.tos_agreement = "1"
         @user.save!
@@ -81,6 +78,15 @@ module Decidim
       end
     end
 
+    def attach_avatar(avatar_url)
+      url = URI.parse(avatar_url)
+      filename = File.basename(url.path)
+      file = url.open
+      @user.avatar.attach(io: file, filename:)
+    rescue OpenURI::HTTPError, Errno::ECONNREFUSED
+      # Do not attach the avatar, as it fails to fetch it.
+    end
+
     def create_identity
       @user.identities.create!(
         provider: form.provider,
@@ -126,7 +132,7 @@ module Decidim
         provider: form.provider,
         uid: form.uid,
         email: form.email,
-        name: form.name,
+        name: form.name.gsub(REGEXP_SANITIZER, ""),
         nickname: form.normalized_nickname,
         avatar_url: form.avatar_url,
         raw_data: form.raw_data

data/app/commands/decidim/create_report.rb

@@ -34,7 +34,7 @@ module Decidim
       send_report_notification_to_moderators
 
       if hideable?
-        hide!
+        @tool.hide!
         send_hide_notification_to_moderators
       end
 
@@ -72,11 +72,6 @@ module Decidim
       hidden_by_admin? || (!@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding)
     end
 
-    def hide!
-      @tool.hide!
-      @tool.send_notification_to_author
-    end
-
     def send_hide_notification_to_moderators
       participatory_space_moderators.each do |moderator|
         next unless moderator.email_on_moderations

data/app/commands/decidim/destroy_account.rb

@@ -37,6 +37,9 @@ module Decidim
       current_user.name = ""
       current_user.nickname = ""
       current_user.email = ""
+      current_user.personal_url = ""
+      current_user.about = ""
+      current_user.notifications_sending_frequency = "none"
       current_user.delete_reason = @form.delete_reason
       current_user.admin = false if current_user.admin?
       current_user.deleted_at = Time.current

data/app/commands/decidim/search.rb

@@ -37,6 +37,12 @@ module Decidim
                     klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
                   end
 
+        uncommentable_resources = uncommentable_resources(results) if results.present?
+        if uncommentable_resources.present?
+          results -= uncommentable_resources
+          results_count -= uncommentable_resources.count
+        end
+
         results_by_type.update(class_name => {
                                  count: results_count,
                                  results:
@@ -89,5 +95,13 @@ module Decidim
       query = query.global_search(I18n.transliterate(term)) if term.present?
       query
     end
+
+    def uncommentable_resources(results)
+      results.where(id: results.select { |obj| related_uncommentable_resources?(obj) }.map(&:id))
+    end
+
+    def related_uncommentable_resources?(object)
+      object.respond_to?(:commentable) && !object.commentable.commentable?
+    end
   end
 end

data/app/controllers/decidim/doorkeeper/credentials_controller.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def avatar_url
-        avatar_url = current_resource_owner.attached_uploader(:avatar).url(host: current_resource_owner.organization.host)
+        avatar_url = current_resource_owner.attached_uploader(:avatar).url
         return unless avatar_url
 
         unless %r{^https?://}.match? avatar_url

data/app/controllers/decidim/links_controller.rb

@@ -41,7 +41,7 @@ module Decidim
     end
 
     def escape_url(external_url)
-      before_fragment, fragment = external_url.split("#", 2)
+      before_fragment, fragment = URI.decode_www_form_component(external_url).split("#", 2)
       escaped_before_fragment = URI::Parser.new.escape(before_fragment)
 
       if fragment

data/app/controllers/decidim/profiles_controller.rb

@@ -24,7 +24,11 @@ module Decidim
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
-      redirect_to profile_activity_path(nickname: params[:nickname])
+      redirect_to profile_activity_path(nickname: params[:nickname].downcase)
+    end
+
+    def tooltip
+      render json: { data: cell("decidim/author", profile_holder.presenter).profile_minicard }
     end
 
     def following
@@ -112,7 +116,7 @@ module Decidim
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("nickname = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end

data/app/controllers/decidim/reports_controller.rb

@@ -16,7 +16,7 @@ module Decidim
       CreateReport.call(@form, reportable) do
         on(:ok) do
           flash[:notice] = I18n.t("decidim.reports.create.success")
-          redirect_back fallback_location: root_path
+          redirect_to reportable.reload.reported_content_url
         end
 
         on(:invalid) do

data/app/controllers/decidim/user_activities_controller.rb

@@ -22,7 +22,7 @@ module Decidim
     def user
       return unless params[:nickname]
 
-      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
+      @user ||= current_organization.users.find_by("nickname = ?", params[:nickname].downcase)
     end
 
     def activities

data/app/forms/decidim/account_form.rb

@@ -21,7 +21,10 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
+    validates :nickname,
+              presence: true,
+              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
+              length: { maximum: Decidim::User.nickname_max_length }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
@@ -66,7 +69,7 @@ module Decidim
 
     def unique_nickname
       return true if Decidim::UserBaseEntity.where(
-        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
+        "decidim_organization_id = ? AND nickname = ? ",
         context.current_organization.id,
         nickname.downcase
       ).where.not(id: context.current_user.id).empty?