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 | ||
connection_pool | ||
nodeinfo | ||
ostatus | ||
rss | ||
settings | ||
access_token_extension.rb | ||
account_reach_finder.rb | ||
activity_tracker.rb | ||
application_extension.rb | ||
cache_buster.rb | ||
delivery_failure_tracker.rb | ||
entity_cache.rb | ||
extractor.rb | ||
fast_geometry_parser.rb | ||
fast_ip_map.rb | ||
feed_manager.rb | ||
formatter.rb | ||
hash_object.rb | ||
inline_renderer.rb | ||
language_detector.rb | ||
link_details_extractor.rb | ||
permalink_redirector.rb | ||
potential_friendship_tracker.rb | ||
rate_limiter.rb | ||
request.rb | ||
request_pool.rb | ||
response_with_limit.rb | ||
rss_builder.rb | ||
search_query_parser.rb | ||
search_query_transformer.rb | ||
status_filter.rb | ||
status_finder.rb | ||
status_reach_finder.rb | ||
tag_manager.rb | ||
themes.rb | ||
toc_generator.rb | ||
user_settings_decorator.rb | ||
validation_error_formatter.rb | ||
video_metadata_extractor.rb | ||
webfinger.rb | ||
webfinger_resource.rb |