diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 23:19:00 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 23:52:48 +0100 |
commit | fe89554a5423da2bbc8c337cb8f1c43d1631c9bb (patch) | |
tree | be41a81ade89535f81bdb8c6751534c795df84b0 /config/initializers/ffmpeg.rb | |
parent | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (diff) | |
parent | d412a8d1f239aa93a92f420127cb3183a8bb6449 (diff) |
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.
Diffstat (limited to 'config/initializers/ffmpeg.rb')
0 files changed, 0 insertions, 0 deletions