mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-25 10:17:47 +00:00
fe89554a54
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. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
scheduler | ||
web | ||
account_deletion_worker.rb | ||
account_merging_worker.rb | ||
after_account_domain_block_worker.rb | ||
after_unallow_domain_worker.rb | ||
authorize_follow_worker.rb | ||
backup_worker.rb | ||
block_worker.rb | ||
bootstrap_timeline_worker.rb | ||
cache_buster_worker.rb | ||
delete_mute_worker.rb | ||
digest_mailer_worker.rb | ||
distribution_worker.rb | ||
domain_block_worker.rb | ||
domain_clear_media_worker.rb | ||
feed_insert_worker.rb | ||
fetch_reply_worker.rb | ||
import_worker.rb | ||
link_crawl_worker.rb | ||
local_notification_worker.rb | ||
merge_worker.rb | ||
move_worker.rb | ||
mute_worker.rb | ||
poll_expiration_notify_worker.rb | ||
post_process_media_worker.rb | ||
publish_announcement_reaction_worker.rb | ||
publish_scheduled_announcement_worker.rb | ||
publish_scheduled_status_worker.rb | ||
push_conversation_worker.rb | ||
push_encrypted_message_worker.rb | ||
push_update_worker.rb | ||
redownload_avatar_worker.rb | ||
redownload_header_worker.rb | ||
redownload_media_worker.rb | ||
refollow_worker.rb | ||
regeneration_worker.rb | ||
remote_account_refresh_worker.rb | ||
removal_worker.rb | ||
resolve_account_worker.rb | ||
thread_resolve_worker.rb | ||
unfavourite_worker.rb | ||
unfollow_follow_worker.rb | ||
unmerge_worker.rb | ||
unpublish_announcement_worker.rb | ||
verify_account_links_worker.rb |