diaspora_federation 0.2.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98803be0a780d1fdc7112c28c278550b279ab693e01ecfc268e3a7f43ce77a17
-  data.tar.gz: fd0b31783ca8f058ab3f9d9bd1154e3d229f7cbe663000b2dab5f23305f20ae5
+  metadata.gz: 55951778511742a4269e05b406ef43ca976410c07e91364896138e3df1cf7019
+  data.tar.gz: 3fed9b6d22ec275798e45a1df2c593835d1750fdac9c68158192a06640b4bcb5
 SHA512:
-  metadata.gz: 57ec25012b75ba2895900923d1b48d9ae066542f2be88a6521d2ac862b24e64a402b75a84c657f89cc75fbc18d80631dbe4b5da29087adf3d27e2526967318fe
-  data.tar.gz: 44ef6a752b43a751dc006fa9d0bf7ea62d5ee3fa579549bf9c27598a67811dddc62c775061175f9c26309365ad0a43b5fe2dcc57a5bec23f1211ffc0f6dd6d05
+  metadata.gz: 33b62f247e32f32874930b71f907540ae7f0dbf88182d1bd8e5a4c4590dd21eee9c2f9b691d54ed96d5688b9eca5c7523780fbd1b1a89ad7e2ae4ad9ca77c371
+  data.tar.gz: 581f0595fbd988aa146aea231bf80c2f81063c0719c671a83f685b162364922941bc8f68bd55b9a22385f520e0f7e162c66f71802e99703ccd54f03426d79731

data/Changelog.md

