decidim-core 0.26.0.rc1 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac5187d40c4a753efdf1ca3e005b5a0d6561fcde905fb50bbf054fac2eca159
-  data.tar.gz: 6ed72398e69f803c6ab3b328ff9b26ec217769a2878349c00fbadf76b65e120e
+  metadata.gz: 53feb2cc6c5c494c20cf8e6ae1d35cc933ddf3a91ee2704b9b2fb6436b267c87
+  data.tar.gz: 431d81f9df34a6c1f0a88a3786f138e748e4cc9b5a706707493e7735a7cf782a
 SHA512:
-  metadata.gz: 532bcf1725b00692cf50880c865cd74b5e81f13870f65db9d9b61c227fb78b997ad5b1eff984f041a900b9e117a29d3c62d72097506ddd15bd40320c7c839dc2
-  data.tar.gz: dfe236abe5ba215792e259e1e93d54a82c8ac60120b2f4af166e1e86343aefc9cf3ba7eb743987ec65b96202accd6c8cf53d8aebc0f4fd9ac3e5d028f4f12ee0
+  metadata.gz: 69ec72cc2adbd4c88933c2c21aade155b7b98dc9708c85d9f0677b32621ce205c8b247109d96c0b13d3b7e6b96214eea3ac1c03e3aedfdaae2ca0afba7de96cd
+  data.tar.gz: 92caf28a3f0ea16de36d307a4ff484478d071a5b442a6848a09741c657b1bdf86f1c53c9ccf799920901fabb8aea5284f32e661c07d3d6830e77e8299c482557

data/app/cells/decidim/activity_cell.rb

@@ -95,6 +95,9 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.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_cell.rb

@@ -66,6 +66,7 @@ module Decidim
 
       hash.push(I18n.locale)
       hash.push(model.cache_key_with_version) if model.respond_to?(:cache_key_with_version)
+      hash.push(from_context.cache_key_with_version) if from_context.respond_to?(:cache_key_with_version)
       hash.push(current_user.try(:id))
       hash.push(current_user.present?)
       hash.push(commentable?)

data/app/cells/decidim/card_m_cell.rb

@@ -19,7 +19,7 @@ module Decidim
     private
 
     def resource_path
-      resource_locator(model).path(filter_link_params)
+      resource_locator(model).path
     end
 
     def resource_image_path

data/app/cells/decidim/diff/diff_mode_dropdown.erb

@@ -4,21 +4,26 @@
       <%= t("versions.dropdown.choose_diff_view_mode") %>
     </span>
 
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a id="diff-view-selected">
+    <ul class="dropdown menu" data-dropdown-menu
+      data-autoclose="false"
+      data-disable-hover="true"
+      data-click-open="true"
+      data-close-on-click="true"
+      role="menubar">
+      <li class="is-dropdown-submenu-parent" role="presentation">
+        <a href="#diffmode-chooser-menu" id="diff-view-selected" aria-controls="diffmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
           <%= t("versions.dropdown.option_unified") %>
         </a>
 
-        <ul class="menu">
-          <li>
-            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified" do %>
+        <ul class="menu is-dropdown-submenu" id="diffmode-chooser-menu" role="menu" aria-labelledby="diff-view-selected">
+          <li role="presentation">
+            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified", role: "menuitem" do %>
               <%= t("versions.dropdown.option_unified") %>
             <% end %>
           </li>
 
-          <li>
-            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split" do %>
+          <li role="presentation">
+            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split", role: "menuitem" do %>
               <%= t("versions.dropdown.option_split") %>
             <% end %>
           </li>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -5,21 +5,26 @@
         <%= t("versions.dropdown.choose_diff_view_html") %>
       </span>
 
-      <ul class="dropdown menu" data-dropdown-menu>
-        <li class="is-dropdown-submenu-parent">
-          <a id="diff-view-selected">
+      <ul class="dropdown menu" data-dropdown-menu
+        data-autoclose="false"
+        data-disable-hover="true"
+        data-click-open="true"
+        data-close-on-click="true"
+        role="menubar">
+        <li class="is-dropdown-submenu-parent" role="presentation">
+          <a href="#htmlmode-chooser-menu" id="diff-view-html-selected" aria-controls="htmlmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
             <%= t("versions.dropdown.option_unescaped") %>
           </a>
 
