Merge latest Tusky develop into Dusky and handle collection notifications #1

Open
micke wants to merge 92 commits from merge/tusky-develop-2026-10-02 into develop
Owner

Merge 90 upstream commits through tusky/Tusky develop at 70d318a41 (2026-09-30). Use upstream behavior for shared features and retain Dusky's branding, defaults, Markdown/HTML posting and quote composition, which are still absent upstream.

Resolve the instance metadata and translation conflicts and advance the database to version 93 using Room auto-migrations.

Make Mastodon collection notifications tolerant of valid collection payloads: accept rejected/revoked item states and nullable remote descriptions. Keep referenced collections during database cleanup. Set the app version to 33.0-beta1-dusky2 (146), which can update the diagnostic build (145).

Validation: app:assembleBlueRelease completed successfully, Android release lint reported no new errors, and the release APK was signed with the supplied Dusky key and certificate and verified with apksigner. No additional tests were added. Actual delivery of a collection notification on a device remains to be verified.

Merge 90 upstream commits through tusky/Tusky develop at 70d318a41 (2026-09-30). Use upstream behavior for shared features and retain Dusky's branding, defaults, Markdown/HTML posting and quote composition, which are still absent upstream. Resolve the instance metadata and translation conflicts and advance the database to version 93 using Room auto-migrations. Make Mastodon collection notifications tolerant of valid collection payloads: accept rejected/revoked item states and nullable remote descriptions. Keep referenced collections during database cleanup. Set the app version to 33.0-beta1-dusky2 (146), which can update the diagnostic build (145). Validation: app:assembleBlueRelease completed successfully, Android release lint reported no new errors, and the release APK was signed with the supplied Dusky key and certificate and verified with apksigner. No additional tests were added. Actual delivery of a collection notification on a device remains to be verified.
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Andy Callisto <andycallisto@proton.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/uk/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Eric <alchemillatruth@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hans/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Hồ Nhất Duy <axicenia@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_PT/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: fin-w <fin-w@tutanota.com>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/cy/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Manuel <mannivuwiki@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/it/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/de/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Danial Behzadi <dani.behzi@ubuntu.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
Translation: Tusky/Tusky
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: José M. <xosem@disroot.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/gl/
Translation: Tusky/Tusky
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.work:work-testing](https://developer.android.com/jetpack/androidx/releases/work#2.11.2) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `2.11.0` → `2.11.2` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.work:work-testing/2.11.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.work:work-testing/2.11.0/2.11.2?slim=true) |
| [androidx.work:work-runtime-ktx](https://developer.android.com/jetpack/androidx/releases/work#2.11.2) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `2.11.0` → `2.11.2` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.work:work-runtime-ktx/2.11.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.work:work-runtime-ktx/2.11.0/2.11.2?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5490
Co-authored-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Co-committed-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Because these timelines are not ordered we can not correctly determine if a placeholder should be inserted, and when loading a placeholder we don't know how many to load. This then leads to this crash down the line:

<details>
  <summary>Stacktrace</summary>

  ```
 java.lang.IllegalArgumentException: Key "116301889753549194" was already used. If you are using LazyColumn/Row please make sure you provide a unique key for each item.
	at androidx.compose.ui.internal.InlineClassHelperKt.throwIllegalArgumentException(InlineClassHelper.kt:36)
	at androidx.compose.ui.layout.LayoutNodeSubcompositionsState.subcompose(SubcomposeLayout.kt:1366)
	at androidx.compose.ui.layout.LayoutNodeSubcompositionsState$Scope.subcompose(SubcomposeLayout.kt:1231)
	at androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScopeImpl.compose(LazyLayoutMeasureScope.kt:94)
	at androidx.compose.foundation.lazy.layout.LazyLayoutMeasuredItemProvider.getPlaceables-3p2s80s(LazyLayoutMeasuredItem.kt:60)
	at androidx.compose.foundation.lazy.LazyListMeasuredItemProvider.getAndMeasure-0kLqBqw(LazyListMeasuredItemProvider.kt:53)
	at androidx.compose.foundation.lazy.LazyListMeasuredItemProvider.getAndMeasure-0kLqBqw$default(LazyListMeasuredItemProvider.kt:47)
	at androidx.compose.foundation.lazy.LazyListMeasureKt.measureLazyList-LCrQqZ4(LazyListMeasure.kt:224)
  ```

</details>

Also fixes https://codeberg.org/tusky/Tusky/issues/3489

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5488
Reviewed-by: Tak <tak@noreply.codeberg.org>
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Co-authored-by: Conny Duck <git@connyduck.at>
Co-committed-by: Conny Duck <git@connyduck.at>
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [at.connyduck.sparkbutton:sparkbutton-compose](https://github.com/connyduck/SparkButton) | `1.0.0-beta1` → `1.0.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/at.connyduck.sparkbutton:sparkbutton-compose/1.0.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/at.connyduck.sparkbutton:sparkbutton-compose/1.0.0-beta1/1.0.0?slim=true) |

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5491
Co-authored-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Co-committed-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5489
Currently translated at 76.0% (583 of 767 strings)

Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/lv/
Translation: Tusky/Tusky
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [org.robolectric:robolectric](https://robolectric.org) ([source](https://github.com/robolectric/robolectric)) | `4.16` → `4.16.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/org.robolectric:robolectric/4.16.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.robolectric:robolectric/4.16/4.16.1?slim=true) |

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5492
Co-authored-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Co-committed-by: tusky-bot <tusky-bot@noreply.codeberg.org>
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [app.cash.licensee](https://github.com/cashapp/licensee) | `1.14.0` → `1.14.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/app.cash.licensee:app.cash.licensee.gradle.plugin/1.14.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/app.cash.licensee:app.cash.licensee.gradle.plugin/1.14.0/1.14.1?slim=true) |

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5493
Co-authored-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Co-committed-by: tusky-bot <tusky-bot@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5494
Currently translated at 76.0% (583 of 767 strings)

Co-authored-by: Edza <edzuslv@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/lv/
Translation: Tusky/Tusky
regression caused by https://codeberg.org/tusky/Tusky/pulls/5490

`Missing classes detected while running R8. Please add the missing classes or apply additional keep rules.`

🙄 🙄 🙄

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5495
Reviewed-by: Tak <tak@noreply.codeberg.org>
Co-authored-by: Conny Duck <git@connyduck.at>
Co-committed-by: Conny Duck <git@connyduck.at>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5496
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.hilt:hilt-work](https://developer.android.com/jetpack/androidx/releases/hilt#1.3.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.2.0` → `1.3.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.hilt:hilt-work/1.3.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.hilt:hilt-work/1.2.0/1.3.0?slim=true) |
| [androidx.hilt:hilt-compiler](https://developer.android.com/jetpack/androidx/releases/hilt#1.3.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.2.0` → `1.3.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.hilt:hilt-compiler/1.3.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.hilt:hilt-compiler/1.2.0/1.3.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5498
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.activity:activity-compose](https://developer.android.com/jetpack/androidx/releases/activity#1.13.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.12.2` → `1.13.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.activity:activity-compose/1.13.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.activity:activity-compose/1.12.2/1.13.0?slim=true) |
| [androidx.activity:activity](https://developer.android.com/jetpack/androidx/releases/activity#1.13.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.12.2` → `1.13.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.activity:activity/1.13.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.activity:activity/1.12.2/1.13.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5497
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [com.github.bumptech.glide:okhttp3-integration](https://github.com/bumptech/glide) | `5.0.5` → `5.0.7` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.github.bumptech.glide:okhttp3-integration/5.0.7?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.github.bumptech.glide:okhttp3-integration/5.0.5/5.0.7?slim=true) |
| [com.github.bumptech.glide:glide](https://github.com/bumptech/glide) | `5.0.5` → `5.0.7` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.github.bumptech.glide:glide/5.0.7?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.github.bumptech.glide:glide/5.0.5/5.0.7?slim=true) |
| [com.github.bumptech.glide:ksp](https://github.com/bumptech/glide) | `5.0.5` → `5.0.7` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.github.bumptech.glide:ksp/5.0.7?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.github.bumptech.glide:ksp/5.0.5/5.0.7?slim=true) |

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5503
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.lifecycle:lifecycle-viewmodel-compose](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.10.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `2.9.4` → `2.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.lifecycle:lifecycle-viewmodel-compose/2.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.lifecycle:lifecycle-viewmodel-compose/2.9.4/2.10.0?slim=true) |
| [androidx.lifecycle:lifecycle-viewmodel-ktx](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.10.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `2.9.4` → `2.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.lifecycle:lifecycle-viewmodel-ktx/2.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.lifecycle:lifecycle-viewmodel-ktx/2.9.4/2.10.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5504
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5506
Reviewed-by: Tak <tak@noreply.codeberg.org>
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
Translation: Tusky/Tusky
Currently translated at 77.4% (594 of 767 strings)

Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/lv/
Translation: Tusky/Tusky
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.media3:media3-ui](https://github.com/androidx/media) | `1.9.0` → `1.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-ui/1.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-ui/1.9.0/1.10.0?slim=true) |
| [androidx.media3:media3-datasource-okhttp](https://github.com/androidx/media) | `1.9.0` → `1.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-datasource-okhttp/1.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-datasource-okhttp/1.9.0/1.10.0?slim=true) |
| [androidx.media3:media3-exoplayer](https://github.com/androidx/media) | `1.9.0` → `1.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-exoplayer/1.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-exoplayer/1.9.0/1.10.0?slim=true) |

---

> ⚠️ **Warning**
>
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5505
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5499
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| cimg/android | minor | `2025.09.1` → `2025.12.1` |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5517
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.paging:paging-testing](https://developer.android.com/jetpack/androidx/releases/paging#3.5.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `3.3.6` → `3.5.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.paging:paging-testing/3.5.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.paging:paging-testing/3.3.6/3.5.0?slim=true) |
| [androidx.paging:paging-runtime-ktx](https://developer.android.com/jetpack/androidx/releases/paging#3.5.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `3.3.6` → `3.5.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.paging:paging-runtime-ktx/3.5.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.paging:paging-runtime-ktx/3.3.6/3.5.0?slim=true) |
| [androidx.paging:paging-compose](https://developer.android.com/jetpack/androidx/releases/paging#3.5.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `3.3.6` → `3.5.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.paging:paging-compose/3.5.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.paging:paging-compose/3.3.6/3.5.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5509
Translations update from [Weblate](https://weblate.tusky.app) for [Tusky/Tusky](https://weblate.tusky.app/projects/tusky/tusky/).

Current translation status:

![Weblate translation status](https://weblate.tusky.app/widget/tusky/tusky/horizontal-auto.svg)

Co-authored-by: Weblate <noreply@weblate.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5510
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.media3:media3-ui](https://github.com/androidx/media) | `1.10.0` → `1.10.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-ui/1.10.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-ui/1.10.0/1.10.1?slim=true) |
| [androidx.media3:media3-datasource-okhttp](https://github.com/androidx/media) | `1.10.0` → `1.10.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-datasource-okhttp/1.10.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-datasource-okhttp/1.10.0/1.10.1?slim=true) |
| [androidx.media3:media3-exoplayer](https://github.com/androidx/media) | `1.10.0` → `1.10.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.media3:media3-exoplayer/1.10.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.media3:media3-exoplayer/1.10.0/1.10.1?slim=true) |

> ❗ **Important**
>
> Release Notes retrieval for this PR were skipped because no github.com credentials were available.
> If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [x] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5515
As seen in https://matrix.to/#/!WHaapjQuDlPPKFNMwD:matrix.org/$TpnnN7n-pcxvoD0yW3hR2HFc5vETlrpGGjtdKuYpdoA

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5523
Reviewed-by: connyduck <connyduck@noreply.codeberg.org>
closes https://codeberg.org/tusky/Tusky/issues/5518

We do the same for our client side filters (hide boosts, hide self-boosts, hide replies) already.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5519
Reviewed-by: Tak <tak@noreply.codeberg.org>
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: Bruno Miguel <brunoalexandremiguel@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_PT/
Translation: Tusky/Tusky
This adds support for the notification types `added_to_collection` and `collection_update`, including opening the collection when tapping and being able to reject your addition to the collection.

Collections are coming in mastodon 4.6, but of course they're already live on mastodon.social

The first part of #5520

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5522
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5526
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.browser:browser](https://developer.android.com/jetpack/androidx/releases/browser#1.10.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.9.0` → `1.10.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.browser:browser/1.10.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.browser:browser/1.9.0/1.10.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5528
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.compose:compose-bom](https://developer.android.com/jetpack) | `2025.11.01` → `2025.12.01` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.compose:compose-bom/2025.12.01?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.compose:compose-bom/2025.11.01/2025.12.01?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5529
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.swiperefreshlayout:swiperefreshlayout](https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout#1.2.0) ([source](https://cs.android.com/androidx/platform/frameworks/support)) | `1.1.0` → `1.2.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.2.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.1.0/1.2.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5534
Fixes https://codeberg.org/tusky/Tusky/issues/5512

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5531
Reviewed-by: connyduck <connyduck@noreply.codeberg.org>
closes https://codeberg.org/tusky/Tusky/issues/5525

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5530
Reviewed-by: Tak <tak@noreply.codeberg.org>
closes https://codeberg.org/tusky/Tusky/issues/5532

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5535
Reviewed-by: Tak <tak@noreply.codeberg.org>
- Fix NullPointerException when collection notification has no collection
- Consider collection curator accounts when determining if accounts should be cleaned up

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5537
This will be useful for the Compose refactor of the Compose screen and is a futile attempt of keeping the diff for that short.
Unfortunately the row in quotes is too different, but I could simplify it a bit.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5540
Reviewed-by: Tak <tak@noreply.codeberg.org>
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [androidx.test.ext:junit](https://developer.android.com/testing) | `1.2.1` → `1.3.0` | ![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.test.ext:junit/1.3.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.test.ext:junit/1.2.1/1.3.0?slim=true) |

---

### Configuration

📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiZGVwZW5kZW5jeSJdfQ==-->

Co-authored-by: Tusky Renovate <renovate@tusky.app>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5536
`actionableStatus`, classic 😅

closes https://codeberg.org/tusky/Tusky/issues/5541

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5542
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Reviewed-by: Tak <tak@noreply.codeberg.org>
Currently translated at 100.0% (767 of 767 strings)

Co-authored-by: José M. <xosem@disroot.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/gl/
Translation: Tusky/Tusky
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5548
OkHttp is configured with a disk cache and Exoplayer uses it for downloads. But the OkHttp cache can only cache videos when they are downloaded in one go, so if Exoplayer loads them in chunks (≈longer videos) they won't be cached und downloaded for every play. This solves the problem by adding another cache on Exoplayer side. I checked, and when configured with a cache, Exoplayer requests videos as uncacheable from OkHttp so they are not cached twice.

closes https://codeberg.org/tusky/Tusky/issues/4873

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5547
Reviewed-by: Tak <tak@noreply.codeberg.org>
I added all the new account params we don't support to InstanceInfo, even those that we don't use because we should use them in the future and that will make it easier.
Added timeline disabled functionality, which will be useful for mastodon.social and mastodon.online users where the local and federaded timeline are usually off.
Also included a fix for a bug I hit were InstanceInfoRepository would sometimes return the info for the wrong instance.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5549
Reviewed-by: Tak <tak@noreply.codeberg.org>
Currently translated at 100.0% (781 of 781 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (780 of 780 strings)

Co-authored-by: Hồ Nhất Duy <axicenia@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/
Translation: Tusky/Tusky
Currently translated at 100.0% (781 of 781 strings)

Co-authored-by: ERyPTION <eryption.ar9q2@slmail.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/da/
Translation: Tusky/Tusky
Currently translated at 100.0% (781 of 781 strings)

Co-authored-by: Eric <alchemillatruth@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hans/
Translation: Tusky/Tusky
Currently translated at 100.0% (780 of 780 strings)

Co-authored-by: Andy Callisto <andycallisto@proton.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/uk/
Translation: Tusky/Tusky
Currently translated at 100.0% (781 of 781 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
Translation: Tusky/Tusky
Currently translated at 60.6% (474 of 781 strings)

Co-authored-by: ButterflyOfFire <butterflyoffire@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/
Translation: Tusky/Tusky
Currently translated at 100.0% (781 of 781 strings)

Translated using Weblate (Persian)

Currently translated at 100.0% (780 of 780 strings)

Co-authored-by: Danial Behzadi <dani.behzi@ubuntu.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
Translation: Tusky/Tusky
Currently translated at 100.0% (780 of 780 strings)

Co-authored-by: José M. <xosem@disroot.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/gl/
Translation: Tusky/Tusky
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5550
Misskey/Sharkey/Catodon and similar servers serve their /oauth/authorize as a
JavaScript SPA that reads localStorage during bootstrap. With
domStorageEnabled defaulting to false, localStorage access fails silently
and the SPA never mounts, leaving the user stuck on a spinner.

Setting domStorageEnabled = true fixes login on these servers without
affecting Mastodon-family servers, whose authorize page is server-rendered
and does not require storage.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5543
Reviewed-by: connyduck <connyduck@noreply.codeberg.org>
- open collections from links (this is how the "share collection" functionality works 🙄)
- display collection search results (mastodon (4.6.2) doesn't currently appear to actually _return_ results except when explicitly searching for a collection url, but I guess this will change)

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5551
Reviewed-by: connyduck <connyduck@noreply.codeberg.org>
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Andy Callisto <andycallisto@proton.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/uk/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Hồ Nhất Duy <axicenia@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Eric <alchemillatruth@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hans/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: ERyPTION <eryption.ar9q2@slmail.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/da/
Translation: Tusky/Tusky
Currently translated at 99.8% (782 of 783 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Danial Behzadi <dani.behzi@ubuntu.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
Translation: Tusky/Tusky
Currently translated at 99.6% (778 of 781 strings)

Co-authored-by: Felipe Espinosa <feldarec@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
Translation: Tusky/Tusky
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5552
Currently translated at 74.3% (582 of 783 strings)

Co-authored-by: /dev/urandom <hazardaj.nombroj@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
Translation: Tusky/Tusky
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5558
Reviewed-by: Tak <tak@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5556
This fixes an issue were links at the start of a paragraph would have way too large clickareas because they included the preceeding newline.
Happens for example with [this post](https://mastodon.bot/@trending/116931735391660059).

Similar to https://codeberg.org/tusky/Tusky/pulls/5535, just with links instead of emojis.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5559
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Fixes https://codeberg.org/tusky/Tusky/issues/5555

Seems to have been a bug in Compose.

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5560
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Reviewed-by: Tak <tak@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5561
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5573
Reviewed-by: Tak <tak@noreply.codeberg.org>
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5574
Reviewed-by: Martin Marconcini <gryzor@noreply.codeberg.org>
closes https://codeberg.org/tusky/Tusky/issues/5575

regression from https://codeberg.org/tusky/Tusky/pulls/5549

Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5576
Reviewed-by: Tak <tak@noreply.codeberg.org>
Currently translated at 100.0% (783 of 783 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Andy Callisto <andycallisto@proton.me>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/uk/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Bruno Miguel <brunoalexandremiguel@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_PT/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Translated using Weblate (German)

Currently translated at 100.0% (783 of 783 strings)

Translated using Weblate (German)

Currently translated at 98.4% (771 of 783 strings)

Co-authored-by: F Bausch <fbausch@users.noreply.weblate.tusky.app>
Co-authored-by: Voxel <voxel@users.noreply.weblate.tusky.app>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: zh000 <i.oez1@proton.me>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/de/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
Translation: Tusky/Tusky
Currently translated at 99.6% (780 of 783 strings)

Co-authored-by: Felipe Espinosa <feldarec@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
Translation: Tusky/Tusky
Currently translated at 100.0% (783 of 783 strings)

Translated using Weblate (Galician)

Currently translated at 100.0% (783 of 783 strings)

Co-authored-by: José M. <xosem@disroot.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/gl/
Translation: Tusky/Tusky
Currently translated at 76.2% (597 of 783 strings)

Translated using Weblate (Latvian)

Currently translated at 76.1% (596 of 783 strings)

Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/lv/
Translation: Tusky/Tusky
Reviewed-on: https://codeberg.org/tusky/Tusky/pulls/5563
Merge upstream/develop at 70d318a41 while retaining Dusky-only posting features and branding. Resolve instance metadata conflicts, use database version 93 with automatic migrations, and bump the app to 33.0-beta1-dusky1 (144).
micke changed title from Merge latest Tusky develop into Dusky to Merge latest Tusky develop into Dusky and handle collection notifications 2026-10-03 10:11:44 +02:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin merge/tusky-develop-2026-10-02:merge/tusky-develop-2026-10-02
git switch merge/tusky-develop-2026-10-02

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff merge/tusky-develop-2026-10-02
git switch merge/tusky-develop-2026-10-02
git rebase develop
git switch develop
git merge --ff-only merge/tusky-develop-2026-10-02
git switch merge/tusky-develop-2026-10-02
git rebase develop
git switch develop
git merge --no-ff merge/tusky-develop-2026-10-02
git switch develop
git merge --squash merge/tusky-develop-2026-10-02
git switch develop
git merge --ff-only merge/tusky-develop-2026-10-02
git switch develop
git merge merge/tusky-develop-2026-10-02
git push origin develop
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
micke/Dusky!1
No description provided.