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:
		@@ -11,6 +11,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 | 
			
		||||
 | 
			
		||||
  attribute :content
 | 
			
		||||
  attribute :content_map, if: :language?
 | 
			
		||||
  attribute :updated, if: :edited?
 | 
			
		||||
 | 
			
		||||
  attribute :direct_message, if: :non_public?
 | 
			
		||||
 | 
			
		||||
@@ -76,6 +77,8 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 | 
			
		||||
    object.language.present?
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  delegate :edited?, to: :object
 | 
			
		||||
 | 
			
		||||
  def in_reply_to
 | 
			
		||||
    return unless object.reply? && !object.thread.nil?
 | 
			
		||||
 | 
			
		||||
@@ -90,6 +93,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 | 
			
		||||
    object.created_at.iso8601
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def updated
 | 
			
		||||
    object.edited_at.iso8601
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def url
 | 
			
		||||
    ActivityPub::TagManager.instance.url_for(object)
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user