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

4106 Commits

Author SHA1 Message Date
Jobobby04
f4a3ef4f1d More domain model usage in SY 2022-07-04 22:20:28 -04:00
Jobobby04
9a10f1300a Fix gallery adder 2022-07-04 22:11:01 -04:00
Jobobby04
6954c299b5 Use domain layer for almost all SY code 2022-07-04 18:45:39 -04:00
Jobobby04
141b0477e7 Use domain layer for saved searches 2022-07-04 18:10:43 -04:00
arkon
485e6719c3 More domain model usage 
(cherry picked from commit a3378e6080418e6ba9bab4d027d7f06373556217)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-03 17:18:20 -04:00
arkon
f1a31e4560 More domain model usage 
(cherry picked from commit 3791d8254034ffcab94ddd65ec290c28384e6526)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-03 17:05:44 -04:00
arkon
d48427152e More domain model usage 
(cherry picked from commit a3ab8746bf8b1cfca628431e76f9c63ecd973010)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-03 16:51:08 -04:00
Andreas
22da633ee3 Cleanup data layer (#7450) 
(cherry picked from commit 069bd90c0f76d21bc6d99a51644926876415c113)

# Conflicts:
#	app/src/main/sqldelight/data/mangas.sq
 2022-07-03 16:41:43 -04:00
arkon
eb0964d0b6 More domain model usage 
(cherry picked from commit 68697e59d71d9875d8a8b8aaaf65e77a084e0b8a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
 2022-07-03 16:32:00 -04:00
arkon
268911a7c9 More domain model usage 
(cherry picked from commit b3dd8b735581ee7ea1ef0ee6dde99507f329e346)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-03 16:22:08 -04:00
Andreas
0ad6e00bca Remove SQLiteOpenHelper as database is migrated to SQLDelight (#7448) 
(cherry picked from commit eb2a904b618bcbecd1311fa0db3809425d91d8d5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
 2022-07-03 16:00:25 -04:00
Andreas
ea38ffc53e Use SQLDelight for all Manga related queries (#7447) 
(cherry picked from commit 17951cfd68159d083df54c3e03094d8d66fe02ec)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbProvider.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaCategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-03 15:58:26 -04:00
Jobobby04
d88c769d3b Use SQLDelight for more SY specific things 2022-07-03 13:37:27 -04:00
Jobobby04
e71c9e2775 Use SQLDelight for mass migration 2022-07-03 00:33:09 -04:00
Jobobby04
664f9b1484 Use SQLDelight for most SY specific things 2022-07-02 23:52:03 -04:00
Andreas
3cf4c3128f Use SQLDelight for all MangaCategory related queries (#7441) 
(cherry picked from commit 9e3b454b1b79a7725b3d3be4c85c1655ad80e18d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt
 2022-07-02 20:46:46 -04:00
Andreas
9093663f2f Use SQLDelight for all Chapter related queries (#7440) 
(cherry picked from commit 29633b64aa1b3d87392362f31f4fc250d930722b)

# Conflicts:
#	app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/sqldelight/data/chapters.sq
 2022-07-02 20:46:01 -04:00
arkon
9205b568e8 Migrate to more use of domain models 
(cherry picked from commit 76c0ead1db3a93f859f00ce6bff69f38b8699bd6)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 20:42:52 -04:00
Andreas
cd2f26a7c9 Use SQLDelight for a Category related queries (#7438) 
(cherry picked from commit 2674570792a275abaee7a6ec1ae947d94f69a634)

# Conflicts:
#	app/src/main/java/eu/kanade/data/category/CategoryRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/category/model/Category.kt
#	app/src/main/java/eu/kanade/domain/category/repository/CategoryRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
 2022-07-02 20:10:20 -04:00
arkon
85898df703 More SQLDelight migrations 
(cherry picked from commit 21771e62aa0dc7e1393b27ea8eb146de277cebd9)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-07-02 19:40:55 -04:00
Andreas
2c87a8fd02 Use SQLDelight on Library screen (#7432) 
- Uses the new `asObservable` function to change the database calls to use SQLDelight, which should make the impact minimal when it comes to bugs.
- Use interactors where they already exist
- The todos are for the Compose rewrite
- Removed unused StorIO methods/queries
- Tested loading library, move manga to new category, unfavorite multiple manga, move multiple manga from one category to another, change filter, sort and display settings (with and without per category settings), (un)mark chapters, start/delete downloads

Thank Syer for asObservable

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>
(cherry picked from commit 05085fe57fe4c3ada497f93b8cd282a5009cdbbb)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 19:10:26 -04:00
AntsyLich
1087f07614 Downloader: Optimize split tall image (#7435) 
(cherry picked from commit ff32ab09fbc32eff33cb378d6e1b1aa0d9ef8e1a)
 2022-07-02 13:44:21 -04:00
AntsyLich
5f55a0afbb Reimplement chapter download indicator longpress (#7412) 
(cherry picked from commit deaded5af2da6645d7f320471d5f73c0ffed3edf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
 2022-07-02 13:44:14 -04:00
Andreas
42ecd912e8 Use SQLDelight on Updates screen (#7423) 
(cherry picked from commit 1f10b79ee800fba42aa588cb094d3d280c264245)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
 2022-07-02 13:38:36 -04:00
arkon
0e390b5429 Revert some KTX extension changes 
These weren't exactly 1:1 replacements. Might be related to #7391.

(cherry picked from commit b9e108eb4d7e93deb6bc8bd6ed32220c780d2576)
 2022-07-02 13:23:22 -04:00
AntsyLich
8bf3426afd DownloadProvider: Only provide necessary info and not whole chapter/manga class (#7411) 
(cherry picked from commit e1525a5125f83fb419d5e5f05834cffcbcd7fa07)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-02 13:22:43 -04:00
arkon
858c3b5a0a Bump dependencies 
(cherry picked from commit 7e4c45858f6fd2309f8ca07e1e4c4798ab87b764)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2022-07-02 13:02:29 -04:00
stevenyomi
ef20995e7d Extension API: change fallback source and logic (#7400) 
* Extension API: change fallback source and logic

* remove ghproxy

(cherry picked from commit 284445c364baa47c4f29a524c3e00f1e18360abb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
 2022-07-02 12:57:25 -04:00
Jobobby04
4de4992e4e Fix trash group by tracking code 2022-06-27 18:06:36 -04:00
AntsyLich
58ed2b9752 Fix Mark previous as read (#7396) 
(cherry picked from commit 7440086ef1bd63d499945afe1722d6648ab514ac)
 2022-06-27 13:00:09 -04:00
AntsyLich
257001d4a6 Sort Manga by title in MigrationMangaScreeen (#7392) 
(cherry picked from commit ef3acb8c430f88664dbc3895e666e76836ad163d)
 2022-06-27 12:59:57 -04:00
stevenyomi
af82ef436b RateLimitInterceptor: ignore canceled calls (#7389) 
* RateLimitInterceptor: ignore canceled calls

* SpecificHostRateLimit: ignore canceled calls

(cherry picked from commit 5b8cd68cf355a15e5d5789280524d08b4c922f23)
 2022-06-27 12:59:42 -04:00
Jobobby04
45ba4e77bd Compile fixes 2022-06-27 12:59:29 -04:00
arkon
775ab6479a Migrate usages of SyncChaptersWithTrackServiceTwoWay 
(cherry picked from commit 53decfd47b2fba53cebcaa2350fb8cf6a2385e9f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2022-06-27 12:59:11 -04:00
arkon
e6d39ce14c Migrate more track DB calls to SQLDelight 
(cherry picked from commit 65264e3ef56b3327d0f0d2f6f5250d79e6e7555f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-06-27 12:52:18 -04:00
arkon
9d8aebc7a6 Fix app update install notification disappearing 
(cherry picked from commit 4ca0fc7a4d2232ef9a48890b42cd1bd27450b585)
 2022-06-27 12:27:05 -04:00
Jobobby04
1a17f87945 Simplify autoscroll 2022-06-26 22:17:37 -04:00
Jobobby04
ac586560f0 Only enable autoscroll when app is active 2022-06-26 19:11:20 -04:00
Jobobby04
4ddc696fb5 Use image decoder for double pages 2022-06-26 18:12:22 -04:00
Jobobby04
27733aba02 Add virtual visibility tag for E-Hentai 2022-06-26 16:51:51 -04:00
AntsyLich
6f407f6e0a Use sqldelight for direct db calls in MangaPresenter (#7366) 
(cherry picked from commit 04f0ca78469573707e14742226fd8f14445853d4)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-26 16:03:51 -04:00
jobobby04
1084e7fe9d Fix clicking cover opening random manga (#7387) 
(cherry picked from commit 61a44101a273598ec43168be9fbf00247facef58)
 2022-06-26 15:52:06 -04:00
Jobobby04
0862c935a1 Minor improvements to backup fix 2022-06-26 13:58:23 -04:00
Jobobby04
e1c183b04d Fix backups and filtered scanlators 2022-06-26 13:52:05 -04:00
Osyx
bd6f778de2 Add new "Lavender" theme (#7343) 
* Add new "Lavender" theme

* Add light theme values for Lavender theme

* Fix order of enums

* Fix accented UI elements in set categories sheet being different colors

Co-authored-by: CrepeTF <trungnguyen02@outlookcom>
(cherry picked from commit ad106bd8842dfc9c047c0412b92a0cb1dc1aba1a)
 2022-06-26 11:30:47 -04:00
Ivan Iskandar
3fa1c24f8d MangaPresenter: Fix state updates when opening a new manga entry (#7379) 
(cherry picked from commit 0e0c1dcdc5f42b0a63d5b865c9aba29db4ab18a6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-06-26 11:24:57 -04:00
arkon
d2e40a0749 Use primary color for excluded tristate filter icon (fixes #7360) 
(cherry picked from commit 3ca1ce463696e2e8eabf63c1e729dbdd2ffe1f71)
 2022-06-26 11:09:00 -04:00
Jobobby04
f72b6cf87b Fix imports 2022-06-25 19:34:40 -04:00
Ivan Iskandar
2b7aca710e MangaController overhaul (#7244) 
(cherry picked from commit 33a778873af0eb52528a29f741fa59b530679c64)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_controller.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/manga_summary.xml
#	app/src/main/res/menu/manga.xml
 2022-06-25 17:11:25 -04:00
jobobby04
1e53ad97db Fix downloader crash related to UnmeteredSource (#7365) 
Fix crash when starting a download with chaqpters from a UnmeteredSource

(cherry picked from commit 470a5764417ccd63a274ccea0e483a12ec1adbda)
 2022-06-25 11:35:05 -04:00