decidim-core 0.26.8 → 0.27.0.rc1

data/app/models/decidim/short_link.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Short links are a way to reference specific locations within Decidim with
+  # shorted URLs, similar to the popular link shortening services. The original
+  # reason for creating the feature was to reference long calendar URLs in a
+  # more compact way for the URLs to be compatible with the calendar programs.
+  # When the URL is long with lots of filtering parameters included in it, it
+  # may be too long for specific 3rd party programs.
+  #
+  # This feature can be used to link to any URLs or resources in Decidim with a
+  # short reference.
+  class ShortLink < ApplicationRecord
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
+    belongs_to :target, polymorphic: true
+
+    validates :identifier, presence: true, uniqueness: true
+
+    before_validation :generate_identifier
+
+    # Finds a matching short link to the same target with exactly the same
+    # parameters if it already exists or creates a new one if it doesn't exist.
+    #
+    # @param target [ActiveRecord::Base] The target where this short link should
+    #   link to. Most of the times [Decidim::Organization], [Decidim::Component]
+    #   or some other top-level record.
+    # @param mounted_engine [String] The mounted engine helper name that will be
+    #   used to generate the link.
+    # @param route_name [String, nil] The route name to be linked to. If not
+    #   defined, the short link will be generated for the root URL for the
+    #   mounted engine.
+    # @param params [Hash] The query parameters that should be included in the
+    #   URL where this short link will redirect to.
+    # @return [Decidim::ShortLink] The short link instance to link to.
+    def self.to(target, mounted_engine, route_name: nil, params: {})
+      organization =
+        if target.is_a?(Decidim::Organization)
+          target
+        else
+          target.try(:organization)
+        end
+
+      values = {
+        organization: organization,
+        target: target,
+        mounted_engine_name: mounted_engine,
+        route_name: route_name
+      }
+      existing =
+        if params
+          where(values).find_by("params = ?::jsonb", params.to_json)
+        else
+          find_by(values.merge(params: nil))
+        end
+
+      existing || create!(values.merge(params: params))
+    end
+
+    # Creates a random unique identifier for any new links. Raises an
+    # OutOfCandidatesError if a free candidate cannot be found with 20 tries.
+    # In this situation the older records should be removed from the database.
+    #
+    # @return [String] A new unique identifier.
+    def self.unique_identifier_within(organization)
+      1.step do |n|
+        raise OutOfCandidatesError if n > 20
+
+        # A-Z, a-z and 0-9
+        # 26 + 26 + 10 = 62 possibilities per character
+        # 62^10 ≈ 8×10¹⁷ total possibilities
+        candidate = SecureRandom.alphanumeric(10)
+        next if where(organization: organization, identifier: candidate).any?
+
+        return candidate
+      end
+    end
+
+    # Overrides the route_name method to add a default route name for the "root"
+    # path in case the route name is not defined for the record.
+    #
+    # @return [String] The route name to link to.
+    def route_name
+      super || "root"
+    end
+
+    # Generates the short URL referencing this link.
+    #
+    # @return [String] The short URL that can be used to link to the target.
+    def short_url
+      EngineRouter.new("decidim", default_url_options).short_link_url(id: identifier)
+    end
+
+    # Generates the full long URL to the resource matching this short link.
+    #
+    # @return [String] The target full URL that the short link should link to.
+    def target_url
+      url_helpers.send("#{route_name}_url", **params)
+    end
+
+    private
+
+    # Generates a new identifier for new records.
+    #
+    # @return [void]
+    def generate_identifier
+      return if identifier.present?
+
+      self.identifier = self.class.unique_identifier_within(organization)
+    end
+
+    # Returns the default URL options for the organization. The participatory
+    # space and component related parameters are excluded from the
+    # default_url_options because these are also needed for the short URL
+    # generation.
+    #
+    # @return [Hash] A hash of the default URL options for the links.
+    def default_url_options
+      { host: organization&.host }.compact
+    end
+
+    # Returns the options for the URL helper call against the routes proxy.
+    # The options include the mounted params for the target, such as
+    # participatory space slug and component ID, depending what the target is.
+    #
+    # @return [Hash] The mounted options for the target record that will be used
+    #   to generate the final link.
+    def mounted_options
+      if target.is_a?(Decidim::Participable)
+        # The mounted_params method returns always e.g. participatory_space_slug
+        # assembly_slug, etc. But when we want to link to the space itself, we
+        # only need the `slug` parameter.
+        { host: target.organization.host, slug: target.slug }
+      elsif target.respond_to?(:mounted_params)
+        target.mounted_params
+      elsif target.respond_to?(:component)
+        target.component.mounted_params.merge(id: target.id)
+      elsif target.respond_to?(:participatory_space)
+        target.participatory_space.mounted_params
+      elsif target.respond_to?(:slug)
+        # E.g. Decidim::StaticPage uses the slug as the `:id` parameter.
+        default_url_options.merge(id: target.slug)
+      elsif !target.is_a?(Decidim::Organization)
+        default_url_options.merge(id: target.id)
+      else
+        default_url_options
+      end
+    end
+
+    # Returns the routes helpers for the target engine.
+    #
+    # @return [Decidim::EngineRouter] An instance of the engine router that will
+    #   be used to generate the links to the correct context.
+    def url_helpers
+      @url_helpers ||= EngineRouter.new(mounted_engine_name, mounted_options)
+    end
+
+    # The OutOfCandidatesError is an error class that will be raised when the
+    # short link identifiers are running out and the short link cannot be
+    # generated.
+    class OutOfCandidatesError < StandardError; end
+  end
+end

