mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 04:07:45 +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 | ||
| api | ||
| auth | ||
| concerns | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller.rb | ||
| account_follow_controller.rb | ||
| account_unfollow_controller.rb | ||
| accounts_controller.rb | ||
| application_controller.rb | ||
| authorize_interactions_controller.rb | ||
| custom_css_controller.rb | ||
| directories_controller.rb | ||
| emojis_controller.rb | ||
| filters_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| health_controller.rb | ||
| home_controller.rb | ||
| instance_actors_controller.rb | ||
| intents_controller.rb | ||
| invites_controller.rb | ||
| manifests_controller.rb | ||
| media_controller.rb | ||
| media_proxy_controller.rb | ||
| public_timelines_controller.rb | ||
| relationships_controller.rb | ||
| remote_follow_controller.rb | ||
| remote_interaction_controller.rb | ||
| shares_controller.rb | ||
| statuses_cleanup_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||