Remove unused E2EE messaging code (#31193)
This commit is contained in:
		@@ -5,8 +5,6 @@ class ActivityPub::ActivitySerializer < ActivityPub::Serializer
 | 
			
		||||
    case model.class.name
 | 
			
		||||
    when 'Status'
 | 
			
		||||
      ActivityPub::NoteSerializer
 | 
			
		||||
    when 'DeliverToDeviceService::EncryptedMessage'
 | 
			
		||||
      ActivityPub::EncryptedMessageSerializer
 | 
			
		||||
    else
 | 
			
		||||
      super
 | 
			
		||||
    end
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
 | 
			
		||||
  context :security
 | 
			
		||||
 | 
			
		||||
  context_extensions :manually_approves_followers, :featured, :also_known_as,
 | 
			
		||||
                     :moved_to, :property_value, :discoverable, :olm, :suspended,
 | 
			
		||||
                     :moved_to, :property_value, :discoverable, :suspended,
 | 
			
		||||
                     :memorial, :indexable, :attribution_domains
 | 
			
		||||
 | 
			
		||||
  attributes :id, :type, :following, :followers,
 | 
			
		||||
@@ -21,7 +21,6 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
 | 
			
		||||
  has_many :virtual_tags, key: :tag
 | 
			
		||||
  has_many :virtual_attachments, key: :attachment
 | 
			
		||||
 | 
			
		||||
  attribute :devices, unless: :instance_actor?
 | 
			
		||||
  attribute :moved_to, if: :moved?
 | 
			
		||||
  attribute :also_known_as, if: :also_known_as?
 | 
			
		||||
  attribute :suspended, if: :suspended?
 | 
			
		||||
@@ -72,10 +71,6 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
 | 
			
		||||
    object.instance_actor? ? instance_actor_inbox_url : account_inbox_url(object)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def devices
 | 
			
		||||
    account_collection_url(object, :devices)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def outbox
 | 
			
		||||
    object.instance_actor? ? instance_actor_outbox_url : account_outbox_url(object)
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
@@ -14,8 +14,6 @@ class ActivityPub::CollectionSerializer < ActivityPub::Serializer
 | 
			
		||||
    case model.class.name
 | 
			
		||||
    when 'Status'
 | 
			
		||||
      ActivityPub::NoteSerializer
 | 
			
		||||
    when 'Device'
 | 
			
		||||
      ActivityPub::DeviceSerializer
 | 
			
		||||
    when 'FeaturedTag'
 | 
			
		||||
      ActivityPub::HashtagSerializer
 | 
			
		||||
    when 'ActivityPub::CollectionPresenter'
 | 
			
		||||
 
 | 
			
		||||
@@ -1,52 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class ActivityPub::DeviceSerializer < ActivityPub::Serializer
 | 
			
		||||
  context_extensions :olm
 | 
			
		||||
 | 
			
		||||
  include RoutingHelper
 | 
			
		||||
 | 
			
		||||
  class FingerprintKeySerializer < ActivityPub::Serializer
 | 
			
		||||
    attributes :type, :public_key_base64
 | 
			
		||||
 | 
			
		||||
    def type
 | 
			
		||||
      'Ed25519Key'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def public_key_base64
 | 
			
		||||
      object.fingerprint_key
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  class IdentityKeySerializer < ActivityPub::Serializer
 | 
			
		||||
    attributes :type, :public_key_base64
 | 
			
		||||
 | 
			
		||||
    def type
 | 
			
		||||
      'Curve25519Key'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def public_key_base64
 | 
			
		||||
      object.identity_key
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  attributes :device_id, :type, :name, :claim
 | 
			
		||||
 | 
			
		||||
  has_one :fingerprint_key, serializer: FingerprintKeySerializer
 | 
			
		||||
  has_one :identity_key, serializer: IdentityKeySerializer
 | 
			
		||||
 | 
			
		||||
  def type
 | 
			
		||||
    'Device'
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def claim
 | 
			
		||||
    account_claim_url(object.account, id: object.device_id)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def fingerprint_key
 | 
			
		||||
    object
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def identity_key
 | 
			
		||||
    object
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -1,61 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class ActivityPub::EncryptedMessageSerializer < ActivityPub::Serializer
 | 
			
		||||
  context :security
 | 
			
		||||
 | 
			
		||||
  context_extensions :olm
 | 
			
		||||
 | 
			
		||||
  class DeviceSerializer < ActivityPub::Serializer
 | 
			
		||||
    attributes :type, :device_id
 | 
			
		||||
 | 
			
		||||
    def type
 | 
			
		||||
      'Device'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def device_id
 | 
			
		||||
      object
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  class DigestSerializer < ActivityPub::Serializer
 | 
			
		||||
    attributes :type, :digest_algorithm, :digest_value
 | 
			
		||||
 | 
			
		||||
    def type
 | 
			
		||||
      'Digest'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def digest_algorithm
 | 
			
		||||
      'http://www.w3.org/2000/09/xmldsig#hmac-sha256'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def digest_value
 | 
			
		||||
      object
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  attributes :type, :message_type, :cipher_text, :message_franking
 | 
			
		||||
 | 
			
		||||
  has_one :attributed_to, serializer: DeviceSerializer
 | 
			
		||||
  has_one :to, serializer: DeviceSerializer
 | 
			
		||||
  has_one :digest, serializer: DigestSerializer
 | 
			
		||||
 | 
			
		||||
  def type
 | 
			
		||||
    'EncryptedMessage'
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def attributed_to
 | 
			
		||||
    object.source_device.device_id
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def to
 | 
			
		||||
    object.target_device_id
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def message_type
 | 
			
		||||
    object.type
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def cipher_text
 | 
			
		||||
    object.body
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -1,35 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class ActivityPub::OneTimeKeySerializer < ActivityPub::Serializer
 | 
			
		||||
  context :security
 | 
			
		||||
 | 
			
		||||
  context_extensions :olm
 | 
			
		||||
 | 
			
		||||
  class SignatureSerializer < ActivityPub::Serializer
 | 
			
		||||
    attributes :type, :signature_value
 | 
			
		||||
 | 
			
		||||
    def type
 | 
			
		||||
      'Ed25519Signature'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def signature_value
 | 
			
		||||
      object.signature
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  attributes :key_id, :type, :public_key_base64
 | 
			
		||||
 | 
			
		||||
  has_one :signature, serializer: SignatureSerializer
 | 
			
		||||
 | 
			
		||||
  def type
 | 
			
		||||
    'Curve25519Key'
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def public_key_base64
 | 
			
		||||
    object.key
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def signature
 | 
			
		||||
    object
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -1,19 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class REST::EncryptedMessageSerializer < ActiveModel::Serializer
 | 
			
		||||
  attributes :id, :account_id, :device_id,
 | 
			
		||||
             :type, :body, :digest, :message_franking,
 | 
			
		||||
             :created_at
 | 
			
		||||
 | 
			
		||||
  def id
 | 
			
		||||
    object.id.to_s
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def account_id
 | 
			
		||||
    object.from_account_id.to_s
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def device_id
 | 
			
		||||
    object.from_device_id
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -1,9 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class REST::Keys::ClaimResultSerializer < ActiveModel::Serializer
 | 
			
		||||
  attributes :account_id, :device_id, :key_id, :key, :signature
 | 
			
		||||
 | 
			
		||||
  def account_id
 | 
			
		||||
    object.account.id.to_s
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -1,6 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class REST::Keys::DeviceSerializer < ActiveModel::Serializer
 | 
			
		||||
  attributes :device_id, :name, :identity_key,
 | 
			
		||||
             :fingerprint_key
 | 
			
		||||
end
 | 
			
		||||
@@ -1,11 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class REST::Keys::QueryResultSerializer < ActiveModel::Serializer
 | 
			
		||||
  attributes :account_id
 | 
			
		||||
 | 
			
		||||
  has_many :devices, serializer: REST::Keys::DeviceSerializer
 | 
			
		||||
 | 
			
		||||
  def account_id
 | 
			
		||||
    object.account.id.to_s
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user