data/app/models/decidim/user.rb

@@ -5,15 +5,15 @@ require "devise/models/decidim_newsletterable"
 require "valid_email2"
 
 module Decidim
-  # A User is a citizen that wants to join the platform to participate.
+  # A User is a participant that wants to join the platform to engage.
   class User < UserBaseEntity
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
     include Decidim::Searchable
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
     include Decidim::Traceable
 
-    REGEXP_NICKNAME = /\A[\w\-]+\z/.freeze
+    REGEXP_NICKNAME = /\A[\w\-]+\z/
 
     class Roles
       def self.all
@@ -34,6 +34,9 @@ module Decidim
     has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
+    has_many :reminders, foreign_key: "decidim_user_id", class_name: "Decidim::Reminder", dependent: :destroy
+
+    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
     validates :nickname,
@@ -48,7 +51,7 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    has_one_attached :data_portability_file
+    has_one_attached :download_your_data_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -79,12 +82,14 @@ module Decidim
                         # scope_id: :decidim_scope_id,
                         organization_id: :decidim_organization_id,
                         A: :name,
+                        B: :nickname,
                         datetime: :created_at
                       },
                       index_on_create: ->(user) { !(user.deleted? || user.blocked?) },
                       index_on_update: ->(user) { !(user.deleted? || user.blocked?) })
 
     before_save :ensure_encrypted_password
+    before_save :save_password_change
 
     def user_invited?
       invitation_token_changed? && invitation_accepted_at_changed?
@@ -184,10 +189,10 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityUserSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataUserSerializer
     end
 
-    def self.data_portability_images(user)
+    def self.download_your_data_images(user)
       user_collection(user).map(&:avatar)
     end
 
@@ -253,6 +258,18 @@ module Decidim
       Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
     end
 
+    def notifications_subscriptions
+      notification_settings.fetch("subscriptions", {})
+    end
+
+    def needs_password_update?
+      return false unless admin?
+      return false unless Decidim.config.admin_password_strong
+      return true if password_updated_at.blank?
+
+      password_updated_at < Decidim.config.admin_password_expiration_days.days.ago
+    end
+
     protected
 
     # Overrides devise email required validation.
@@ -300,5 +317,18 @@ module Decidim
     def ensure_encrypted_password
       restore_encrypted_password! if will_save_change_to_encrypted_password? && encrypted_password.blank?
     end
+
+    def save_password_change
+      return unless persisted?
+      return unless encrypted_password_changed?
+      return unless admin?
+      return unless Decidim.config.admin_password_strong
+
+      # We don't want to run validations here because that could lead to an endless validation loop.
+      # rubocop:disable Rails/SkipsModelValidations
+      update_column(:password_updated_at, Time.current)
+      update_column(:previous_passwords, [encrypted_password_was, *previous_passwords].first(Decidim.config.admin_password_repetition_times))
+      # rubocop:enable Rails/SkipsModelValidations
+    end
   end
 end

