]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 19 Jan 2022 22:19:00 +0000 (23:19 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 19 Jan 2022 22:52:48 +0000 (23:52 +0100)
commitfe89554a5423da2bbc8c337cb8f1c43d1631c9bb
treebe41a81ade89535f81bdb8c6751534c795df84b0
parentb209e919bddb4bb72bb4f8589f4b15654f22ef53
parentd412a8d1f239aa93a92f420127cb3183a8bb6449
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.
12 files changed:
app/javascript/styles/mastodon/components.scss
app/lib/activitypub/activity/create.rb
app/lib/activitypub/parser/status_parser.rb
app/lib/feed_manager.rb
app/models/status.rb
app/serializers/activitypub/note_serializer.rb
app/serializers/rest/status_serializer.rb
app/services/fan_out_on_write_service.rb
app/services/remove_status_service.rb
app/workers/feed_insert_worker.rb
config/routes.rb
db/schema.rb