mastodon/app/lib
Claire fe89554a54 Merge branch 'main' into glitch-soc/merge-upstream
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.
2022-01-19 23:52:48 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-01-19 23:52:48 +01:00
admin Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
connection_pool
nodeinfo
ostatus
rss
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
access_token_extension.rb
account_reach_finder.rb Fix remote reporters not receiving suspend/unsuspend activities (#16050) 2021-04-17 14:55:46 +02:00
activity_tracker.rb Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
application_extension.rb Fix app name, website and redirect URIs not having a maximum length (#16042) 2021-04-15 16:28:43 +02:00
cache_buster.rb
delivery_failure_tracker.rb Add management of delivery availability in Federation settings (#15771) 2021-05-05 23:39:02 +02:00
entity_cache.rb
extractor.rb
fast_geometry_parser.rb Switch from unmaintained paperclip to kt-paperclip (#16724) 2021-09-29 23:52:36 +02:00
fast_ip_map.rb
feed_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-19 23:52:48 +01:00
formatter.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-17 17:45:35 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb
link_details_extractor.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
permalink_redirector.rb Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
potential_friendship_tracker.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
rate_limiter.rb
request.rb Add support for structured data and more OpenGraph tags to link cards (#16938) 2021-11-05 23:23:05 +01:00
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 Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
tag_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
themes.rb Refactor theme config loading 2022-01-16 22:26:18 +01:00
toc_generator.rb
user_settings_decorator.rb
validation_error_formatter.rb
video_metadata_extractor.rb Fix media processing getting stuck on too much stdin/stderr (#16136) 2021-05-05 19:44:01 +02:00
webfinger.rb Fix confusing error when webfinger request returns empty document (#16986) 2021-11-14 21:55:40 +01:00
webfinger_resource.rb