chuckya/spec/controllers/api/v1
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
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
admin Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
announcements Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
instances Add specs for Api::V1::Instances::PeersController (#9546) 2018-12-17 11:35:55 +01:00
lists Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
polls Add polls (#10111) 2019-03-03 22:18:23 +01:00
push Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
statuses Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
timelines Fix tests being broken because of different default setting 2019-09-13 20:28:22 +02:00
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
accounts_controller_spec.rb Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
announcements_controller_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps_controller_spec.rb Fix app name, website and redirect URIs not having a maximum length (#16042) 2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
bookmarks_controller_spec.rb Support min_id-based pagination for bookmarks (#12381) 2019-11-17 17:09:41 +01:00
conversations_controller_spec.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
custom_emojis_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
domain_blocks_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
endorsements_controller_spec.rb Add spec for Api::V1::EndorsementsController (#9543) 2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
filters_controller_spec.rb Add polls (#10111) 2019-03-03 22:18:23 +01:00
follow_requests_controller_spec.rb Change ResolveAccountService's handling of skip_webfinger (#15750) 2021-02-24 06:32:13 +01:00
instances_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
lists_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
markers_controller_spec.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_controller_spec.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
mutes_controller_spec.rb Remove glitch-soc specific and obsolete /api/v1/mutes/details 2020-10-21 21:28:47 +02:00
notifications_controller_spec.rb Change ResolveAccountService's handling of skip_webfinger (#15750) 2021-02-24 06:32:13 +01:00
polls_controller_spec.rb Fix poll API not requiring authentication on non-public polls (#10960) 2019-06-04 20:10:26 +02:00
reports_controller_spec.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
statuses_controller_spec.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
streaming_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
suggestions_controller_spec.rb Re-add follow recommendations API (#7918) 2018-07-03 01:47:56 +02:00