Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.
This commit is contained in:
27
app/lib/activitypub/parser/custom_emoji_parser.rb
Normal file
27
app/lib/activitypub/parser/custom_emoji_parser.rb
Normal file
@ -0,0 +1,27 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::Parser::CustomEmojiParser
|
||||
include JsonLdHelper
|
||||
|
||||
def initialize(json)
|
||||
@json = json
|
||||
end
|
||||
|
||||
def uri
|
||||
@json['id']
|
||||
end
|
||||
|
||||
def shortcode
|
||||
@json['name']&.delete(':')
|
||||
end
|
||||
|
||||
def image_remote_url
|
||||
@json.dig('icon', 'url')
|
||||
end
|
||||
|
||||
def updated_at
|
||||
@json['updated']&.to_datetime
|
||||
rescue ArgumentError
|
||||
nil
|
||||
end
|
||||
end
|
58
app/lib/activitypub/parser/media_attachment_parser.rb
Normal file
58
app/lib/activitypub/parser/media_attachment_parser.rb
Normal file
@ -0,0 +1,58 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::Parser::MediaAttachmentParser
|
||||
include JsonLdHelper
|
||||
|
||||
def initialize(json)
|
||||
@json = json
|
||||
end
|
||||
|
||||
# @param [MediaAttachment] previous_record
|
||||
def significantly_changes?(previous_record)
|
||||
remote_url != previous_record.remote_url ||
|
||||
thumbnail_remote_url != previous_record.thumbnail_remote_url ||
|
||||
description != previous_record.description
|
||||
end
|
||||
|
||||
def remote_url
|
||||
Addressable::URI.parse(@json['url'])&.normalize&.to_s
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
nil
|
||||
end
|
||||
|
||||
def thumbnail_remote_url
|
||||
Addressable::URI.parse(@json['icon'].is_a?(Hash) ? @json['icon']['url'] : @json['icon'])&.normalize&.to_s
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
nil
|
||||
end
|
||||
|
||||
def description
|
||||
@json['summary'].presence || @json['name'].presence
|
||||
end
|
||||
|
||||
def focus
|
||||
@json['focalPoint']
|
||||
end
|
||||
|
||||
def blurhash
|
||||
supported_blurhash? ? @json['blurhash'] : nil
|
||||
end
|
||||
|
||||
def file_content_type
|
||||
@json['mediaType']
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def supported_blurhash?
|
||||
components = begin
|
||||
blurhash = @json['blurhash']
|
||||
|
||||
if blurhash.present? && /^[\w#$%*+-.:;=?@\[\]^{|}~]+$/.match?(blurhash)
|
||||
Blurhash.components(blurhash)
|
||||
end
|
||||
end
|
||||
|
||||
components.present? && components.none? { |comp| comp > 5 }
|
||||
end
|
||||
end
|
53
app/lib/activitypub/parser/poll_parser.rb
Normal file
53
app/lib/activitypub/parser/poll_parser.rb
Normal file
@ -0,0 +1,53 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::Parser::PollParser
|
||||
include JsonLdHelper
|
||||
|
||||
def initialize(json)
|
||||
@json = json
|
||||
end
|
||||
|
||||
def valid?
|
||||
equals_or_includes?(@json['type'], 'Question') && items.is_a?(Array)
|
||||
end
|
||||
|
||||
# @param [Poll] previous_record
|
||||
def significantly_changes?(previous_record)
|
||||
options != previous_record.options ||
|
||||
multiple != previous_record.multiple
|
||||
end
|
||||
|
||||
def options
|
||||
items.filter_map { |item| item['name'].presence || item['content'] }
|
||||
end
|
||||
|
||||
def multiple
|
||||
@json['anyOf'].is_a?(Array)
|
||||
end
|
||||
|
||||
def expires_at
|
||||
if @json['closed'].is_a?(String)
|
||||
@json['closed'].to_datetime
|
||||
elsif !@json['closed'].nil? && !@json['closed'].is_a?(FalseClass)
|
||||
Time.now.utc
|
||||
else
|
||||
@json['endTime']&.to_datetime
|
||||
end
|
||||
rescue ArgumentError
|
||||
nil
|
||||
end
|
||||
|
||||
def voters_count
|
||||
@json['votersCount']
|
||||
end
|
||||
|
||||
def cached_tallies
|
||||
items.map { |item| item.dig('replies', 'totalItems') || 0 }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def items
|
||||
@json['anyOf'] || @json['oneOf']
|
||||
end
|
||||
end
|
124
app/lib/activitypub/parser/status_parser.rb
Normal file
124
app/lib/activitypub/parser/status_parser.rb
Normal file
@ -0,0 +1,124 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::Parser::StatusParser
|
||||
include JsonLdHelper
|
||||
|
||||
# @param [Hash] json
|
||||
# @param [Hash] magic_values
|
||||
# @option magic_values [String] :followers_collection
|
||||
def initialize(json, magic_values = {})
|
||||
@json = json
|
||||
@object = json['object'] || json
|
||||
@magic_values = magic_values
|
||||
end
|
||||
|
||||
def uri
|
||||
id = @object['id']
|
||||
|
||||
if id&.start_with?('bear:')
|
||||
Addressable::URI.parse(id).query_values['u']
|
||||
else
|
||||
id
|
||||
end
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
id
|
||||
end
|
||||
|
||||
def url
|
||||
url_to_href(@object['url'], 'text/html') if @object['url'].present?
|
||||
end
|
||||
|
||||
def text
|
||||
if @object['content'].present?
|
||||
@object['content']
|
||||
elsif content_language_map?
|
||||
@object['contentMap'].values.first
|
||||
end
|
||||
end
|
||||
|
||||
def spoiler_text
|
||||
if @object['summary'].present?
|
||||
@object['summary']
|
||||
elsif summary_language_map?
|
||||
@object['summaryMap'].values.first
|
||||
end
|
||||
end
|
||||
|
||||
def title
|
||||
if @object['name'].present?
|
||||
@object['name']
|
||||
elsif name_language_map?
|
||||
@object['nameMap'].values.first
|
||||
end
|
||||
end
|
||||
|
||||
def created_at
|
||||
@object['published']&.to_datetime
|
||||
rescue ArgumentError
|
||||
nil
|
||||
end
|
||||
|
||||
def edited_at
|
||||
@object['updated']&.to_datetime
|
||||
rescue ArgumentError
|
||||
nil
|
||||
end
|
||||
|
||||
def reply
|
||||
@object['inReplyTo'].present?
|
||||
end
|
||||
|
||||
def sensitive
|
||||
@object['sensitive']
|
||||
end
|
||||
|
||||
def visibility
|
||||
if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
|
||||
:public
|
||||
elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
|
||||
:unlisted
|
||||
elsif audience_to.include?(@magic_values[:followers_collection])
|
||||
:private
|
||||
elsif direct_message == false
|
||||
:limited
|
||||
else
|
||||
:direct
|
||||
end
|
||||
end
|
||||
|
||||
def language
|
||||
if content_language_map?
|
||||
@object['contentMap'].keys.first
|
||||
elsif name_language_map?
|
||||
@object['nameMap'].keys.first
|
||||
elsif summary_language_map?
|
||||
@object['summaryMap'].keys.first
|
||||
end
|
||||
end
|
||||
|
||||
def direct_message
|
||||
@object['directMessage']
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def audience_to
|
||||
as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
|
||||
end
|
||||
|
||||
def audience_cc
|
||||
as_array(@object['cc'] || @json['cc']).map { |x| value_or_id(x) }
|
||||
end
|
||||
|
||||
def summary_language_map?
|
||||
@object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
|
||||
end
|
||||
|
||||
def content_language_map?
|
||||
@object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty?
|
||||
end
|
||||
|
||||
def name_language_map?
|
||||
@object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty?
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user