@@ -1,3 +1,28 @@
+# 1.0.0
+
+* Add rails 7 support [#126](https://github.com/diaspora/diaspora_federation/pull/126)
+* Add faraday 2 support [#126](https://github.com/diaspora/diaspora_federation/pull/126)
+
+# 0.3.0
+
+## Breaking changes
+
+* Drop support for rails 5.1 and older [4b4375c](https://github.com/diaspora/diaspora_federation/commit/4b4375cf787e09537f53aff92b054a0386681747) [ecfe0ea](https://github.com/diaspora/diaspora_federation/commit/ecfe0ea850d203e8144adab744c4b43263200902)
+* Drop support for ruby 2.6 and older [68df3cf](https://github.com/diaspora/diaspora_federation/commit/68df3cf555efafc72942cfec2c8fb3e8852ddec1) [#121](https://github.com/diaspora/diaspora_federation/pull/121)
+* Drop support for faraday 0.x [#116](https://github.com/diaspora/diaspora_federation/pull/116)
+* Remove support to receive old federation protocol [#114](https://github.com/diaspora/diaspora_federation/pull/114)
+* Remove support for old non-RFC WebFinger [#122](https://github.com/diaspora/diaspora_federation/pull/122)
+
+## Features
+
+* Add rails 6 support [afee784](https://github.com/diaspora/diaspora_federation/commit/afee78476b1715ba32e2b97d7cbf2584d57718dd)
+* Add faraday 1.x support [#116](https://github.com/diaspora/diaspora_federation/pull/116)
+* Add support for up to ruby 3.1 [#121](https://github.com/diaspora/diaspora_federation/pull/121)
+
+# 0.2.8
+
+* Re-release which allows rails 6 to be used
+
 # 0.2.7
 
 ## Features

data/lib/diaspora_federation/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # Callbacks are used to communicate with the application. They are called to
   # fetch data and after data is received.

data/lib/diaspora_federation/discovery/discovery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Discovery
     # This class contains the logic to fetch all data for the given diaspora* ID.
@@ -22,7 +24,7 @@ module DiasporaFederation
         validate_diaspora_id
 
         DiasporaFederation.callbacks.trigger(:save_person_after_webfinger, person)
-        logger.info "successfully webfingered #{diaspora_id}"
+        logger.info "Successfully webfingered #{diaspora_id}"
         person
       rescue DiscoveryError
         raise # simply re-raise DiscoveryError
@@ -35,27 +37,26 @@ module DiasporaFederation
       def validate_diaspora_id
         # Validates if the diaspora* ID matches the diaspora* ID in the webfinger response
         return if diaspora_id == clean_diaspora_id(webfinger.acct_uri)
-        raise DiscoveryError, "diaspora* ID does not match: Wanted #{diaspora_id} but got" \
-                              " #{clean_diaspora_id(webfinger.acct_uri)}"
+
+        raise DiscoveryError, "diaspora* ID does not match: Wanted #{diaspora_id} but got " \
+                              "#{clean_diaspora_id(webfinger.acct_uri)}"
       end
 
       def clean_diaspora_id(diaspora_id)
         diaspora_id.strip.sub("acct:", "").to_s.downcase
       end
 
-      def get(url, http_fallback=false)
+      def get(url, http_fallback: false)
         logger.info "Fetching #{url} for #{diaspora_id}"
         response = HttpClient.get(url)
         raise "Failed to fetch #{url}: #{response.status}" unless response.success?
+
         response.body
       rescue => e # rubocop:disable Style/RescueStandardError
-        unless http_fallback && url.start_with?("https://")
-          raise DiscoveryError, "Failed to fetch #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
-        end
+        raise DiscoveryError, "Failed to fetch #{url} for #{diaspora_id}: #{e.class}: #{e.message}" unless http_fallback
 
         logger.warn "Retry with http: #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
-        url.sub!("https://", "http://")
-        retry
+        get(url.sub("https://", "http://"))
       end
 
       def domain
@@ -66,21 +67,11 @@ module DiasporaFederation
         "acct:#{diaspora_id}"
       end
 
-      def legacy_webfinger_url_from_host_meta
-        # This tries the xrd url with https first, then falls back to http.
-        host_meta = HostMeta.from_xml(get("https://#{domain}/.well-known/host-meta", true))
-        host_meta.webfinger_template_url.gsub("{uri}", acct_parameter)
-      end
-
       def webfinger
-        return @webfinger if @webfinger
-        webfinger_url = "https://#{domain}/.well-known/webfinger?resource=#{acct_parameter}"
-
         # This tries the WebFinger URL with https first, then falls back to http if webfinger_http_fallback is enabled.
-        @webfinger = WebFinger.from_json(get(webfinger_url, DiasporaFederation.webfinger_http_fallback))
-      rescue => e # rubocop:disable Style/RescueStandardError
-        logger.warn "WebFinger failed, retrying with legacy WebFinger for #{diaspora_id}: #{e.class}: #{e.message}"
-        @webfinger = WebFinger.from_xml(get(legacy_webfinger_url_from_host_meta))
+        @webfinger ||=
+          WebFinger.from_json(get("https://#{domain}/.well-known/webfinger?resource=#{acct_parameter}",
+                                  http_fallback: DiasporaFederation.webfinger_http_fallback))
       end
 
       def hcard

data/lib/diaspora_federation/discovery/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Discovery
     # Raised, if there is an error while discover a new person

data/lib/diaspora_federation/discovery/h_card.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Discovery
     # This class provides the means of generating and parsing account data to and
@@ -54,14 +56,6 @@ module DiasporaFederation
       #   @return [String] display name of the user
       property :full_name, :string
 
-      # @!attribute [r] url
-      #   @deprecated should be changed to the profile url. The pod url is in
-      #     the WebFinger (see {WebFinger#seed_url}, will affect older diaspora*
-      #     installations).
-      #
-      #   @return [String] link to the pod
-      property :url, :string, optional: true
-
       # @!attribute [r] public_key
       #   When a user is created on the pod, the pod MUST generate a pgp keypair
       #   for them. This key is used for signing messages. The format is a
@@ -143,10 +137,6 @@ module DiasporaFederation
         add_simple_property(content, :family_name, "family_name", @last_name)
         #######################################
 
-        add_property(content, :url) do |html|
-          html.a(@url.to_s, id: "pod_location", class: "url", rel: "me", href: @url.to_s)
-        end
-
         add_photos(content)
 
         builder.doc.to_xhtml(indent: 2, indent_text: " ")
@@ -260,6 +250,7 @@ module DiasporaFederation
 
         doc = Nokogiri::HTML::Document.parse(html_string)
         raise InvalidData, "hcard html incomplete" unless html_document_complete?(doc)
+
         doc
       end
 

data/lib/diaspora_federation/discovery/web_finger.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Discovery
     # The WebFinger document used for diaspora* user discovery is based on an
-    # {http://tools.ietf.org/html/draft-jones-appsawg-webfinger older draft of the specification}.
-    #
-    # In the meantime an actual RFC draft has been in development, which should
-    # serve as a base for all future changes of this implementation.
+    # {https://datatracker.ietf.org/doc/html/rfc7033 RFC 7033}.
     #
     # @example Creating a WebFinger document from a person hash
     #   wf = WebFinger.new(
@@ -15,22 +14,20 @@ module DiasporaFederation
     #     atom_url:    "https://server.example/public/user.atom",
     #     salmon_url:  "https://server.example/receive/users/0123456789abcdef"
     #   )
-    #   xml_string = wf.to_xml
+    #   json_string = wf.to_json
     #
-    # @example Creating a WebFinger instance from an xml document
-    #   wf = WebFinger.from_xml(xml_string)
+    # @example Creating a WebFinger instance from an JSON document
+    #   wf = WebFinger.from_json(json_string)
     #   ...
     #   hcard_url = wf.hcard_url
     #   ...
     #
-    # @see http://tools.ietf.org/html/draft-jones-appsawg-webfinger "WebFinger" -
-    #   current draft
     # @see http://www.iana.org/assignments/link-relations/link-relations.xhtml
     #   official list of IANA link relations
     class WebFinger < Entity
       # @!attribute [r] acct_uri
-      #   The Subject element should contain the webfinger address that was asked
-      #   for. If it does not, then this webfinger profile MUST be ignored.
+      #   The Subject element should contain the WebFinger address that was asked
+      #   for. If it does not, then this WebFinger profile MUST be ignored.
       #   @return [String]
       property :acct_uri, :string
 
@@ -65,27 +62,27 @@ module DiasporaFederation
       property :salmon_url, :string, optional: true
 
       # @!attribute [r] subscribe_url
-      #   This url is used to find another user on the home-pod of the user in the webfinger.
+      #   This url is used to find another user on the home-pod of the user in the WebFinger.
       property :subscribe_url, :string, optional: true
 
       # +hcard_url+ link relation
-      REL_HCARD = "http://microformats.org/profile/hcard".freeze
+      REL_HCARD = "http://microformats.org/profile/hcard"
 
       # +seed_url+ link relation
-      REL_SEED = "http://joindiaspora.com/seed_location".freeze
+      REL_SEED = "http://joindiaspora.com/seed_location"
 
       # +profile_url+ link relation.
       # @note This might just as well be an +Alias+ instead of a +Link+.
-      REL_PROFILE = "http://webfinger.net/rel/profile-page".freeze
+      REL_PROFILE = "http://webfinger.net/rel/profile-page"
 
       # +atom_url+ link relation
-      REL_ATOM = "http://schemas.google.com/g/2010#updates-from".freeze
+      REL_ATOM = "http://schemas.google.com/g/2010#updates-from"
 
       # +salmon_url+ link relation
-      REL_SALMON = "salmon".freeze
+      REL_SALMON = "salmon"
 
       # +subscribe_url+ link relation
-      REL_SUBSCRIBE = "http://ostatus.org/schema/1.0/subscribe".freeze
+      REL_SUBSCRIBE = "http://ostatus.org/schema/1.0/subscribe"
 
       # Additional WebFinger data
       # @return [Hash] additional elements
@@ -104,29 +101,29 @@ module DiasporaFederation
         super(data)
       end
 
-      # Creates the XML string from the current WebFinger instance
-      # @return [String] XML string
+      # @!visibility private
+      # Generating WebFinger to XML is not supported anymore, use {#to_json} instead.
       def to_xml
-        to_xrd.to_xml
+        raise "Generating WebFinger to XML is not supported anymore, use 'to_json' instead."
       end
 
-      def to_json
+      # Creates the JSON string from the current WebFinger instance
+      # @return [String] JSON string
+      def to_json(*_args)
         to_xrd.to_json
       end
 
-      # Creates a WebFinger instance from the given XML string
-      # @param [String] webfinger_xml WebFinger XML string
-      # @return [WebFinger] WebFinger instance
-      # @raise [InvalidData] if the given XML string is invalid or incomplete
-      def self.from_xml(webfinger_xml)
-        from_hash(parse_xml_and_validate(webfinger_xml))
+      # @!visibility private
+      # Parsing WebFinger as XML is not supported anymore, use {from_json} instead.
+      def self.from_xml(_webfinger_xml)
+        raise "Parsing WebFinger as XML is not supported anymore, use 'from_json' instead."
       end
 
       # Creates a WebFinger instance from the given JSON string
       # @param [String] webfinger_json WebFinger JSON string
       # @return [WebFinger] WebFinger instance
       def self.from_json(webfinger_json)
-        from_hash(XrdDocument.json_data(webfinger_json))
+        from_hash(parse_json_and_validate(webfinger_json))
       end
 
       # Creates a WebFinger instance from the given data
@@ -155,15 +152,15 @@ module DiasporaFederation
 
       private
 
-      # Parses the XML string to a Hash and does some rudimentary checking on
+      # Parses the JSON string to a Hash and does some rudimentary checking on
       # the data Hash.
-      # @param [String] webfinger_xml WebFinger XML string
-      # @return [Hash] data XML data
-      # @raise [InvalidData] if the given XML string is invalid or incomplete
-      private_class_method def self.parse_xml_and_validate(webfinger_xml)
-        XrdDocument.xml_data(webfinger_xml).tap do |data|
+      # @param [String] webfinger_json WebFinger JSON string
+      # @return [Hash] data JSON data
+      # @raise [InvalidData] if the given JSON string is invalid or incomplete
+      private_class_method def self.parse_json_and_validate(webfinger_json)
+        XrdDocument.json_data(webfinger_json).tap do |data|
           valid = data.key?(:subject) && data.key?(:links)
-          raise InvalidData, "webfinger xml is incomplete" unless valid
+          raise InvalidData, "Webfinger JSON is incomplete" unless valid
         end
       end
 

data/lib/diaspora_federation/discovery/xrd_document.rb

@@ -1,15 +1,13 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Discovery
     # This class implements basic handling of XRD documents as far as it is
     # necessary in the context of the protocols used with diaspora* federation.
     #
-    # @note {http://tools.ietf.org/html/rfc6415 RFC 6415} recommends that servers
-    #   should also offer the JRD format in addition to the XRD representation.
-    #   Implementing +XrdDocument#to_json+ and +XrdDocument.json_data+ should
-    #   be almost trivial due to the simplicity of the format and the way the data
-    #   is stored internally already. See
-    #   {http://tools.ietf.org/html/rfc6415#appendix-A RFC 6415, Appendix A}
-    #   for a description of the JSON format.
+    # It also implements handling of the JRD format, see
+    # {https://datatracker.ietf.org/doc/html/rfc6415#appendix-A RFC 6415, Appendix A}
+    # for a description of the JSON format.
     #
     # @example Creating a XrdDocument
     #   doc = XrdDocument.new
@@ -29,13 +27,13 @@ module DiasporaFederation
     # @see http://docs.oasis-open.org/xri/xrd/v1.0/xrd-1.0.html Extensible Resource Descriptor (XRD) Version 1.0
     class XrdDocument
       # xml namespace url
-      XMLNS = "http://docs.oasis-open.org/ns/xri/xrd-1.0".freeze
+      XMLNS = "http://docs.oasis-open.org/ns/xri/xrd-1.0"
 
       # +Link+ element attributes
       LINK_ATTRS = %i[rel type href template].freeze
 
       # format string for datetime (+Expires+ element)
-      DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ".freeze
+      DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
       # The <Expires> element contains a time value which specifies the instant at
       # and after which the document has expired and SHOULD NOT be used.
@@ -80,14 +78,14 @@ module DiasporaFederation
         }.to_xml
       end
 
-      def to_json
+      def to_json(*_args)
         {
           subject:    subject,
           expires:    (expires.strftime(DATETIME_FORMAT) if expires.instance_of?(DateTime)),
           aliases:    (aliases if aliases.any?),
           properties: (properties if properties.any?),
           links:      (links if links.any?)
-        }.reject {|_, v| v.nil? }
+        }.compact
       end
 
       # Parse the XRD document from the given string and create a hash containing
@@ -130,7 +128,7 @@ module DiasporaFederation
           aliases:    json_hash["aliases"],
           properties: json_hash["properties"],
           links:      symbolize_keys_for_links(json_hash["links"])
-        }.reject {|_, v| v.nil? }
+        }.compact
       rescue JSON::JSONError => e
         raise InvalidDocument,
               "Not a JRD document: #{e.class}: #{e.message[0..255].encode(Encoding.default_external, undef: :replace)}"
@@ -138,14 +136,14 @@ module DiasporaFederation
 
       private
 
-      attr_reader :expires
-      attr_reader :subject
+      attr_reader :expires, :subject
 
       NS = {xrd: XMLNS}.freeze
 
       def add_aliases_to(xml)
         aliases.each do |a|
           next if !a.instance_of?(String) || a.empty?
+
           xml.Alias(a.to_s)
         end
       end
@@ -171,6 +169,7 @@ module DiasporaFederation
 
         doc = Nokogiri::XML(xrd_doc)
         raise InvalidDocument, "Not an XRD document" if !doc.root || doc.root.name != "XRD"
+
         doc
       end
 
@@ -204,7 +203,7 @@ module DiasporaFederation
 
       # symbolize link keys from JSON hash, but only convert known keys
       private_class_method def self.symbolize_keys_for_links(links)
-        links.map do |link|
+        links&.map do |link|
           {}.tap do |hash|
             LINK_ATTRS.each do |attr|
               hash[attr] = link[attr.to_s] if link.key?(attr.to_s)

data/lib/diaspora_federation/discovery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # This module provides the namespace for the various classes implementing
   # WebFinger and other protocols used for metadata discovery on remote servers
@@ -8,7 +10,6 @@ end
 
 require "diaspora_federation/discovery/exceptions"
 require "diaspora_federation/discovery/xrd_document"
-require "diaspora_federation/discovery/host_meta"
 require "diaspora_federation/discovery/web_finger"
 require "diaspora_federation/discovery/h_card"
 require "diaspora_federation/discovery/discovery"

data/lib/diaspora_federation/entities/account_deletion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity is sent when an account was deleted on a remote pod.
@@ -12,7 +14,7 @@ module DiasporaFederation
       #   Alias for author
       #   @see AccountDeletion#author
       #   @return [String] diaspora* ID
-      property :author, :string, alias: :diaspora_id, xml_name: :diaspora_handle
+      property :author, :string, alias: :diaspora_id
 
       # @return [String] string representation of this object
       def to_s

data/lib/diaspora_federation/entities/account_migration/signable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     class AccountMigration < Entity

data/lib/diaspora_federation/entities/account_migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity is sent when a person changes their diaspora* ID (e.g. when a user migration
@@ -42,13 +44,14 @@ module DiasporaFederation
       # @return [String] diaspora* ID of the old person identity
       def old_identity
         return @old_identity if author_is_new_id?
+
         author
       end
 
       # Returns diaspora* ID of the new person identity.
       # @return [String] diaspora* ID of the new person identity
       def new_identity
-        profile.author if profile
+        profile&.author
       end
 
       # @return [String] string representation of this object
@@ -90,6 +93,7 @@ module DiasporaFederation
       def sign_with_respective_key
         privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, signer_id)
         raise PrivateKeyNotFound, "signer=#{signer_id} obj=#{self}" if privkey.nil?
+
         sign_with_key(privkey).tap do
           logger.info "event=sign status=complete signature=signature signer=#{signer_id} obj=#{self}"
         end

data/lib/diaspora_federation/entities/comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a comment to some kind of post (e.g. status message).
@@ -5,7 +7,7 @@ module DiasporaFederation
     # @see Validators::CommentValidator
     class Comment < Entity
       # The {Comment} parent is a {Post}
-      PARENT_TYPE = "Post".freeze
+      PARENT_TYPE = "Post"
 
       include Relayable
 

data/lib/diaspora_federation/entities/contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a contact with another person. A user issues it

data/lib/diaspora_federation/entities/conversation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a private conversation between users.
@@ -8,7 +10,7 @@ module DiasporaFederation
       #   The diaspora* ID of the person initiated the conversation
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] guid
       #   A random string of at least 16 chars
@@ -27,7 +29,7 @@ module DiasporaFederation
       # @!attribute [r] participants
       #   The diaspora* IDs of the persons participating the conversation separated by ";"
       #   @return [String] participants diaspora* IDs
-      property :participants, :string, xml_name: :participant_handles
+      property :participants, :string
 
       # @!attribute [r] messages
       #   @return [[Entities::Message]] Messages of this conversation

data/lib/diaspora_federation/entities/embed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity is used to specify embed information about an URL that should be embedded.

data/lib/diaspora_federation/entities/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents an event and it is federated as a part of a status message.

data/lib/diaspora_federation/entities/event_participation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a participation in an event, i.e. it is issued when a user responds to en event.
@@ -5,7 +7,7 @@ module DiasporaFederation
     # @see Validators::EventParticipationValidator
     class EventParticipation < Entity
       # The {EventParticipation} parent is an {Event}
-      PARENT_TYPE = "Event".freeze
+      PARENT_TYPE = "Event"
 
       include Relayable
 

data/lib/diaspora_federation/entities/like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a like to some kind of post (e.g. status message).
@@ -11,7 +13,7 @@ module DiasporaFederation
       #   Can be "Post" or "Comment" (Comments are currently not implemented in the
       #   diaspora* frontend).
       #   @return [String] parent type
-      property :parent_type, :string, xml_name: :target_type
+      property :parent_type, :string
 
       # @!attribute [r] positive
       #   If +true+ set a like, if +false+, set a dislike (dislikes are currently not

data/lib/diaspora_federation/entities/location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity is used to specify location data and used embedded in a status message.

data/lib/diaspora_federation/entities/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a private message exchanged in private conversation.
@@ -8,7 +10,7 @@ module DiasporaFederation
       #   The diaspora* ID of the author
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] guid
       #   A random string of at least 16 chars

data/lib/diaspora_federation/entities/participation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # Participation is sent to subscribe a user on updates for some post.
@@ -8,7 +10,7 @@ module DiasporaFederation
       #   The diaspora* ID of the author
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] guid
       #   A random string of at least 16 chars
@@ -25,7 +27,7 @@ module DiasporaFederation
       #   A string describing a type of the target to subscribe on
       #   Currently only "Post" is supported.
       #   @return [String] parent type
-      property :parent_type, :string, xml_name: :target_type
+      property :parent_type, :string
 
       # @return [String] string representation of this object
       def to_s
@@ -35,7 +37,7 @@ module DiasporaFederation
       # Validates that the parent exists and the parent author is local
       def validate_parent
         parent = DiasporaFederation.callbacks.trigger(:fetch_related_entity, parent_type, parent_guid)
-        raise ParentNotLocal, "obj=#{self}" unless parent && parent.local
+        raise ParentNotLocal, "obj=#{self}" unless parent&.local
       end
 
       # Validate that the parent is local.

data/lib/diaspora_federation/entities/person.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity contains the base data of a person.
@@ -19,7 +21,7 @@ module DiasporaFederation
       #   alias for author
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, alias: :diaspora_id, xml_name: :diaspora_handle
+      property :author, :string, alias: :diaspora_id
 
       # @!attribute [r] url
       #   @see Discovery::WebFinger#seed_url

data/lib/diaspora_federation/entities/photo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a photo and it is federated as a part of a status message.
@@ -14,7 +16,7 @@ module DiasporaFederation
       #   The diaspora* ID of the person who uploaded the photo
       #   @see Person#author
       #   @return [String] author diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] public
       #   Points if the photo is visible to everyone or only to some aspects