data/app/models/decidim/user_base_entity.rb

@@ -17,10 +17,8 @@ module Decidim
     has_many :notifications, foreign_key: "decidim_user_id", class_name: "Decidim::Notification", dependent: :destroy
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
-    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
-
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/.freeze
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader
@@ -32,7 +30,6 @@ module Decidim
 
     scope :blocked, -> { where(blocked: true) }
     scope :not_blocked, -> { where(blocked: false) }
-    scope :available, -> { where(deleted_at: nil, blocked: false, managed: false) }
 
     # Public: Returns a collection with all the public entities this user is following.
     #

data/app/models/decidim/user_block.rb

@@ -4,7 +4,7 @@ module Decidim
   class UserBlock < ApplicationRecord
     MINIMUM_JUSTIFICATION_LENGTH = 15
 
-    belongs_to :user, class_name: "Decidim::UserBaseEntity", foreign_key: :decidim_user_id
-    belongs_to :blocking_user, class_name: "Decidim::UserBaseEntity"
+    belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    belongs_to :blocking_user, class_name: "Decidim::User"
   end
 end

data/app/models/decidim/user_group.rb

@@ -4,10 +4,10 @@ require "devise/models/decidim_validatable"
 require "valid_email2"
 
 module Decidim
-  # A UserGroup is an organization of citizens
+  # A UserGroup is an organization of participants
   class UserGroup < UserBaseEntity
     include Decidim::Traceable
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
     include Decidim::Searchable
@@ -21,7 +21,7 @@ module Decidim
              foreign_key: :decidim_user_id,
              source: :user
 
-    validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }, unless: -> { blocked? }
+    validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }
 
     validate :correct_state
     validate :unique_document_number, if: :has_document_number?
@@ -87,7 +87,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityUserGroupSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataUserGroupSerializer
     end
 
     def document_number

data/app/models/decidim/user_moderation.rb

@@ -12,8 +12,6 @@ module Decidim
     scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
 
     delegate :organization, to: :user
-    scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
-    scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::UserModerationPresenter

data/app/models/decidim/user_report.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class UserReport < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     REASONS = %w(spam offensive does_not_belong).freeze
 
@@ -16,7 +16,7 @@ module Decidim
 
     def self.export_serializer
       raise NotImplementedError
-      # Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+      # Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
     private

data/app/packs/entrypoints/decidim_core.js

@@ -14,7 +14,6 @@ import "src/decidim/vendor/foundation-datepicker"
 import "src/decidim/foundation_datepicker_locales"
 import "src/decidim/vendor/modernizr"
 import "src/decidim/vendor/social-share-button"
-import "social-share-button"
 
 import "src/decidim/input_tags"
 import "src/decidim/input_hashtags"
@@ -57,7 +56,9 @@ import "src/decidim/start_conversation_dialog"
 import "src/decidim/notifications"
 import "src/decidim/identity_selector_dialog"
 import "src/decidim/gallery"
+import "src/decidim/direct_uploads/upload_field"
 import "src/decidim/back_to_list"
+import "src/decidim/cookie_consent/cookie_consent"
 
 // CSS
 import "entrypoints/decidim_core.scss"
@@ -70,4 +71,3 @@ require.context("../images", true)
 
 // This needs to be loaded after confirm dialog to bind properly
 Rails.start()
-

data/app/packs/entrypoints/decidim_sw.js

@@ -0,0 +1 @@
+import "src/decidim/sw"

