mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 17:13:41 +01:00
fe89554a54
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. |
||
|---|---|---|
| .. | ||
| importer | ||
| push_notifications | ||
| account_notes.js | ||
| accounts.js | ||
| alerts.js | ||
| announcements.js | ||
| app.js | ||
| blocks.js | ||
| bookmarks.js | ||
| boosts.js | ||
| bundles.js | ||
| columns.js | ||
| compose.js | ||
| conversations.js | ||
| custom_emojis.js | ||
| directory.js | ||
| domain_blocks.js | ||
| dropdown_menu.js | ||
| emojis.js | ||
| favourites.js | ||
| filters.js | ||
| height_cache.js | ||
| interactions.js | ||
| lists.js | ||
| markers.js | ||
| modal.js | ||
| mutes.js | ||
| notifications.js | ||
| onboarding.js | ||
| picture_in_picture.js | ||
| pin_statuses.js | ||
| polls.js | ||
| reports.js | ||
| search.js | ||
| settings.js | ||
| statuses.js | ||
| store.js | ||
| streaming.js | ||
| suggestions.js | ||
| timelines.js | ||
| trends.js | ||