Commit Graph

611 Commits

Author SHA1 Message Date
acd3b84b55 Update all the docblocks 2019-12-09 14:34:23 -05:00
75aa7e3aae Annotate property types for Types classes 2019-12-09 13:40:54 -05:00
efede08401 Various code style tweaks 2019-12-09 13:13:31 -05:00
951f4362db Various code cleanup 2019-12-06 15:46:56 -05:00
3bb9734e1d Update header comments 2019-12-06 09:16:35 -05:00
6fd2b22d72 Tweak tests for new version of PHPUnit 2019-12-06 09:15:49 -05:00
47b9d7ba7a Update dependencies 2019-12-05 16:59:24 -05:00
b0682ae1b2 Bump PHP version requirement 2019-12-03 15:17:25 -05:00
59ba0f49c7 Update clear thumbnails script to work with lots of files 2019-12-02 15:29:24 -05:00
fec671e3cd Catch errors when mapping MAL ids on sync 2019-10-08 19:59:47 -04:00
848f667626 Misc bugfixes, especially for Anime without a MAL id. 2019-10-07 20:10:27 -04:00
c6b74e2775 Minor code cleanup, add newer php version for travis tests 2019-08-16 10:31:31 -04:00
f3b42ae056 Update base request builder to use the correct user agent 2019-08-10 10:42:02 -04:00
9140ebaa19 Add first GraphQL files for Kitsu for future implementation 2019-08-10 10:10:09 -04:00
27160bda9a Improve 404 checks for detail pages 2019-08-10 10:09:07 -04:00
1f2accf4ec Add 'automatic' dark theme, based on browser 'prefers-color-scheme: dark' media query 2019-07-12 15:56:24 -04:00
73488d8244 Clean up commands a little bit 2019-07-11 19:03:35 -04:00
c93629dea2 Show fewer sync errors by filtering common data disparity issues 2019-07-11 16:38:21 -04:00
5bf8277376 Fix syncing manga to anilist when you have to create a new list item 2019-07-11 15:24:34 -04:00
51bf392d1b Make Anilist missing username error more reliable, allow editing anilist username in settings panel 2019-07-11 10:28:09 -04:00
dd6e99877a Collection "All Tab", and filtering. Resolves #6, #7 2019-07-10 13:32:05 -04:00
4de92a3591 No more genre-related database errors, and other collection improvements 2019-07-10 10:20:37 -04:00
76b23c7646 Fix thumbnail generation command 2019-05-08 13:19:03 -04:00
92243189ee Fix some edge cases 2019-04-01 16:17:40 -04:00
f3f2879c54 Remove XML codec class 2019-03-12 09:43:17 -04:00
b70ba1da6f Consistent spacing around auth checks 2019-01-29 16:01:31 -05:00
28146ad909 Add a per-controller-method check for authorization for private routes 2019-01-29 15:12:31 -05:00
0348d0db00 Cleanup redundant methods in Collection model 2019-01-28 14:31:48 -05:00
84ca0a9481 Fix error on attempt to insert a duplicate series 2019-01-22 10:21:58 -05:00
aec9a2f2b8 Hide missing table error on noninitialized collection, see #20 2019-01-08 15:52:53 -05:00
1c3b478d49 Cleanup database logic a bit 2019-01-07 14:29:15 -05:00
5d752f6ee3 Small code cleanup 2019-01-07 09:08:00 -05:00
0503cad15f Simplify/clean up some base classes 2018-12-21 15:52:34 -05:00
59403b9cb5 Make syncing slightly more robust 2018-12-12 15:31:59 -05:00
4d26acea5b Use the same API client instance across the codebase 2018-12-07 10:24:42 -05:00
a38c9712e6 Don't show media tabs with no media on character page, make stats on user page more resiliant 2018-12-07 10:22:16 -05:00
b871a4fac2 Remove default API client timeouts, fix time on anime calculation 2018-12-06 16:21:02 -05:00
826cb0c1cb Add dark theme with setting toggle 2018-12-06 13:04:54 -05:00
94e61e35a8 Update misspelled method, somehow resolves #19 2018-11-29 11:46:06 -05:00
f09716b040 Some API client cleanup 2018-11-29 11:00:50 -05:00
921febaeb4 Fix error in list sync 2018-11-27 15:37:16 -05:00
f3c85da8cc Misc code cleanup 2018-11-09 10:38:35 -05:00
9ad74ed887 Remove data transformation from media detail pages, and into the proper transformers 2018-11-08 12:15:30 -05:00
27977a0c8a Move data transformation out of controllers, and into transformers 2018-11-08 11:36:42 -05:00
11475187fc Fix generic user page route, minor code cleanup 2018-11-07 14:29:21 -05:00
b9e8ddfc9a Fix collection query 2018-11-05 13:25:18 -05:00
38cd9c74d9 Sort streaming links by service 2018-11-05 10:40:29 -05:00
6770c133fb Update picture helper, move anilist oauth calls to the settings controller 2018-11-02 12:58:19 -04:00
cd2dcf2873 Various refactoring, better webp image handling 2018-11-01 22:15:20 -04:00
c2d51b2b7e Make Controllers more specialized 2018-11-01 22:12:41 -04:00
fa27abb954 Add tabs to character page sections 2018-10-30 11:42:32 -04:00
cf1c55782f Small code consistency update 2018-10-29 15:48:54 -04:00
bd4cfaafe1 Add staff section on Manga detail pages 2018-10-29 15:17:48 -04:00
679c369427 Fix staff section on Anime detail pages, center unusually sized images instead of stretching them 2018-10-29 14:43:06 -04:00
0fa54d9f7f Attempt to fix tests again 2018-10-29 10:07:20 -04:00
2a6929c6ff Update JsonAPI helper to better handle input data without mangling 2018-10-29 09:39:56 -04:00
50b65d66e1 Ugly Progress Commit
* Update Person pages to have series organized by character for Voice
Acting
* Miscellaneous style updates
* Add placeholder images for items missing images
2018-10-26 13:08:45 -04:00
14be365a16 Refactor some silly switches 2018-10-19 10:40:11 -04:00
16f62ceb8d Miscellaneous page improvements, including additional data and sorting 2018-10-19 09:30:27 -04:00
28164f72da Remove need for www subdomain for streaming service mapping 2018-10-17 14:33:16 -04:00
f243dd4583 Replace switch statement with array mapping 2018-10-17 14:20:07 -04:00
fccc794528 Fix tests, and category list for Manga detail page 2018-10-16 14:32:52 -04:00
12dfb491bc Remove a reference to genres from an older version of the Kitsu API 2018-10-16 14:22:47 -04:00
82520afa0e Account for missing genres in anime collection 2018-10-11 16:40:51 -04:00
07cae83e15 Default to secure (https) urls 2018-10-11 09:53:14 -04:00
Timothy Warren
f7cfcbbced Add console command to re-generate list thumbnails 2018-10-10 16:04:58 -04:00
Timothy Warren
ca6954936f Attempt to fix ssl detection 2018-10-10 15:58:28 -04:00
4eb258bb2f Fix broken url generator test 2018-10-10 14:26:44 -04:00
54b4e11335 Always set the url protocol for the url generator 2018-10-10 14:21:46 -04:00
5258b215d4 Fix tests 2018-10-09 18:26:42 -04:00
fec30b7e36 Full Anilist settings page OAuth flow, ability to run app without manually editing config files. See #7. Resolves #5 2018-10-09 18:10:20 -04:00
7a2bb1ba05 Cleanup styles of settings page, cleanup syncing command a bit 2018-10-09 10:11:42 -04:00
bb9e7b8d49 Fix issue with cache settings 2018-10-08 16:47:40 -04:00
e4110f089e More settings, now with tabs 2018-10-08 16:38:08 -04:00
88b68b847c Settings control panel saves to admin-override.toml in the app/config directory, resolves #7 2018-10-08 15:45:46 -04:00
f1a54d8782 More webp images, fix login 2018-10-05 22:36:54 -04:00
616ae1ea82 Ugly Progress Commit
* Cache and resize images - not just cache them
* Convert to webp on cache
* Show webp images if available
* Settings Form Generation (doesn't yet save)
2018-10-05 21:32:15 -04:00
0102a0b3ee Add command to check Kitsu's MAL id mappings 2018-10-05 14:40:30 -04:00
789af166ae Update code to use simpler config 2018-10-05 14:32:05 -04:00
3098fef20c Merge config.toml and route_config.toml 2018-10-05 14:27:07 -04:00
4d29b43123 Fix some api mapping issues for #5 2018-10-01 13:03:48 -04:00
5632c0c815 Update header comments to version 4.1 2018-10-01 11:35:51 -04:00
6f5db162a0 More work on #5 2018-10-01 10:50:22 -04:00
e3b4b9dd32 Ugly progress commit 2018-09-27 16:45:12 -04:00
9821c17de3 Fix tests 2018-09-26 22:43:04 -04:00
2d3295757d Lots of Anilist integration, see #5 2018-09-26 22:31:04 -04:00
ca5bfafe88 Anilist CRUD operations for Anime! See #5 2018-09-20 16:08:46 -04:00
77f2ffa93f Progress with simultaneous updates to Anilist for Anime 2018-09-20 10:41:28 -04:00
5fe48dfd57 Add Config 'Type', to keep config settings somewhat in check 2018-08-24 14:36:58 -04:00
45b545d32d Cleanup config a bit 2018-08-24 14:23:01 -04:00
0cb09dc4b8 Fix stupid type error 2018-08-22 13:51:58 -04:00
282ba45960 Update file header comments 2018-08-22 13:48:27 -04:00
348fe6e724 Eradicate MAL integration 2018-08-22 13:43:04 -04:00
1fa5695a9f Anime Collection improvements
* Allow editing title and alternate title
* Show list of genres on list view of collection
2018-08-21 17:09:42 -04:00
282022dbd2 Fix test failure 2018-08-20 13:41:25 -04:00
ba8663b22a Various cleanup, some work on #7 2018-08-20 13:01:16 -04:00
ff97cc1cb2 Add basic check for folder permissions for quicker troubleshooting 2018-08-16 12:10:24 -04:00
b3474ddff2 More progress on #5 2018-08-15 16:19:07 -04:00
64a9f41a64 Making API requests to Anilist, see #5 2018-08-15 14:05:28 -04:00
1ab47ca03a More prep for Anilist integration 2018-08-15 08:51:37 -04:00
24ea198dad Adjust layout of edit pages 2018-08-13 15:13:20 -04:00
0ff848c614 More refactoring work, some groundwork for Anilist integration 2018-08-10 20:10:19 -04:00
1dc1370115 Update some types
* Remove empty values from types for serialization, so that empty values
are not sent with API requests
* Allow use of explicit setters for more complex types
2018-08-09 11:34:02 -04:00
3b3156e78a More refactoring, fix snapshot tests 2018-08-08 13:05:38 -04:00
d29945eb96 Fix tests 2018-08-08 11:18:57 -04:00
f04cc7d1d5 Some minor code cleanliness refactoring 2018-08-08 10:12:45 -04:00
e50ce3fa5b Merge remote-tracking branch 'origin/master' into develop 2018-06-15 08:47:16 -04:00
e0e72eeef8 Give a better error message on failing to parse an XML API response 2018-06-15 08:46:28 -04:00
204313abbf Use more efficient method of combining large sets of data from Kitsu 2018-04-11 09:26:14 -04:00
b078690fdf Add more missing streaming logos 2018-04-05 23:00:58 -04:00
1df419cde5 Add Hidive to streaming service mapping 2018-04-05 08:56:01 -04:00
fa2d79c77e Miscellaneous style updates 2018-02-02 09:50:58 -05:00
70832f8b63 Minor refactor of Commands 2018-01-31 15:44:48 -05:00
e6b534078f Add trailer videos to anime detail pages 2018-01-31 10:55:20 -05:00
a6dc8caaa0 Use template literals instead of mustache templates 2018-01-30 16:57:13 -05:00
fe383249e4 Fix issue with anime detail pages 2018-01-30 14:02:28 -05:00
dc9d7ab4e1 Lots of style fixes and minor logic tweaks 2018-01-18 16:21:45 -05:00
55cabc5840 Code style improvements 2018-01-16 14:58:07 -05:00
0f705750e7 Remove strict types from Artax client implementation 2018-01-15 14:49:17 -05:00
4a0792e4fe Update copyright year 2018-01-15 14:43:15 -05:00
7a3ad6ebc6 Correct index of id for kitsu sync 2018-01-10 16:43:49 -05:00
bd61bd734b Simplify syncing script 2018-01-10 16:34:25 -05:00
f205ba8cff Merge remote-tracking branch 'origin/master' into develop 2018-01-10 16:28:37 -05:00
d1987fc710 Handle syncing errors more consistently 2018-01-10 16:18:06 -05:00
98283e27d8 Fix bug with sync, remove some code duplication 2017-12-13 11:38:21 -05:00
d3cbe06cb0 Update Artax, and update other code to work with new version 2017-12-08 22:32:00 -05:00
1634e98799 Miscellaneous code style changes 2017-12-06 14:40:13 -05:00
1ea3a59b6a Correct some errors in creating and deleting anime collection items 2017-12-06 12:30:12 -05:00
d13ad92dd1 Fix MAL sync issue for anime 2017-12-04 16:06:27 -05:00
79c6f21a2f Merge branch 'master' of git.timshomepage.net:timw4mail/HummingBirdAnimeClient 2017-10-18 19:42:01 -04:00
534079b6e7 Add proper logging to console commands 2017-10-18 19:28:57 -04:00
fab01c3e89 Fix an issue with Kitsu <-> MAL sync 2017-10-18 19:28:22 -04:00
23552d62b1 Adding missing method for manga collection 2017-09-15 15:05:35 -04:00
4b248eb8cf Better handle empty lists on sync, resolves #29 2017-09-15 15:04:57 -04:00
d798a057c7 Rough start of Manga collection...need to set up proper structure for manga collection items 2017-09-14 16:18:13 -04:00
2d19809ad3 Refactor a bit to prepare for manga collection 2017-09-14 15:32:53 -04:00
da2fa371e5 Update some api calls based on api changes 2017-09-12 12:18:31 -04:00
8bfc9fcc6e Attempt to re-authenticate when access token expires 2017-06-19 15:31:24 -04:00
5ef0ccf9a7 Some minor refactoring 2017-06-19 13:49:28 -04:00
6caa031c86 Further filter titles, showing only the canonical title if it is really long 2017-04-26 10:09:14 -04:00
d8b985c993 Kitsu <-> MAL manga list item comparison, resolves #18 2017-04-19 16:48:53 -04:00
510ae24dca kitsu <-> mal comparison for anime, see #18 2017-04-19 16:15:39 -04:00
06213df29f Miscellaneous code cleanup 2017-04-17 16:13:36 -04:00
e714599fad Update dependencies, and set a more locked-down content security policy 2017-04-13 15:08:28 -04:00
1df71121eb Use proxy and cached images on user info page 2017-04-13 14:25:39 -04:00
029073a4ea Get images from proxy or cache for Manga views, and Add views 2017-04-13 11:44:03 -04:00
1c06748232 All anime images now pull from proxy or cache 2017-04-13 11:26:28 -04:00
2d9c5b3093 Css tweaks, and start caching kitsu images 2017-04-13 11:15:16 -04:00
59446649f6 Fix changing a list item's status with no score or progress on MAL 2017-04-11 09:28:07 -04:00
4bd62ce881 Fix various edge cases 2017-04-10 15:31:35 -04:00
e6cfe2b6e9 Use a more appropriate function for substring filtering 2017-04-07 16:58:08 -04:00
555de3d17b Tweak handling of alternate titles, to ensure the +1 button is always usable 2017-04-07 16:44:27 -04:00
ed4f9152d4 Replace 0 with - 2017-04-07 13:57:14 -04:00
e5e4323486 Make sure Cast heading only shows up if there are actual cast entries 2017-04-06 21:27:03 -04:00
5357bfb122 Make sure rating parameter sent to Kitsu is greater than 0 2017-04-06 14:53:38 -04:00
05b8136a1e Add a better API timeout message emoticon 2017-04-05 13:08:16 -04:00
853a349a4b Add staff to character pages 2017-04-05 13:02:48 -04:00
ea2b4fe148 Catch API timeouts 2017-04-05 13:01:51 -04:00
255895097a Remove some dead code 2017-04-03 16:53:04 -04:00
388c0a274d Fix creating missing Kitsu items 2017-04-03 15:46:16 -04:00
d91665e3ae More basic tests, see #16 2017-04-03 14:46:29 -04:00
06bc655a59 Details and user page updates, resolves #27 2017-03-31 16:36:22 -04:00
82c86b7b47 Update detail pages 2017-03-31 13:37:53 -04:00
8223786bb5 Remove duplicated function 2017-03-30 16:57:58 -04:00
aa901550a1 Update header comments 2017-03-30 16:49:48 -04:00
f8f499520e Allow over-riding the default lists in the user config 2017-03-30 16:47:02 -04:00
67819156ed Simplify routing code a bit 2017-03-30 16:16:40 -04:00
a767c75014 Make sure rating is only updated if it is numeric 2017-03-29 16:09:22 -04:00
9dfc99f49b More tests 2017-03-29 15:14:30 -04:00
88c65dd0df Add and delete manga simulaneously from kitsu and mal 2017-03-29 14:25:03 -04:00
528deae789 Allow manga +1 button to update both kitsu and mal 2017-03-29 14:00:57 -04:00
3bb4f32bdb Simultaneously update kitsu and MAL manga list item 2017-03-29 13:29:03 -04:00
08a882bbb6 Create missing manga items on kitsu and mal with sync command 2017-03-29 12:32:36 -04:00
a892d875fd Update sync lists command to create Kitsu items that are missing compared to MAL 2017-03-28 16:52:27 -04:00
4f528ca2c8 Minor api model refactoring 2017-03-28 14:36:23 -04:00
754a5e7b98 Reorgnize order of Kitsu model methods 2017-03-28 14:34:33 -04:00
161c2b3bc1 Update dependencies, use ParallelAPIRequest 2017-03-28 11:01:38 -04:00
493ac3ca03 Code cleanup and fix 'On Hold' title on all section of anime list 2017-03-27 10:09:45 -04:00
f59827f95f List characters on manga pages 2017-03-24 10:59:07 -04:00
bc8822e725 Update all the page titles 2017-03-24 09:58:27 -04:00
da336876b6 Fix title of anime pages 2017-03-24 09:10:30 -04:00
f7119a5b0f Show custom 404 pages for missing anime and characters 2017-03-24 09:08:39 -04:00
f3df8f1588 Remove code coverage ignore annotations 2017-03-24 08:49:39 -04:00
Timothy Warren
d6b7075229 Fix 'all' view with missing sections 2017-03-22 16:53:46 -04:00
6f643454ef Update streaming link handling, and add daisuki and viewster 2017-03-22 12:29:07 -04:00
1fd2dd1146 Fix syntax error, prime manga cache too. See #19 2017-03-22 12:28:19 -04:00
535de1cf50 Add command to prime cache, see #19 2017-03-22 11:41:25 -04:00
e84b837dce Fix issue with updating anime item 2017-03-22 11:15:40 -04:00
a58d654d1d Remove unused mappings 2017-03-22 11:14:59 -04:00
40a899066e All anime api calls are now using paginated requests, see #23 2017-03-22 11:13:50 -04:00
185416f09d Miscellaneous code cleanup 2017-03-20 19:08:33 -04:00
0187140e8e Show characters on anime details page 2017-03-20 13:14:01 -04:00
39e083d17c Minor model refactoring 2017-03-14 14:28:08 -04:00
b38d5811a4 More work on user profile page 2017-03-10 12:50:48 -05:00
c895dfcfbe use readable cache keys 2017-03-10 12:50:29 -05:00
4653ce2f42 More work on profile page 2017-03-08 16:21:01 -05:00
5605384b6a Fix tests and start on profile page 2017-03-08 13:46:50 -05:00
3e68fec704 Add basic character pages 2017-03-08 12:55:49 -05:00
d7c47f3c1f Update all the header comments with the correct repository url 2017-03-07 20:53:58 -05:00
34604d1b7b Fix issues with sync-lists command, add more docblocks 2017-03-07 20:49:31 -05:00
b6dc104947 Fix 'All' section on Manga page 2017-03-07 18:41:51 -05:00
26d339e546 Add back 'All' menu item for anime 2017-03-07 17:51:08 -05:00
15b6d492f1 Make sure mapping is accurately named
\!
2017-03-03 11:51:53 -05:00
5c382db49c Move AnimeWatchingStatus and MangaReadingStatus enums to the same namespace 2017-03-02 11:12:19 -05:00
df249fd423 Remove accidentially created Java file 2017-03-01 22:11:37 -05:00
88f6a3fc4f Rework the rest of the mappings 2017-03-01 22:07:51 -05:00
9c7ed16538 Update Manga mappings and enums 2017-03-01 21:52:30 -05:00
1f86d4460c Add new mapping class for Anime watching statuses 2017-03-01 20:51:40 -05:00
d15710abfa More PHPStan fixes 2017-02-22 15:08:29 -05:00
d620e44114 PHPStan fixes 2017-02-22 14:46:35 -05:00
7889849fe2 Update method references in Manga controller 2017-02-21 15:37:29 -05:00
adecbe1e5c Update method references in Collection controller 2017-02-21 15:36:34 -05:00
96fce9a6d5 Use new ParallelAPIRequest class 2017-02-20 13:37:08 -05:00
fdd7f91835 More code style fixes 2017-02-17 11:37:22 -05:00
9951053b4f Lots of style fixes, with more to come 2017-02-17 10:55:17 -05:00
1f58d7a419 Slightly reorganize model hierarchy 2017-02-17 08:39:27 -05:00
58549b7018 Various tweaking 2017-02-17 08:25:19 -05:00
1f6100c367 Yet more snake case to camel case 2017-02-16 14:30:06 -05:00
4def692123 Make sure header comments are actually updated for all code files 2017-02-16 11:09:37 -05:00
365da603fa And more snake case to camel case 2017-02-15 16:30:14 -05:00
b902464446 Update header comments 2017-02-15 16:13:32 -05:00
8c31a3b6d6 More snake case to camel case 2017-02-15 15:56:10 -05:00
7648d31e53 More code styles fixes 2017-02-15 15:35:41 -05:00
6652ed7354 More style fixes 2017-02-15 13:07:36 -05:00
a04643ea10 Fix more code style issues 2017-02-15 11:57:29 -05:00
e5db6bebe8 Snake case to camel case 2017-02-15 11:30:16 -05:00
506cce02cf Remove some unused code 2017-02-15 11:18:55 -05:00
0d553b7dd4 Get sync-lists command to create missing entries on MAL 2017-02-14 15:29:13 -05:00
9c1dc50e65 Uncomment rewatching stuff 2017-02-13 13:33:01 -05:00
cfa23b8066 Fix mapping from Kitsu to MAL for updating a list item 2017-02-13 12:42:05 -05:00
fb1af97bae Fix config mapping for BaseCommand 2017-02-10 16:12:02 -05:00
e2aa61f580 Fix update requests broken by Artax conversion 2017-02-09 20:10:13 -05:00
c9f74dd863 Remove 'fix' for issue caused by php.ini setting 2017-02-09 13:45:40 -05:00
0e9c257ab7 Another ugly progress commit
- Eradicated Guzzle from main codebase
- All API requests now use Artax
- Refactor code to use function and constant imports
- And more!
2017-02-08 15:48:20 -05:00
5aafbc9cb2 Start of work to replace Guzzle with Artax 2017-02-08 00:44:57 -05:00
5f0f830aea Update headers and some whitespace 2017-02-07 13:27:41 -05:00
20540963ff Create Request Builder wrapper around Artax 2017-02-07 13:11:42 -05:00
5c5b1cd318 Only translate fields that are passed in 2017-02-07 09:12:44 -05:00
a48c3e5f8e Actually update MAL if enabled 2017-02-04 15:18:34 -05:00
47bfe810fc Able to create list items on MAL 2017-02-01 09:53:02 -05:00
c38b4b7f45 Misc updates 2017-01-31 12:52:43 -05:00
ad4b71ac03 More test coverage, attempt to get Gitlab to see test coverage 2017-01-27 15:41:52 -05:00
ef6d0f82fd Ugly progress commit 2017-01-27 12:35:28 -05:00
3f90e93af1 Get xml parsing working predictably 2017-01-27 09:43:42 -05:00
192618b890 Make sure to pass the correct arguments to the cache hash method 2017-01-26 13:06:35 -05:00
04e8a9e514 Refactor KitsuModel, add more docblocks 2017-01-26 13:03:38 -05:00
b8f75e14ec Fix display of streaming links in cover and list views 2017-01-25 13:37:39 -05:00
1818bf105d Fix issue with selected list highlighting, fixes #20 2017-01-25 12:13:37 -05:00
5f6c1f9f48 Fix cache clear command 2017-01-19 12:49:18 -05:00
94bfdebf46 Update commands 2017-01-17 12:47:02 -05:00