mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-26 00:34:01 +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. |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
trends | ||
web | ||
account_alias_spec.rb | ||
account_conversation_spec.rb | ||
account_deletion_request_spec.rb | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_migration_spec.rb | ||
account_moderation_note_spec.rb | ||
account_spec.rb | ||
account_statuses_cleanup_policy_spec.rb | ||
announcement_mute_spec.rb | ||
announcement_reaction_spec.rb | ||
announcement_spec.rb | ||
backup_spec.rb | ||
block_spec.rb | ||
canonical_email_block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_category_spec.rb | ||
custom_emoji_filter_spec.rb | ||
custom_emoji_spec.rb | ||
custom_filter_spec.rb | ||
device_spec.rb | ||
domain_allow_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
encrypted_message_spec.rb | ||
export_spec.rb | ||
favourite_spec.rb | ||
featured_tag_spec.rb | ||
follow_recommendation_suppression_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
home_feed_spec.rb | ||
identity_spec.rb | ||
import_spec.rb | ||
invite_spec.rb | ||
ip_block_spec.rb | ||
list_account_spec.rb | ||
list_spec.rb | ||
login_activity_spec.rb | ||
marker_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
one_time_key_spec.rb | ||
poll_spec.rb | ||
poll_vote_spec.rb | ||
preview_card_spec.rb | ||
public_feed_spec.rb | ||
relationship_filter_spec.rb | ||
relay_spec.rb | ||
remote_follow_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
rule_spec.rb | ||
scheduled_status_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_edit_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
status_stat_spec.rb | ||
system_key_spec.rb | ||
tag_feed_spec.rb | ||
tag_spec.rb | ||
unavailable_domain_spec.rb | ||
user_invite_request_spec.rb | ||
user_spec.rb | ||
webauthn_credentials_spec.rb |