data/app/packs/images/decidim/gamification/badges/decidim_gamification_badges_invitations.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="invitations-svg" width="1080" height="1080" x="0" y="0" enable-background="new 0 0 1080 1080" version="1.1" viewBox="0 0 1080 1080" xml:space="preserve"><g id="invitations" class="stroke-primary"><path id="_x35_0-pct" fill="#31536E" fill-opacity=".5" stroke="#31536E" stroke-miterlimit="10" stroke-width="16" d="M558.615,484.287c-1.795,13.101-13.868,22.268-26.971,20.475l-430.091-58.867c-13.102-1.793-22.269-13.867-20.476-26.969 l25.128-183.588c1.792-13.101,13.867-22.268,26.969-20.475l430.09,58.867c13.104,1.793,22.271,13.867,20.476,26.969 L558.615,484.287z" class="stroke-primary fill-primary"/><g id="llave-2"><polyline id="_x32_5-pct" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" points="725.15 608.29 795.92 631.312 811.343 619.35 951.072 799.492 994.668 765.676 854.939 585.534 870.773 573.253 865.453 489.109 785.277 463.028 710.425 521.088 710.771 526.581" class="stroke-primary fill-primary"/><line x1="822.037" x2="949.643" y1="611.055" y2="775.57" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8"/><circle cx="851.312" cy="618.65" r="4.164" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8"/><path fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" d="M883.329,641.242c1.41,1.818,1.08,4.435-0.739,5.844c-1.814,1.41-4.432,1.079-5.842-0.738c-1.409-1.815-1.078-4.433,0.738-5.844 C879.305,639.096,881.92,639.428,883.329,641.242z"/><ellipse cx="909.955" cy="690.856" fill="#31536E" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" rx="8.068" ry="8.328" transform="matrix(0.7902 -0.6129 0.6129 0.7902 -232.4812 702.6757)"/><ellipse cx="930.024" cy="717.028" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" rx="2.706" ry="2.793" transform="matrix(0.79 -0.6131 0.6131 0.79 -244.3098 720.8308)"/><ellipse cx="959.021" cy="745.919" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" rx="2.705" ry="2.793" transform="matrix(0.7901 -0.6129 0.6129 0.7901 -255.9333 744.3307)"/><path fill="#FFF" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" d="M748.271,530.445c-2.446-6.905,2.196-17.128,11.607-24.426c10.754-8.342,23.66-9.706,28.829-3.044 c5.165,6.66,0.633,18.822-10.12,27.163c-6.389,4.956-13.539,7.449-19.371,7.26"/></g><g id="llave-1"><path fill="#FFF" stroke="#31536E" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" d="M614.113,522.867 c-15.51,13.144-25.266,32.768-25.266,54.689c0,30.556,19.152,56.628,46.152,66.933v53.651l10.41,12.492L635,724.513v29.149 l10,13.186v12.491l5.41,12.492L635,805.713v43.375l24.959,20.82L687,849.088v-204.94c26-10.53,45.135-36.366,45.135-66.591 c0-39.575-32.113-71.656-71.688-71.656c-13.148,0-25.486,3.542-36.077,9.723"/><path fill="none" stroke="#31536E" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8" d="M649.429,535.988 c3.556-2.918,8.105-4.671,13.064-4.671c11.378,0,20.603,9.225,20.603,20.604c0,2.6-0.48,5.087-1.359,7.377 c-2.968,7.735-10.465,13.226-19.243,13.226c-11.38,0-20.604-9.225-20.604-20.603c0-1.879,0.252-3.699,0.724-5.429"/><line x1="672" x2="672" y1="645" y2="838" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8"/></g><path fill="none" stroke="#31536E" stroke-miterlimit="10" stroke-width="8" d="M590.754,433.03 c-21.271,0-38.517-17.245-38.517-38.517c0-21.272,17.245-38.517,38.517-38.517s38.518,17.245,38.518,38.517 c0,16.125-9.91,29.936-23.972,35.674"/><g><path fill="none" stroke="#31536E" stroke-miterlimit="10" stroke-width="8" d="M681.732,559.303 c-52.018-6.146-92.366-50.394-92.366-104.065c0-57.877,46.918-104.795,104.796-104.795c57.875,0,104.793,46.918,104.793,104.795 c0,4.064-0.23,8.074-0.68,12.018"/><path fill="none" stroke="#31536E" stroke-miterlimit="10" stroke-width="8" d="M682.455,546.806 c-45.45-5.752-80.598-44.555-80.598-91.568c0-50.978,41.325-92.304,92.305-92.304c50.977,0,92.302,41.326,92.302,92.304 c0,2.717-0.117,5.406-0.348,8.063"/></g><path fill="#FFF" stroke="#31536E" stroke-miterlimit="10" stroke-width="8" d="M517.327,448.165 c-1.794,13.101-13.868,22.268-26.969,20.475l-355.832-48.703c-13.101-1.793-22.268-13.868-20.476-26.969l16.799-122.736 c1.793-13.102,13.867-22.269,26.969-20.476l355.831,48.702c13.102,1.794,22.269,13.868,20.475,26.969L517.327,448.165z"/><g><path fill="#FFF" stroke="#31536E" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="8" d="M788.189,501.559c-11.944,24.199-32.955,43.123-58.598,52.332l-6.449-10.99c22.528-7.444,41.213-23.33,52.313-43.91 L788.189,501.559z"/></g><g id="logo-decidim"><path fill="#FFF" d="M403.485,369.949c-35.105-4.969-59.938-37.072-55.925-72.299l-1.195-0.152 c-4.971,35.104-37.074,59.937-72.301,55.924l-0.153,1.196c35.135,4.73,59.968,36.834,55.924,72.301l1.196,0.152 c4.731-35.136,36.835-59.968,72.301-55.925L403.485,369.949z"/><path fill="#31536E" d="M403.485,369.949c4.013-35.227-20.819-67.33-55.925-72.299 C343.547,332.877,368.379,364.98,403.485,369.949z" class="fill-primary"/><path fill="#31536E" d="M403.332,371.146c-35.196-4.252-67.3,20.58-72.301,55.925 C366.259,431.084,398.362,406.251,403.332,371.146z" class="fill-primary"/><path fill="#31536E" d="M282.252,289.309l-8.189,64.113l0,0c35.197,4.252,67.301-20.581,72.301-55.924L282.252,289.309z" class="fill-primary"/><path fill="#31536E" d="M273.911,354.618L273.911,354.618l-8.188,64.112l64.111,8.189 C333.849,391.691,309.016,359.587,273.911,354.618z" class="fill-primary"/><path fill="#31536E" d="M273.911,354.618c-4.252,35.196,20.58,67.3,55.924,72.301 C333.849,391.691,309.016,359.587,273.911,354.618z" class="fill-primary"/><path fill="#31536E" d="M274.063,353.421c35.197,4.252,67.301-20.581,72.301-55.924 C310.897,293.453,278.794,318.285,274.063,353.421z" class="fill-primary"/></g><g id="stars-1" class="stars"><path fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4" d="M429,158.355C429,143.667,410.333,123,393.645,123C409,123,429,102.667,429,87.645C429,102.667,445.666,123,464.355,123 C445.333,123,429,143.667,429,158.355z"/><g><circle cx="860.382" cy="125.411" r="13.5" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="843.883" x2="822.67" y1="108.676" y2="87.463" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="877.824" x2="899.037" y1="142.617" y2="163.83" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="877.117" x2="898.33" y1="109.383" y2="88.17" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="843.883" x2="822.67" y1="142.617" y2="163.83" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><g><line x1="798.612" x2="772.45" y1="927.094" y2="953.258" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="763.258" x2="737.095" y1="962.449" y2="988.613" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="797.905" x2="771.742" y1="988.613" y2="962.449" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="762.551" x2="736.388" y1="953.258" y2="927.094" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><path fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4" d="M1028.592,902.609c0,0-21.566,4.035-26.516,8.983c-4.948,4.948-8.982,26.515-8.982,26.515s-4.035-21.566-8.984-26.515 c-4.948-4.948-26.514-8.983-26.514-8.983s22.077-4.546,26.514-8.983c4.438-4.438,8.984-26.515,8.984-26.515 s4.034,21.566,8.982,26.515C1007.025,898.574,1028.592,902.609,1028.592,902.609z"/><g><circle cx="188.501" cy="902.667" r="16.604" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="152.6" cy="902.667" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="188.501" cy="938.568" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="224.402" cy="902.667" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="188.501" cy="866.766" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><g><line x1="358.746" x2="413.649" y1="617.973" y2="672.878" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="413.649" x2="358.746" y1="617.973" y2="672.878" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="368" x2="341" y1="645" y2="645" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="406" x2="433" y1="645" y2="645" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="387" x2="387" y1="664" y2="691" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="387" x2="387" y1="626" y2="599" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><g><line x1="133" x2="133" y1="98" y2="177" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="172" x2="93" y1="138" y2="138" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="113" cy="157.5" r="7.039" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="113" cy="117.5" r="7.039" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="153" cy="157.5" r="7.039" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="153" cy="117.5" r="7.039" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g></g></g></svg>