You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
chewy	Add trending links (#16917)	3 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mailers	Add notifications for statuses deleted by moderators (#17204)	3 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream	3 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago