Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,653 Commits 1 Branch 60 Tags
Commit Graph

222 Commits

Author SHA1 Message Date
Shamicen
6719f22eff
implement mihonapp/mihon#326 (#1104) 
* implement mihonapp/mihon#326

Archives are now being read from channels

Co-authored-by: FooIbar <118464521+FooIbar@users.noreply.github.com>
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* disable parallelisms for loading into memory

* switched to mutex

* detekt changes

* more detekt baseline changes

---------

Co-authored-by: FooIbar <118464521+FooIbar@users.noreply.github.com>
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
 2024-03-16 11:59:00 -04:00
KaiserBh
334e9fb680
feat: add cross device sync (#1005) 
* feat: add cross device sync.

* chore: add google api.

* chore: add SY specifics.

* feat: add backupSource, backupPref, and "SY" backupSavedSearches.

I forgot to add the data into the merging logic, So remote always have empty value :(. Better late than never.

* feat(sync): Allow to choose what to sync.

Various improvement and added the option to choose what they want to sync. Added sync library button to LibraryTab as well.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* oops.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* refactor: fix up the sync triggers, and update imports.

* refactor

* chore: review pointers.

* refactor: update imports

* refactor: add more error guard for gdrive.

Also changed it to be app specific, we don't want them to use sync data from SY or other forks as some of the model and backup is different. So if people using other forks they should use the same data and not mismatch.

* fix: conflict and refactor.

* refactor: update imports.

* chore: fix some of detekt error.

* refactor: add breaks and max retries.

I think we were reaching deadlock or infinite loop causing the sync to go forever.

* feat: db changes to accommodate new syncing logic.

Using timestamp to sync is a bit skewed due to system clock etc and therefore there was a lot of issues with it such as removing a manga that shouldn't have been removed. Marking chapters as unread even though it was marked as a read. Hopefully by using versioning system it should eliminate those issues.

* chore: add migrations

* chore: version and is_syncing fields.

* chore: add SY only stuff.

* fix: oops wrong index.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* chore: review pointers.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* chore: remove the option to reset timestamp

We don't need this anymore since we are utilizing versioning system.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* refactor: Forgot to use the new versioning system.

I forgot to cherry pick this from mihon branch.

* chore: remove isSyncing from Chapter/Manga model.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* chore: remove unused import.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* chore: remove isSyncing leftover.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* chore: remove isSyncing.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

* refactor: make sure the manga version is bumped.

When there is changes in the chapters table such as reading or updating last read page we should bump the manga version. This way the manga is synced properly as in the History and last_read history is synced properly. This should fix the sorting issue.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

---------

Signed-off-by: KaiserBh <kaiserbh@proton.me>
 2024-03-16 11:53:20 -04:00
renovate[bot]
ee6bc20f27 Update dependency io.nlopez.compose.rules:detekt to v0.3.12 (#500) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 0d6f426dbd8874c7861b6cc245f9e6ff43dbbe2c)
 2024-03-15 20:07:56 -04:00
az4521
a9fd1f8811 Update image-decoder (#466) 
Use newer image-decoder lib

fixes crashing when trying to load corrupt images below 12 bytes in size

(cherry picked from commit 154f4d327caea9ceef6a53e739324ee0a9ed959d)

# Conflicts:
#	gradle/libs.versions.toml
 2024-03-15 19:53:26 -04:00
renovate[bot]
64bbe941a4 Update dependency io.mockk:mockk to v1.13.10 (#470) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 60480686daa9456c78d7cb45c5ad2e23644d1bd2)
 2024-03-03 22:00:49 -05:00
renovate[bot]
03bc09c1aa Update dependency me.saket.swipe:swipe to v1.3.0 (#343) 
* Update dependency me.saket.swipe:swipe to v1.3.0

* Update MangaChapterListItem.kt

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
(cherry picked from commit b51a0a38bd9849b573bc2de0d936d6ab2becb83c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
 2024-03-02 14:24:16 -05:00
AntsyLich
c4df418081 Switch to Coil3 
Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
(cherry picked from commit f72b6e4d7c1f2f93d705402e4d80c94160bef54d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt
 2024-03-02 14:22:54 -05:00
renovate[bot]
32d97ed194 Update dependency io.coil-kt:coil-bom to v2.6.0 (#447) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit c1c174698525e982107cc955d8dff711c4498989)
 2024-03-02 13:59:34 -05:00
renovate[bot]
167a4e9820 Update dependency org.junit.jupiter:junit-jupiter to v5.10.2 (#419) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 4fcbd80a8ec72f4113d0ee9d457c000dcd8e7440)
 2024-03-02 13:59:25 -05:00
renovate[bot]
aef0b50663 Update dependency com.google.firebase:firebase-analytics-ktx to v21.5.1 (#417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 16969193c718cc8e6cabb473ecb1d0d7bc02f33e)

# Conflicts:
#	gradle/libs.versions.toml
 2024-03-02 13:59:16 -05:00
renovate[bot]
5dc96384bd Update detekt to v1.23.5 (#267) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit e50358dc4be7cbd866a79d052edc62689f0e4ca5)
 2024-03-02 13:58:39 -05:00
renovate[bot]
b7c9eaa981 Update dependency com.squareup.okio:okio to v3.8.0 (#423) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 1521c359412518731ef7338255cdd280321faa70)
 2024-03-02 13:56:12 -05:00
renovate[bot]
133c34dee2 Update dependency com.google.gms:google-services to v4.4.1 (#418) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 21020e1797ae9c0373e5132e1dbcd9a64455c17f)
 2024-03-02 13:48:11 -05:00
renovate[bot]
fe853aa1c5 Update dependency com.github.requery:sqlite-android to v3.45.0 (#260) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 088e37b2d8d4d790e926eda34119377c2f94ccf6)

# Conflicts:
#	gradle/libs.versions.toml
 2024-03-02 12:09:47 -05:00
renovate[bot]
9c3f805eab Update dependency io.github.fornewid:material-motion-compose-core to v1.2.0 (#257) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 5b88f1bd94ae3c696681fe34a22453575e747ff6)
 2024-03-02 12:08:30 -05:00
Theodoro Loureiro mota
2c75649a3c Adding Detekt in the project (#216) 
* Removing ktlint

* Removing compose lint

* Adding initial Detekt config

* Setting up detekt config

* Adding detekt baseline

* Fixing workflows

* Moving to a module based solution

* Adding new line

* Adding new line

* Updating baseline

* Addressing PR suggestions

* Regenerating baseline.xml

* Cleanup

---------

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit cc09230e266c3cd7ed748affe92922d775523695)

# Conflicts:
#	.github/workflows/build_pull_request.yml
#	.github/workflows/build_push.yml
 2024-02-17 14:47:23 -05:00
renovate[bot]
83d85cdd7c Update dependency io.mockk:mockk to v1.13.9 (#10349) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 7d6e1bdafc8043f4b8f5d91cd0f3d836a38e3025)
 2024-01-09 18:52:14 -05:00
arkon
ed88c76010 Bump dependencies 
(cherry picked from commit 8321ff60005892e3ba333caafd1e88c1fb6d6660)
 2024-01-09 18:51:39 -05:00
arkon
98f4b7086a Defer ACRA reporting until device is idle/not low battery/on unmetered network 
(cherry picked from commit ec478cbb1bc0a80c18957169cbcc13505d46f37d)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2024-01-09 18:50:41 -05:00
arkon
10b8924d43 Use Material3 version of AboutLibraries 
(cherry picked from commit 74931fad861abf19f26b51d9395642b58ee34e12)
 2023-12-31 15:09:08 -05:00
renovate[bot]
9a32b209b9 Update dependency org.jsoup:jsoup to v1.17.2 (#10277) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 901b77f55c6a6fc819505ce77fee9caff4881c16)
 2023-12-31 02:01:28 -05:00
arkon
f5c5c6ef0d Update Coil 
(cherry picked from commit 087da2b2f3f6ca333aa0534b56ab059294f34f9e)
 2023-12-27 13:47:37 -05:00
renovate[bot]
11420ef158 Update okhttp monorepo to v5.0.0-alpha.12 (#10245) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 7ae17e6aaccadfe01652ff54ca7c06cf756f0292)
 2023-12-24 14:05:29 -05:00
renovate[bot]
d6b314473d Update dependency com.squareup.okio:okio to v3.7.0 (#10239) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit c6356fe4b2283667fff7c59a7d35ccac78b5e2c2)
 2023-12-24 14:04:07 -05:00
arkon
7de2e72228 Bump dependencies 
(cherry picked from commit add9357257b1e56c4f79554b4ea5cb60e8cfce56)
 2023-12-24 13:34:12 -05:00
arkon
c42fe376d7 Upgrade Voyager 
(cherry picked from commit e5693ed6689840e50da9d40af36539fe8611e858)
 2023-12-24 12:50:23 -05:00
arkon
4a6693124e Bump dependencies 
(cherry picked from commit 7a52afd223332819d462365138f65ad8bcd8b3d9)
 2023-12-24 12:15:04 -05:00
arkon
209da5eb04 Bump dependencies 
(cherry picked from commit 5dda32bb8143abe4e495fb7a5693299ac9f4da41)

# Conflicts:
#	.github/workflows/build_pull_request.yml
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
 2023-12-24 11:54:51 -05:00
Ivan Iskandar
fcb230df45 Migrate downloader service to WorkManager (#10190) 
(cherry picked from commit 8ce8b600922410a4eb64da35a1850840a2f28669)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt
 2023-12-24 11:53:10 -05:00
arkon
c2d2295149 Update UniFile 
Which has more correct nullability for some methods and case insensitivity for listFiles where possible.

(cherry picked from commit a74a689c9048cc67f4854678fbfefa361631a5e7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/image/LocalCoverManager.kt
 2023-12-23 23:30:24 -05:00
arkon
1eccf9fad8 Migrate to multiplatform string resources (#10147) 
* Migrate to multiplatform string resources

* Move plurals translations into separate files

* Fix lint check on generated files

(cherry picked from commit 46e734fc8eefb8c06a880194e702559ca3fa769d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
#	app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
#	app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
#	app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
#	app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
#	app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
#	build.gradle.kts
#	i18n/build.gradle.kts
#	i18n/src/commonMain/resources/MR/base/strings_sy.xml
#	i18n/src/commonMain/resources/MR/fr/strings_sy.xml
#	i18n/src/commonMain/resources/MR/in/strings_sy.xml
#	i18n/src/commonMain/resources/MR/pt-rBR/strings_sy.xml
#	i18n/src/commonMain/resources/MR/ru/strings_sy.xml
#	i18n/src/commonMain/resources/MR/zh-rCN/strings_sy.xml
#	i18n/src/commonMain/resources/MR/zh-rTW/strings_sy.xml
 2023-12-23 20:28:29 -05:00
renovate[bot]
9c5124799c Update voyager to v1.0.0-rc10 (#10127) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit dd998be1e762b0cc4774ca0efbbccbf9d6e4ca9c)
 2023-12-23 18:36:55 -05:00
renovate[bot]
ab22dd242b Update voyager to v1.0.0-rc09 (#10110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 8f22480ec9f1fa69777e9326879490aa33225ed5)
 2023-12-23 17:43:09 -05:00
renovate[bot]
5dc32f694d Update dependency org.junit.jupiter:junit-jupiter to v5.10.1 (#10109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 9d974273afa1b086af214c20c372541347aed651)
 2023-12-23 17:43:02 -05:00
arkon
91e6f7f79b Bump dependencies 
(cherry picked from commit 8644d90bd4572330e720c1eb8b64e3f323bbd709)
 2023-11-05 16:52:34 -05:00
arkon
65b085ad23 Bump dependencies 
(cherry picked from commit d5e8c38075aeb062d82b72c915c6c484386f91ed)
 2023-11-05 16:38:18 -05:00
arkon
57bb12440a Handle Brotli-compressed responses 
(cherry picked from commit 7cf2ce29947e96a2eac011e48a92e1029e344831)
 2023-11-05 16:28:22 -05:00
arkon
59a6fd7dca Update Voyager 
(cherry picked from commit 012854dd1e13eedecd92419fd6a4d1d5cc900462)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
 2023-10-29 12:32:40 -04:00
renovate[bot]
795723f436 Update dependency ch.acra:acra-http to v5.11.3 (#10046) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit fcba2306e9d15aa4e00e67bde493fd7aa3f79d9f)
 2023-10-29 11:50:31 -04:00
arkon
b131e1ca1f Update jsoup 
(cherry picked from commit 19965e0bdbe0ce3717451d402b7cac3a5a6ed6b2)
 2023-10-29 11:11:09 -04:00
arkon
4385d3c21a Bump dependencies 
(cherry picked from commit 1302461518702b00af0cc920c389adef3cf1694a)
 2023-10-29 10:40:45 -04:00
arkon
a264bb35d4 Bump dependencies 
(cherry picked from commit 0be7ac5871a717e97195b7cfc1051fdbcced1e94)
 2023-10-29 10:36:56 -04:00
renovate[bot]
0bcc1a7b81 Update dependency com.google.android.material:material to v1.10.0 (#9991) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 9c688b08c0fd3b501dbf0e0f35b3b0fdb301052f)
 2023-10-27 17:19:04 -04:00
arkon
c2488c41a2 Update social media icons 
(cherry picked from commit 7f0f67d75249033451f9e0fc841de6359ec28b69)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
 2023-10-27 17:16:51 -04:00
arkon
9b4d0d372b Bump dependencies 
(cherry picked from commit df332860b8fa1a4f873a7fa1d08c45e71cfb12ed)
 2023-10-27 17:16:13 -04:00
renovate[bot]
947efe58a5 Update aboutlib.version to v10.9.1 (#9971) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 8a8afa46e91bfb156c58f9008ba871156bf353f9)
 2023-10-01 16:36:46 -04:00
arkon
fd8beebc5f Update SSIV and image-decoder, except with partially revert to non-broken HEIF/AVIF support 
(cherry picked from commit 66a938779df1e1400125b987c23c29ac411dda6d)

# Conflicts:
#	gradle/libs.versions.toml
 2023-10-01 16:35:16 -04:00
arkon
045a8bb08c Update SSIV and image-decoder 
Includes updated libwebp for CVE-2023-5129

(cherry picked from commit ed506f84951677a5772e06720fc5cf1442a99b9b)

# Conflicts:
#	gradle/libs.versions.toml
 2023-10-01 16:34:56 -04:00
arkon
35eb6c7ebe Bump dependencies 
(cherry picked from commit 5de72b7d32676fe3d0e9ce2176fe48e29a9f859c)
 2023-10-01 16:04:38 -04:00
renovate[bot]
48ddc4855b Update dependency io.github.fornewid:material-motion-compose-core to v1.0.7 (#9938) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 3ad7add3b5c523085a13e8528aa527a7b26c5f59)
 2023-10-01 15:59:24 -04:00