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

7312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jobobby04
7ab81771fe Reduce legacy database models usage 2022-12-17 23:33:22 -05:00
Weblate (bot)
260517c708 Translations update from Hosted Weblate (#8663) 
Weblate translations

Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Abou <aboozar.gh.r@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Alex Maryson Jr <akamar87@gmail.com>
Co-authored-by: Ali Aljishi <ahj696@hotmail.com>
Co-authored-by: Bujdosf <bujdos.f01@gmail.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Diego <gonzalediego1@gmail.com>
Co-authored-by: Edi <mizumymommy@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: GuN4iK <maksimpradko59@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: InfinityDouki56 <ced.paltep10@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nguyễn Trung Đức <vaicato16@gmail.com>
Co-authored-by: Othmane El Alami <othmane.elalami@nupsol.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua>
Co-authored-by: Sana Thanks <thankssana4@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: aşina orkan göksel aşina <examplehuman@outlook.com>
Co-authored-by: blindmodz <sebareyes.1994@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: jinu147 <nesqea20@gmail.com>
Co-authored-by: lb-fes <2241373229@qq.com>
Co-authored-by: michalani <michal.anisimow@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/eo/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fa/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Abou <aboozar.gh.r@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Alex Maryson Jr <akamar87@gmail.com>
Co-authored-by: Ali Aljishi <ahj696@hotmail.com>
Co-authored-by: Bujdosf <bujdos.f01@gmail.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Diego <gonzalediego1@gmail.com>
Co-authored-by: Edi <mizumymommy@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: GuN4iK <maksimpradko59@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: InfinityDouki56 <ced.paltep10@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nguyễn Trung Đức <vaicato16@gmail.com>
Co-authored-by: Othmane El Alami <othmane.elalami@nupsol.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua>
Co-authored-by: Sana Thanks <thankssana4@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: aşina orkan göksel aşina <examplehuman@outlook.com>
Co-authored-by: blindmodz <sebareyes.1994@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: jinu147 <nesqea20@gmail.com>
Co-authored-by: lb-fes <2241373229@qq.com>
Co-authored-by: michalani <michal.anisimow@gmail.com>
(cherry picked from commit dac04f29295cb030d9d222ab29595c6225ed005f)
 2022-12-17 23:32:36 -05:00
stevenyomi
f02d41051e Pass listing query to BrowseSourceScreen (#8763) 
# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.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/BrowseSourceScreenModel.kt
 2022-12-17 23:32:35 -05:00
stevenyomi
a6d0031462 BrowseSourceScreen: fix navigate up and filter sheet (#8761) 
(cherry picked from commit 817e144ff697b4c6760c0101a6995d7030eb48a0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
 2022-12-17 23:18:17 -05:00
Ivan Iskandar
c081efba4b AdaptiveSheet: Don't blindly consume back event (#8760) 
(cherry picked from commit 9d2d78ae5b659b257f2d565b7e20465eaf011200)
 2022-12-17 23:17:20 -05:00
stevenyomi
91f6abec98 Fix snackbar blocking refreshing state in MangaScreen (#8759) 
(cherry picked from commit c44db54d9f729f94c53ccf690cb86e8bac332189)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-12-17 23:17:07 -05:00
arkon
01993baa90 Move library page EmptyScreens into list/grids 
It does look awkward due to the lack of filled height within those list/grids though.

Fixes #8720
Fixes #8721

(cherry picked from commit 376bbeb724ca6cb7de53213c478d1750d99c8d2a)
 2022-12-17 23:13:55 -05:00
arkon
b364ffdeea Minor cleanup 
(cherry picked from commit 0e2bdb7863c25f6f980e59c09d95d4687bf112d5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
 2022-12-17 23:13:44 -05:00
Ivan Iskandar
149ac4a363 Fix indexing notif not showing (#8758) 
(cherry picked from commit 235bc7745734fdda4cbcfe42452d611e8fa6693c)
 2022-12-17 22:56:24 -05:00
Two-Ai
5a449ec80a Track Page progress with StateFlow (#8749) 
* Update ReaderProgressIndicator documentation

ReaderProgressIndicator is not always determinate (cc554530, #5605).

* Track Page progress with StateFlow

(cherry picked from commit 593172f891667c1510d1812917cad93bfa362363)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
 2022-12-17 22:56:11 -05:00
Ivan Iskandar
4243d389f8 App state banner tweaks (#8746) 
* Move download indexing notification to this banner group
* Animate state changes

(cherry picked from commit e20c66b15671db75ed190c2967cdcc78c74db478)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-12-17 22:33:57 -05:00
arkon
997509a2d3 Use actual indexes instead of existing order number when reordering categories 
Fixes #8738

(cherry picked from commit 5f4825465e5764ddf9742eb71a833274ef9bfcc7)
 2022-12-16 01:02:06 -05:00
arkon
7f1d8f51c5 Sort global search source results properly 
Fixes #8741

(cherry picked from commit bc6a12a4f7788de2b41eca291a82a79b55ec75e8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreenModel.kt
 2022-12-16 01:01:42 -05:00
arkon
7a3b7f4daa Don't start at last read page if chapter is completely marked as read 
Fixes #8737

(cherry picked from commit 90db3acefd6290310c8cf8bab2563b3413a8cf4a)
 2022-12-16 00:57:40 -05:00
arkon
33b054edfa Fix crash if tapping title when opening reader directly 
(cherry picked from commit 2f2f59279d828ee689a477104079618d6436827e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2022-12-16 00:57:21 -05:00
arkon
dd367f2f70 Better handle status bar light/dark icons based on banner background color 
(cherry picked from commit 4992f87cb185cfac90aa86f4c4aeb2d0a0385c18)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-12-16 00:50:15 -05:00
Jays2Kings
d6a4f1ea14 Check ext lib version when checking for updates (#8740) 
(cherry picked from commit 7608cb0da37840c33fb8eac04dd1808cb58b2327)
 2022-12-16 00:49:37 -05:00
arkon
635b112452 Convert download cache/queue flows into SharedFlows 
Fixes #8727

(cherry picked from commit 9dd9e741f34aeb49a15a939ec7f8495a992d8bf8)
 2022-12-16 00:49:27 -05:00
Two-Ai
40165dd270 Fix SetMangaViewerFlags (#8719) 
Stop clearing old viewer flags when setting a flag

(cherry picked from commit 171db639ffc8e79aac8d8d8e6a354f8d703a387c)
 2022-12-16 00:49:14 -05:00
arkon
e5ad53e1d3 Remove unused resources 
(cherry picked from commit 3ede42252ce98346a7fd14d6b2ec12d4579e850b)
 2022-12-16 00:43:37 -05:00
renovate[bot]
d878d4c072 Update richtext to v0.16.0 (#8716) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit a94ca175e283a3e96cef49b163dad1a30d2a5d70)
 2022-12-16 00:34:50 -05:00
arkon
35817cc7c5 Add Assistant content URLs 
This is surfaced in recents on Pixel devices for example.
Docs: https://developer.android.com/guide/app-actions/assistant-sharing

Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 3749cee28f269aabe5ea18ffb62483a28d0c75e7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-12-16 00:34:42 -05:00
Ivan Iskandar
277a0b38bb Adjust insets handling in tablet UI (#8711) 
* Adds startBar slot in Scaffold to handle nav rail
* Consumes unneeded insets in settings

(cherry picked from commit ca500da4d899815112eadaa6a5f79c9b5e5766af)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt
 2022-12-16 00:32:14 -05:00
Ivan Iskandar
afd6f3c182 Move system bar color set to the main composable (#8710) 
This one doesn't check navbar location before adding a scrim, doesn't really
matter since now no body component is being drawn below the system bar.

(cherry picked from commit 820ed6a46880af1e9390706dc9915f3c7d385c60)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-12-16 00:30:29 -05:00
arkon
623f0e2612 Pull out settings sheet items as reusable composables 
(cherry picked from commit 7cbe18d325274de22b2bef30869d2cc658b72cc1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
 2022-12-16 00:23:07 -05:00
Soitora
5ac5005116 Add back option to hide Updates count (#8709) 
Adds back the option to hide the updates count on the Updates tab

(cherry picked from commit 8937e22ce4769818c1908b1ad60914553d1e42e2)
 2022-12-16 00:10:53 -05:00
Ivan Iskandar
af8c4fe835 Adjust screen transitions (#8707) 
* Fade transition between main navigation tabs
* Shared axis X between screen stacks

Activity transition is using a "close enough" shared axis X xml animation

(cherry picked from commit 82a3a98a5ae7153d5edb2bcef7a13d7474e24e03)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-12-16 00:10:39 -05:00
Ivan Iskandar
8da293ad91 Move app state banner to the very top (#8706) 
This moves the banners to the root composable and so eliminates the need to
track the app states in every screen.

(cherry picked from commit d97eab03283ea8b686ffa007bfc69224348b24f1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.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/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-12-15 22:36:08 -05:00
arkon
7d871ccfd3 Abstract ChapterSettingsDialog for reuse elsewhere 
(cherry picked from commit a61e2799dbfd60039b577d7fffc8b6494ba74aba)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
 2022-12-15 22:19:09 -05:00
arkon
68b1012c65 Reuse basic theme preview annotation 
(cherry picked from commit 1009e15aa61f3a717d0fec8a6d7c2d57aacdd4e1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
 2022-12-15 22:06:31 -05:00
zbue
6ada7f239a Show empty screen when a category is empty (#8690) 
* Show empty screen when a category is empty

* Review changes

* Review changes #2

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 01c6e46a711c3d5b7bf41ad92b8a977f88b44357)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
 2022-12-15 22:06:03 -05:00
arkon
e53a5cf429 Use proper category when getting random item 
Fixes #8700

(cherry picked from commit ed5e013874ad5bff00a5544e7f8b62c8ca7b1764)
 2022-12-15 22:05:16 -05:00
arkon
16879e02e8 Disable Jetifier 
(cherry picked from commit f8e4153dbfc06e1cc75b7665a179ff013bea61e7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2022-12-15 22:05:06 -05:00
Ivan Iskandar
de6a5bf67b Replace reader's Presenter with ViewModel (#8698) 
includes:
* Use coroutines in more places
* Use domain Manga data class and effectively changing the state system
* Replace deprecated onBackPress method

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit f7a92cf6ac58cae26b09b02578318e12cd888f4c)

# Conflicts:
#	.github/renovate.json
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
 2022-12-15 22:04:20 -05:00
arkon
3d8f3b34b7 Bump dependencies 
(cherry picked from commit e748d91d4a45f6b54c1e3c7df8b859d3a08fed2b)
 2022-12-15 21:30:14 -05:00
stevenyomi
c94505d289 Migrate Accompanist SwipeRefresh to Compose PullRefresh (#8106) 
(cherry picked from commit 2c4ddca38eef8ea3bc7aad290223ebe0e93dbca2)
 2022-12-15 21:21:29 -05:00
Two-Ai
5eca2bdf28 Cleanup Page status (#8696) 
* Cleanup Page statusSubject and statusCallback

* Convert Page status from Int to enum

(cherry picked from commit 6ca32710be5bfed851ab695a0d9438c7ab609b24)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
 2022-12-15 21:21:04 -05:00
Ivan Iskandar
9e8cd05c13 GlobalSearchScreen: Add unique key (#8693) 
Avoids crash when an old screen is being replaced by a new one

(cherry picked from commit f05e251991c0f89c9f275acc4d6c29a4fc856913)
 2022-12-15 21:08:31 -05:00
arkon
c81da465f6 Avoid some crashes 
(cherry picked from commit a3f3f9d5626c120619e0f4cc7c2d82045e065201)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
 2022-12-15 21:08:23 -05:00
zbue
b2df0340e4 Fix appbar back button in global search screen (#8689) 
(cherry picked from commit 410fcb73c502f3c71b90250f1bfcd343626dea35)
 2022-12-15 21:07:41 -05:00
arkon
d59ec04812 Avoid crashing when clearing cookies for invalid source URLs 
e.g. Komga sources with no URLs set

(cherry picked from commit b6d6de6b9f80798c5b363f7e361de073db4a6d55)
 2022-12-15 21:07:31 -05:00
Jobobby04
a280a5ed77 Simplify EHentaiUpdateHelper 2022-12-15 21:06:24 -05:00
Jobobby04
755f3377ad Fix hidden sources showing up in global search 2022-12-15 21:05:47 -05:00
Jobobby04
3da9f2e067 Fix library sorting 2022-12-15 21:05:30 -05:00
arkon
bcad021e00 Handle intent after navigator is initialized 
Fixes crash if opening from widget or notification when activity isn't already launched.

(cherry picked from commit 09cebf20f3ee150629fe3c62d3974180fec6f8a2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-12-05 17:28:55 -05:00
arkon
44feb3569d Fix opening download notification only going to More tab 
(cherry picked from commit a8c732d67bc4565792f0b28efcde101210885323)
 2022-12-05 17:19:39 -05:00
arkon
afec4f43eb Minor cleanup 
(cherry picked from commit c88b79fa178adb49814bc118a1657fa93665a5fd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
 2022-12-05 17:19:02 -05:00
Dexroneum
01fd88a666
Translations (#751) 2022-12-05 16:05:09 -05:00
Jobobby04
266b4c4dd7 Replace DebugOverlay library with a custom composable 2022-12-05 14:57:33 -05:00
arkon
0663928b6b Always show library tabs and counts when searching 
Closes #8680

(cherry picked from commit 3f9820ac797090185bd73de7a217561a5914a21d)
 2022-12-05 13:46:35 -05:00