-          <ul class="menu">
-            <li>
-              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+          <ul class="menu is-dropdown-submenu" id="htmlmode-chooser-menu" role="menu" aria-labelledby="diff-view-html-selected">
+            <li role="presentation">
+              <%= link_to "#diff-view-unescaped-html", class: "diff-view-html", id: "diff-view-unescaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_unescaped") %>
               <% end %>
             </li>
 
-            <li>
-              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+            <li role="presentation">
+              <%= link_to "#diff-view-escaped-html", class: "diff-view-html", id: "diff-view-escaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_escaped") %>
               <% end %>
             </li>

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

@@ -1,6 +1,8 @@
 <%= render :diff_mode_dropdown %>
 <%= render :diff_mode_html %>
 
-<% diff_data.each do |data| %>
-  <%= attribute(data) %>
-<% end %>
+<div aria-live="polite">
+  <% diff_data.each do |data| %>
+    <%= attribute(data) %>
+  <% end %>
+</div>

data/app/cells/decidim/endorsement_buttons_cell.rb.2

@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the endrosement button and the endorsements count.
+  # It only supports one row of buttons per page due to current tag ids used by javascript.
+  class EndorsementButtonsCell < Decidim::ViewModel
+    include LayoutHelper
+    include CellsHelper
+    include EndorsableHelper
+    include ResourceHelper
+    include Decidim::SanitizeHelper
+
+    delegate :current_user, to: :controller, prefix: false
+    delegate :current_settings, to: :controller, prefix: false
+    delegate :current_component, to: :controller, prefix: false
+    delegate :allowed_to?, to: :controller, prefix: false
+
+    def show
+      render
+    end
+
+    # Public: Renders the "Endorse" button.
+    # Contains all the logic about how the button should be rendered
+    # and which actions the button must trigger.
+    #
+    # It takes into account:
+    # - if endorsements are enabled
+    # - if users are logged in
+    # - if users can endorse with many identities (of their user_groups)
+    # - if users require verification
+    def render_endorsements_button
+      render_disabled_endorsements_button if endorsements_blocked_or_user_can_not_participate?
+      render_user_login_button unless current_user
+      render "select_identity_button" if current_user_and_allowed? && user_has_verified_groups?
+      render_user_identity_endorse_button if current_user_and_allowed?
+
+      render_verification_modal
+    end
+
+    # Public: Renders the counter of endorsements that appears in m-cards.
+    def render_endorsements_count
+      content = icon("bullhorn", class: "icon--small", aria_label: t("decidim.endorsable.endorsements_count"), role: "img")
+      content += resource.endorsements_count.to_s
+      html_class = "button small compact button--shadow secondary"
+      html_class += " active" if fully_endorsed?(resource, current_user)
+      tag_params = { id: "resource-#{resource.id}-endorsements-count", class: html_class }
+      if resource.endorsements_count.positive?
+        link_to "#list-of-endorsements", tag_params do
+          content
+        end
+      else
+        content_tag(:div, tag_params) do
+          content
+        end
+      end
+    end
+
+    # Public: Renders the endorsements button but disabled.
+    # To be used to let the user know that endorsements are enabled but are blocked or cant participate.
+    def render_disabled_endorsements_button
+      content_tag :span, class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)} disabled", disabled: true, title: endorse_translated do
+        endorse_translated + render_screen_reader_context_title
+      end
+    end
+
+    # Public: Render content for screen readers only (accessibility)
+    def render_screen_reader_context_title
+      content_tag :span, class: "show-for-sr" do
+        decidim_html_escape(resource_title(resource))
+      end
+    end
+
+    # Public: Returns the CSS classes used for proposal endorsement button in both proposals list and show pages
+    #
+    # from_resourcess_list - A boolean to indicate if the template is rendered from the list page of the resource.
+    #
+    # Returns a string with the value of the css classes.
+    def endorsement_button_classes(from_resourcess_list: false)
+      return "small" if from_resourcess_list
+
+      "button small compact light button--sc expanded secondary"
+    end
+
+    # Public: Returns the CSS classes used for proposal endorsement button 
+    def card_button_html_class
+      "card__button button"
+    end
+
+    # Public: Renders a button to endorse the given +resource+ with the personal identity of the user.
+    # To override the translation for both buttons: endorse and unendorse (use to be the name of the user/user_group).
+    #
+    # This button may have different behaviours:
+    # - If the user is not logged in, the button will open the signin/signup popup.
+    # - If the user is logged in, and the resource has not been endorsed, the button will allow to endorse.
+    # - If the user is logged in, and the resource has already been endorsed, the button will allow to UNendorse.
+    #
+    # Parameters:
+    #   resources  - The endorsable resource.
+    def render_user_identity_endorse_button
+      content_tag(:div, id: "resource-#{resource.id}-endorsement-button") do
+        if !current_user
+          render_user_login_button
+        elsif resource.endorsed_by?(current_user)
+          unendorse_label = t("decidim.endorsement_buttons_cell.already_endorsed")
+          destroy_endorsement_url = path_to_destroy_endorsement(resource)
+          action_authorized_button_to(
+            :endorse,
+            destroy_endorsement_url,
+            resource: resource,
+            method: :delete,
+            remote: true,
+            class: "button #{endorsement_button_classes} active",
+            id: "endorsement_button"
+          ) do
+            unendorse_label + render_screen_reader_context_title
+          end
+        else
+          action_authorized_button_to(
+            :endorse,
+            path_to_create_endorsement(resource),
+            resource: resource,
+            remote: true,
+            class: "button #{endorsement_button_classes}",
+            id: "endorsement_button"
+          ) do
+            endorse_translated + render_screen_reader_context_title
+          end
+        end
+      end
+    end
+
+    # Public: The resource being un/endorsed is the Cell's model.
+    def resource
+      model
+    end
+
+    # Public: produce the reveal identities URL as the cell doesn't have access to routes
+    def reveal_identities_url
+      decidim.identities_endorsement_path(resource.to_gid.to_param)
+    end
+
+    # Public: produce the path to endorsements from the engine routes as the cell doesn't have access to routes
+    def endorsements_path(*args)
+      decidim.endorsements_path(*args)
+    end
+
+    # Public: produce the path to an endorsement from the engine routes as the cell doesn't have access to routes
+    def endorsement_path(*args)
+      decidim.endorsement_path(*args)
+    end
+
+    # Public; returns the identity presenter for user and user groups
+    def endorsement_identity_presenter(endorsement)
+      if endorsement.user_group
+        Decidim::UserGroupPresenter.new(endorsement.user_group)
+      else
+        Decidim::UserPresenter.new(endorsement.author)
+      end
+    end
+
+    private
+
+    # Private: render the user login button for visitors (non logged in users)
+    def render_user_login_button
+      action_authorized_button_to(:endorse,
+                                  path_to_create_endorsement(resource),
+                                  resource: resource,
+                                  class: "button #{endorsement_button_classes}") do
+        endorse_translated + render_screen_reader_context_title
+      end
+    end
+
+    # Private: render the verification modal when there's a current user that needs an authorization
+    def render_verification_modal
+      button_to(endorsement_path(resource),
+                data: { open: "authorizationModal", "open-url": modal_path(:endorse, resource) },
+                class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)}") do
+        endorse_translated + render_screen_reader_context_title
+      end
+    end
+
+    # Private: check if the endorsements are blocked or the user can't participate
+    #
+    # Returns a boolean
+    def endorsements_blocked_or_user_can_not_participate?
+      current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
+    end
+
+    # Private: check if there's an user logged in and they have permissions
+    #
+    # Returns a boolean
+    def current_user_and_allowed?
+      current_user && allowed_to?(:create, :endorsement, resource: resource)
+    end
+
+    # Private: check if there's an user logged in and they have user groups associated
+    #
+    # Returns a boolean
+    def user_has_verified_groups?
+      current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
+    end
+
+    def endorse_translated
+      @endorse_translated ||= t("decidim.endorsement_buttons_cell.endorse")
+    end
+
+    def raw_model
+      model.try(:__getobj__) || model
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 <div id="list-of-endorsements" class="section">
   <div class="row">
     <div class="columns large-12">
