mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09: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. |
||
|---|---|---|
| .. | ||
| accept_follow_serializer.rb | ||
| activity_serializer.rb | ||
| actor_serializer.rb | ||
| add_serializer.rb | ||
| block_serializer.rb | ||
| collection_serializer.rb | ||
| delete_actor_serializer.rb | ||
| delete_serializer.rb | ||
| device_serializer.rb | ||
| emoji_serializer.rb | ||
| encrypted_message_serializer.rb | ||
| flag_serializer.rb | ||
| follow_serializer.rb | ||
| hashtag_serializer.rb | ||
| image_serializer.rb | ||
| like_serializer.rb | ||
| move_serializer.rb | ||
| note_serializer.rb | ||
| one_time_key_serializer.rb | ||
| outbox_serializer.rb | ||
| public_key_serializer.rb | ||
| reject_follow_serializer.rb | ||
| remove_serializer.rb | ||
| undo_announce_serializer.rb | ||
| undo_block_serializer.rb | ||
| undo_follow_serializer.rb | ||
| undo_like_serializer.rb | ||
| update_poll_serializer.rb | ||
| update_serializer.rb | ||
| vote_serializer.rb | ||