-      <h4 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h4>
+      <h3 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h3>
     </div>
     <div class="columns large-12">
       <%= cell(

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

@@ -3,7 +3,7 @@
 </div>
 
 <div id="<%= modal_name %>" class="reveal fingerprint-dialog" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
-  <h2 id="modalTitle"><%= t "decidim.fingerprint.title" %></h2>
+  <h2 id="modalTitle" class="reveal__title"><%= t "decidim.fingerprint.title" %></h2>
   <p><%= t "decidim.fingerprint.explanation" %></p>
   <p>
     <strong><%= t "decidim.fingerprint.value" %>:</strong>

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if followers.any? %>">
+<div class="callout secondary <%= "hide" if followers.any? %>">
   <p><%= t("decidim.followers.no_followers") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -1,6 +1,6 @@
 <% if public_followings.any? %>
   <% if non_public_followings? %>
-    <div class="empty-notifications callout secondary">
+    <div class="callout secondary">
       <p><%= t("decidim.following.non_public_followings") %></p>
     </div>
   <% end %>
@@ -12,7 +12,7 @@
   </div>
   <%= decidim_paginate public_followings %>
 <% else %>
-  <div class="empty-notifications callout secondary">
+  <div class="callout secondary">
     <p><%= t("decidim.following.no_followings") %></p>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= cell "decidim/user_group_pending_invitations_list", model %>
-<div class="empty-notifications callout secondary <%= "hide" if user_groups.any? %>">
+<div class="callout secondary <%= "hide" if user_groups.any? %>">
   <p><%= t("decidim.groups.no_user_groups") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if memberships.any? %>">
+<div class="callout secondary <%= "hide" if memberships.any? %>">
   <p><%= t("decidim.members.no_members") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -23,7 +23,7 @@
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
-      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url %>
+      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url, rel: "nofollow noopener noreferrer ugc" %>
     <% end %>
   </div>
   <% if profile_user.badge.present? %>

data/app/cells/decidim/user_conversation/messages.erb

@@ -1,6 +1,6 @@
 <div class="conversation-chat<%= " conversation-chat--offset" if sender_is_user?(sender) %>">
   <%= link_to sender.personal_url do %>
-    <%= image_tag sender.attached_uploader(:avatar).url(host: current_organization.host), alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
+    <%= image_tag avatar_url_for(sender), alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
   <% end %>
   <div>
     <% messages.each do |message| %>

data/app/cells/decidim/user_conversation_cell.rb

@@ -37,6 +37,10 @@ module Decidim
       user.id == sender.id
     end
 
+    def avatar_url_for(sender)
+      present(sender).avatar_url
+    end
+
     def conversation_avatar
       if interlocutors.count == 1
         present(interlocutors.first).avatar_url

data/app/cells/decidim/user_conversations/add_conversation_users.erb

@@ -2,7 +2,7 @@
   <div class="wrapper wrapper--inner">
     <div class="row">
       <div class="large-12">
-        <h2 id="modalTitle"> <%= t "decidim.user_conversations.index.modal_title" %> </h2>
+        <h2 id="modalTitle" class="reveal__title"><%= t "decidim.user_conversations.index.modal_title" %></h2>
       </div>
     </div>
     <div class="row">

data/app/cells/decidim/version_cell.rb

@@ -77,7 +77,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path(filter_link_params)
+      resource_locator(versioned_resource).path
     end
   end
 end

data/app/cells/decidim/versions_list_cell.rb

@@ -13,7 +13,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path(filter_link_params)
+      resource_locator(versioned_resource).path
     end
 
     def i18n_changes_title

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

@@ -2,9 +2,9 @@
   <div class="card--list__text">
     <div>
       <%= link_to version_path do %>
-        <h6 class="card--list__heading heading6">
+        <h4 class="card--list__heading heading6">
           <%= i18n_version_index %>
-        </h6>
+        </h4>
       <% end %>
       <div class="author-data">
         <%= render_resource_editor(version) %>

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

@@ -20,7 +20,10 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if form.invalid?
+        if form.invalid?
+          message.valid?
+          return broadcast(:invalid, message.errors.full_messages)
+        end
 
         if message.save
           notify_interlocutors

data/app/commands/decidim/unendorse_resource.rb

@@ -28,10 +28,11 @@ module Decidim
     private
 
     def destroy_resource_endorsement
-      query = @resource.endorsements.where(
-        author: @current_user,
-        decidim_user_group_id: @current_group&.id
-      )
+      query = if @current_group.present?
+                @resource.endorsements.where(decidim_user_group_id: @current_group&.id)
+              else
+                @resource.endorsements.where(author: @current_user)
+              end
       query.destroy_all
     end
   end

data/app/controllers/decidim/application_controller.rb

@@ -33,6 +33,7 @@ module Decidim
     helper Decidim::ViewHooksHelper
     helper Decidim::CardHelper
     helper Decidim::SanitizeHelper
+    helper Decidim::TwitterSearchHelper
 
     register_permissions(::Decidim::ApplicationController,
                          ::Decidim::Admin::Permissions,

data/app/controllers/decidim/components/base_controller.rb

@@ -24,7 +24,6 @@ module Decidim
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
       helper Decidim::PadHelper
-      helper Decidim::FilterParamsHelper
 
       helper_method :current_component,
                     :current_participatory_space,

data/app/events/decidim/amendable/amendment_base_event.rb

@@ -6,7 +6,7 @@ module Decidim::Amendable
                     :emendation_path, :emendation_author_nickname, :emendation_author_path
 
     def amendable_title
-      @amendable_title ||= amendable_resource.title
+      @amendable_title ||= translated_attribute(amendable_resource.title)
     end
 
     def amendable_type

data/app/forms/decidim/messaging/message_form.rb

@@ -8,7 +8,7 @@ module Decidim
 
       attribute :body, Decidim::Attributes::CleanString
 
-      validates :body, presence: true
+      validates :body, presence: true, length: { maximum: Decidim.config.maximum_conversation_message_length }
     end
   end
 end

data/app/helpers/decidim/endorsable_helper.rb

@@ -76,12 +76,13 @@ module Decidim
     #   user       - The user that is endorsing at the end (mandatory).
     #   user_group - The user_group on behalf of which the endorsement is being done (optional).
     def render_endorsement_identity(resource, user, user_group = nil)
-      presenter = if user_group
-                    Decidim::UserGroupPresenter.new(user_group)
-                  else
-                    Decidim::UserPresenter.new(user)
-                  end
-      selected = resource.endorsed_by?(user, user_group)
+      if user_group
+        presenter = Decidim::UserGroupPresenter.new(user_group)
+        selected = resource.endorsed_by?(user, user_group)
+      else
+        presenter = Decidim::UserPresenter.new(user)
+        selected = resource.endorsed_by?(user)
+      end
       http_method = selected ? :delete : :post
       render partial: "decidim/endorsements/identity", locals:
       { identity: presenter, selected: selected,

data/app/helpers/decidim/social_share_button_helper.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper that reimplements the SocialShareButton gem helpers, so that we don't depend on it anymore.
+  module SocialShareButtonHelper
+    def social_share_button_tag(title, **args)
+      content_tag :div, class: "social-share-button" do
+        render_social_share_buttons(enabled_services, title, **args)
+      end
+    end
+
+    def render_social_share_buttons(services, title, **args)
+      services.map do |service|
+        link_to service.formatted_share_uri(title, **args), rel: "nofollow", class: "ssb-icon ssb-#{service.name}", title: t(".share_on", service: service.name) do
+          image_tag service.icon_path
+        end
+      end.join.html_safe
+    end
+
+    private
+
+    def enabled_services
+      Decidim::SocialShare.enabled_services
+    end
+  end
+end

data/app/helpers/decidim/twitter_search_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module TwitterSearchHelper
+    # Builds the URL for Twitter's hashtag search.
+    #
+    # @param hashtag [String] The hasthag to search
+    #
+    # @return [String]
+    def twitter_hashtag_url(hashtag)
+      format("https://twitter.com/hashtag/%{hashtag}?src=hash", hashtag: hashtag)
+    end
+  end
+end

data/app/models/decidim/moderation.rb

@@ -12,6 +12,9 @@ module Decidim
 
     delegate :component, :organization, to: :reportable
 
+    scope :hidden, -> { where.not(hidden_at: nil) }
+    scope :not_hidden, -> { where(hidden_at: nil) }
+
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::ModerationPresenter
     end

data/app/models/decidim/user.rb

@@ -50,9 +50,6 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    has_one_attached :avatar
-    validates_upload :avatar, uploader: Decidim::AvatarUploader
-
     has_one_attached :data_portability_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
@@ -63,12 +60,6 @@ module Decidim
     scope :officialized, -> { where.not(officialized_at: nil) }
     scope :not_officialized, -> { where(officialized_at: nil) }
 
-    scope :confirmed, -> { where.not(confirmed_at: nil) }
-    scope :not_confirmed, -> { where(confirmed_at: nil) }
-
-    scope :blocked, -> { where(blocked: true) }
-    scope :not_blocked, -> { where(blocked: false) }
-
     scope :interested_in_scopes, lambda { |scope_ids|
       actual_ids = scope_ids.select(&:presence)
       if actual_ids.count.positive?