Commit graph

1104 commits

Author SHA1 Message Date
Joel Bradshaw
0af4863568 Update merge migration 2021-01-17 13:21:26 -08:00
Joel Bradshaw
49893f49e1 Merge fixes 2021-01-17 13:09:49 -08:00
Joel Bradshaw
a4519d55c9 Merge branch 'main' into progress_update 2021-01-17 13:05:38 -08:00
Joel Bradshaw
ef05ac1f65 Small fixes to old form 2021-01-17 12:48:10 -08:00
Joel Bradshaw
6e05dfde92 Revert "Make the switching work, wows"
Actually this is bad, switching on this page is not useful enough for
the UI complexity. Users can switch percent/pages on the book page.

This reverts commit a4796cf5c5.
2021-01-17 12:40:24 -08:00
Mouse Reeve
48febecf0d
Merge pull request #523 from cincodenada/fix-ordering-warning
Add order for shelf books to satisfy warning
2021-01-17 11:35:54 -08:00
Mouse Reeve
9b8e5a4139 Removes unused reply form template 2021-01-17 11:20:32 -08:00
Mouse Reeve
8576bf8ada Uses new button patttern for content warnings 2021-01-17 11:15:53 -08:00
Mouse Reeve
73c1b5a1ff Component for dropdowns
also use hoverable dropdowns
2021-01-17 11:09:49 -08:00
Mouse Reeve
e64507e50d Uses has-addons css for interact buttons 2021-01-17 10:45:25 -08:00
Mouse Reeve
c6e5b33970 Uses css has-addons for shelve button 2021-01-17 10:40:40 -08:00
Mouse Reeve
ff743ed9d6 Javascript button for reply form 2021-01-17 10:38:34 -08:00
Mouse Reeve
47d5b907ac Readthrough interactions 2021-01-17 10:10:59 -08:00
Mouse Reeve
f7e3cbda84 Uses toggle button snippet for content warning 2021-01-17 08:50:47 -08:00
Mouse Reeve
afdf5fc8ec starts replacing pure css buttons with javascript buttons
RIP, but it was time
2021-01-17 08:26:28 -08:00
Joel Bradshaw
a4796cf5c5 Make the switching work, wows
Layout's all wonky now, but hey
2021-01-17 03:14:26 -08:00
Joel Bradshaw
2d157137aa Fix inline form 2021-01-17 02:57:10 -08:00
Joel Bradshaw
da8d8cd434 Add deletion of progress updates
And only show progress edit for editing unfinished readthroughs
2021-01-17 02:28:37 -08:00
Joel Bradshaw
ddb5848d32 Move error down into to_ordered_queryset 2021-01-16 23:31:47 -08:00
Mouse Reeve
2e043f9252 Make it doubly clear that the hidden checkbox is hidden 2021-01-16 20:06:19 -08:00
Mouse Reeve
f42fd28c73 Removes unused javascript 2021-01-16 19:59:08 -08:00
Mouse Reeve
3e58163f0d refactors content warning button 2021-01-16 19:57:20 -08:00
Mouse Reeve
6ab543004e Uses card component for reading goal announcement 2021-01-16 14:48:17 -08:00
Mouse Reeve
de9fbcef80 Naturally 404 for deleted statuses 2021-01-16 14:38:21 -08:00
Mouse Reeve
d6dc975a2e Creates re-usable template for cards 2021-01-16 14:38:21 -08:00
Mouse Reeve
fa56ae873b Screenreader tweaks 2021-01-16 14:33:43 -08:00
Mouse Reeve
8532c9a46b tests goal views 2021-01-16 13:29:28 -08:00
Mouse Reeve
ec79b10088 Post status about goal 2021-01-16 12:48:04 -08:00
Mouse Reeve
f3f6592e72 Edit goal 2021-01-16 12:39:51 -08:00
Mouse Reeve
112b9f9332 Create goal with privacy 2021-01-16 11:34:19 -08:00
Mouse Reeve
739b6e19e2 Dismiss reading goal using localstorage 2021-01-16 09:21:19 -08:00
Mouse Reeve
11ea829657 Adds icon to goal form 2021-01-16 08:54:16 -08:00
Mouse Reeve
3a7271309e Adds markup for set goal status on feed page 2021-01-16 08:19:54 -08:00
Mouse Reeve
b648012af5 Adds form and models for reading goal 2021-01-16 08:18:54 -08:00
Mouse Reeve
3866523d57 Fixes merge conflict resolution bug 2021-01-15 13:12:46 -08:00
Mouse Reeve
f61a25cfb1
Merge branch 'main' into html-interaction 2021-01-15 09:45:33 -08:00
Mouse Reeve
6e254e548c
Merge pull request #519 from mouse-reeve/view-actions-tests
Overhauls views/view_actions/outgoing
2021-01-15 09:39:07 -08:00
Mouse Reeve
861249080b Moves toggle menu javascript out of html 2021-01-14 15:45:30 -08:00
Mouse Reeve
7abe39b7d5 Tab change javascript out of html 2021-01-14 15:29:37 -08:00
Mouse Reeve
4d4e692f49 Javascript cleanup 2021-01-14 15:16:18 -08:00
Mouse Reeve
5591024933 Moves interaction javascript out of html 2021-01-14 14:38:33 -08:00
Mouse Reeve
d59c586e55 use snippet for modal close buttons 2021-01-14 14:21:27 -08:00
Mouse Reeve
b1cdddd1a2 Adds titles to icons 2021-01-14 14:13:23 -08:00
Mouse Reeve
aa7320ffe0 Using toggle button snippets on shelf page 2021-01-14 14:00:05 -08:00
Mouse Reeve
e2d341b147 vertical align bottom post button in reply form 2021-01-14 13:51:07 -08:00
Mouse Reeve
f8d5eec60d cw back on the top
it just felt weird on the bottom??
2021-01-14 13:43:52 -08:00
Mouse Reeve
aa564b26c8 Uses snippet for toggle buttons 2021-01-14 13:35:09 -08:00
Mouse Reeve
e57c4f4bcd Adds focus control javascript 2021-01-14 13:02:28 -08:00
Mouse Reeve
e5155d9402 Removes duplicate start reading modal markup 2021-01-14 11:34:22 -08:00
Joel Bradshaw
b0ea31f2a9 Add order for shelf books to satisfy warning
I believe this will sort books by order they were added to the shelf,
which seems reasonable. Should add some tests to make sure though.
2021-01-13 23:44:44 -08:00
Joel Bradshaw
1e13997c5d Create an actual user, add missing file
Also allow `./bw-dev up -d`

I'm not sure why this was necessary, but it makes enough sense
2021-01-13 23:02:56 -08:00
Joel Bradshaw
48147883ce Merge branch 'main' into progress_update 2021-01-13 19:53:26 -08:00
Mouse Reeve
766c7afdb9 Don't let long titles display past card title box 2021-01-13 19:38:26 -08:00
Mouse Reeve
eb2d414321
Merge pull request #521 from cincodenada/login-multiline-mobile
Make login form wrap nicely on mobile
2021-01-13 19:31:36 -08:00
Mouse Reeve
0a9757bf01 A few more templatetag tests 2021-01-13 19:28:44 -08:00
Joel Bradshaw
f985ca0576 Make login form wrap nicely on mobile
Changing to columns from a grouped form item isn't my favorite, but I
think it's okay, and it gets us better mobile behavior for free
2021-01-13 19:16:45 -08:00
Mouse Reeve
c0ce38a9d3 landing page tests 2021-01-13 18:48:50 -08:00
Joel Bradshaw
0b703a252b Make get_rank() a regular method
It doesn't act like a property, and we have edition_rank as a proper
property anyway
2021-01-13 18:47:43 -08:00
Joel Bradshaw
ec2a43faa5 Fix error in migrations
I was getting the following error when running 0035:
AttributeError: 'Edition' object has no attribute 'get_rank',

But that line seems to be unnecessary, since save() does the same thing,
and we are already calling that.
2021-01-13 18:37:05 -08:00
Mouse Reeve
7d6a06025e Adds more reading tests 2021-01-13 18:02:01 -08:00
Mouse Reeve
3eceb1e2b8 Fixes interaction tests 2021-01-13 14:31:52 -08:00
Mouse Reeve
90933fa81d Fixes goodreads import tests 2021-01-13 14:02:01 -08:00
Mouse Reeve
e32a31e020 Fixes tests 2021-01-13 13:54:15 -08:00
Mouse Reeve
3e5ed19643 Removes outgoing and view_actions 2021-01-13 13:36:01 -08:00
Mouse Reeve
a385aa4cb5 Following views 2021-01-13 13:06:26 -08:00
Mouse Reeve
7555d76c3f Adds reading acitivity views 2021-01-13 12:35:39 -08:00
Mouse Reeve
2e61bd0e7a Removes old views file 2021-01-13 12:18:19 -08:00
Mouse Reeve
12bf34e242 Adds error page views 2021-01-13 12:08:51 -08:00
Mouse Reeve
ffd403dd47 sorts imports for views 2021-01-13 12:08:35 -08:00
Mouse Reeve
b6bdfab943 Search class views 2021-01-13 12:05:01 -08:00
Mouse Reeve
beeeaaaf39 Adds shelf views 2021-01-13 11:45:08 -08:00
Mouse Reeve
20e280e676 Adds tag class views 2021-01-13 10:24:24 -08:00
Mouse Reeve
99abb2631e Adds author view 2021-01-13 10:04:44 -08:00
Mouse Reeve
4dea22bef6 Author class view 2021-01-13 09:54:35 -08:00
Mouse Reeve
56e3e98bc1 Adds book class view and re-works pagination 2021-01-13 09:51:51 -08:00
Mouse Reeve
cf2b9937c6 Adds fav/boost class view 2021-01-13 08:10:50 -08:00
Mouse Reeve
c8efa1ffc8 Fixes status tests and adds delete test 2021-01-13 08:04:43 -08:00
Mouse Reeve
5596277d29 tests status class view 2021-01-12 14:43:59 -08:00
Mouse Reeve
6c80b128a4 Adds status tests 2021-01-12 14:02:38 -08:00
Mouse Reeve
4ec64c02f4 Adds status views 2021-01-12 13:47:00 -08:00
Mouse Reeve
85d01d5df0 Moves user views to class view 2021-01-12 12:09:23 -08:00
Mouse Reeve
8693895bc6 Adds import view 2021-01-12 11:28:03 -08:00
Mouse Reeve
b61544b5f5 DM and notification views 2021-01-12 11:11:22 -08:00
Mouse Reeve
aa8b2c2f2b Creates landing page views 2021-01-12 10:44:17 -08:00
Mouse Reeve
fd6603ee07 Invite views 2021-01-12 10:19:58 -08:00
Mouse Reeve
65fa08633f Fixes authentication tests 2021-01-12 10:14:24 -08:00
Mouse Reeve
a2d7a97dc3 Updates tests 2021-01-12 09:09:05 -08:00
Mouse Reeve
00a67f1b99 Password reset and change password flows 2021-01-12 08:48:47 -08:00
Mouse Reeve
05b4cb59b0 Adds registration view 2021-01-12 08:19:08 -08:00
Mouse Reeve
6e71ff2aa1 Adds login class view 2021-01-12 08:08:43 -08:00
Mouse Reeve
a8483754c3 Fixes edit book view 2021-01-11 20:21:32 -08:00
Mouse Reeve
4319e58079 Fixes squished avatars 2021-01-11 18:09:12 -08:00
Mouse Reeve
e34ae35e0f
Merge pull request #513 from mouse-reeve/edit-shelf
Edit shelf
2021-01-11 15:28:45 -08:00
Mouse Reeve
3d170b3eb0
Merge pull request #514 from mouse-reeve/shelf-status-privacy
Use shelf privacy for "wants to read" status privacy
2021-01-11 15:28:20 -08:00
Mouse Reeve
8ade29c4c1 Use shelf privacy for "wants to read" status privacy 2021-01-11 14:49:01 -08:00
Mouse Reeve
1bcb19fde9 Fixes editing shelves 2021-01-11 14:43:34 -08:00
Mouse Reeve
8d88c768cc Adds test for editing shelf 2021-01-11 14:23:56 -08:00
Mouse Reeve
a6eb444a68 Don't error out user page 2021-01-11 14:05:08 -08:00
Mouse Reeve
5b7f7aa0e3 sort edition list by rank 2021-01-11 11:16:10 -08:00
Mouse Reeve
fe67f65307 Set default edition on bookwyrm import 2021-01-11 10:25:34 -08:00
Mouse Reeve
83852e29eb Update edition ranks when work is saved 2021-01-11 10:02:49 -08:00
Mouse Reeve
6db64e33e4 set rank on editions 2021-01-11 09:29:23 -08:00
Mouse Reeve
b44b42be7e Adds rank field to edition model 2021-01-11 09:18:40 -08:00
Mouse Reeve
62fd118016 remove boost notification on delete 2021-01-10 19:51:58 -08:00
Mouse Reeve
ee96c01cc1 Boost unit tests 2021-01-10 19:43:12 -08:00
Mouse Reeve
31aef46564 tweaks notifications for favs 2021-01-10 19:32:05 -08:00
Mouse Reeve
64abdafcba Resolves timezone warnings 2021-01-10 16:11:02 -08:00
Mouse Reeve
ef9e130669 Adds tests 2021-01-10 15:56:57 -08:00
Mouse Reeve
327020f7b3 views handler for creating readthrough dates 2021-01-10 10:51:56 -08:00
Mouse Reeve
b0e4fc2aa9 Adds ui for creating readthrough 2021-01-10 10:35:28 -08:00
Mouse Reeve
71133c51c6 Set link color on follow button 2021-01-10 10:21:23 -08:00
Mouse Reeve
9c994e893b
Merge pull request #506 from mouse-reeve/readthrough-dupes
Don't double-add readthroughs in re-import
2021-01-10 10:18:31 -08:00
Mouse Reeve
df985c571b
Merge pull request #507 from mouse-reeve/discover-page-cover-width
Smaller max width for large covers
2021-01-10 10:18:25 -08:00
Mouse Reeve
aa151c111f Smaller max width for large covers 2021-01-10 09:50:17 -08:00
Mouse Reeve
b1b40e3c98 Don't double-add readthroughs in re-import 2021-01-10 09:36:11 -08:00
Mouse Reeve
9a575beb0b
Merge pull request #505 from mouse-reeve/link-regex-parens
Work around parens in the url regex
2021-01-10 09:22:19 -08:00
Mouse Reeve
1e42622b8e Work around parens in the url regex 2021-01-10 08:39:30 -08:00
Mouse Reeve
6eb7872598 Fixes queryset for shelf page json 2021-01-10 07:54:58 -08:00
Mouse Reeve
a1e8d5c7c2 Fixes showing completed imports and in progress 2021-01-07 09:36:41 -08:00
Mouse Reeve
9a114e1736 Don't match arbitrary results on empty isbn queries 2021-01-07 09:26:05 -08:00
Mouse Reeve
d04271af75 Adds field on import job to check if job completed
the task isn't a reliable indicator, unfortunately.
2021-01-07 08:08:12 -08:00
Mouse Reeve
e60a984bea
Merge pull request #497 from mouse-reeve/shelving-actions
Shelving actions
2021-01-06 21:05:04 -08:00
Mouse Reeve
453e17f756
Merge pull request #496 from mouse-reeve/status-markup
Status markup
2021-01-06 21:04:34 -08:00
Mouse Reeve
b5ba97c385 uses article element instead of div for statuses 2021-01-06 20:05:28 -08:00
Mouse Reeve
b1d4b75926 Fixes tail end of shelving pulldown getting hidden 2021-01-06 19:56:56 -08:00
Mouse Reeve
02aac76acc Added some grays to the status box
why am I doing this instead of the thing I meant to do
2021-01-06 19:52:47 -08:00
Mouse Reeve
5c6aed1b0e Consistent button sizing in status footer 2021-01-06 19:45:18 -08:00
Mouse Reeve
5f0a788856 Show all readthroughs 2021-01-06 18:34:21 -08:00
Mouse Reeve
551e71162c Show start reading button in dropdown instead of reshelve button 2021-01-06 18:17:25 -08:00
Mouse Reeve
3eae55ef4e Adds icon for imports and follow button 2021-01-06 18:02:46 -08:00
Mouse Reeve
e4fbfc369c Removes print statement 2021-01-06 16:01:37 -08:00
Mouse Reeve
54f27519df Fixes username regex 2021-01-06 16:01:13 -08:00
Mouse Reeve
03a5f333e1 Cleans up notifications 2021-01-06 15:53:09 -08:00
Mouse Reeve
67f2b3d808 Proper errorhandling for registration with invite 2021-01-06 13:15:33 -08:00
Mouse Reeve
b046547a6e
Merge pull request #493 from mouse-reeve/bidirectional-text
Support bidirectional text in status content
2021-01-06 12:20:33 -08:00
Mouse Reeve
29dd2ae863
Merge pull request #492 from mouse-reeve/handle-favorite-error
Avoid throwing database error trying to fav unknown statuses
2021-01-06 12:03:01 -08:00
Mouse Reeve
054f69993b Support bidirectional text in status content 2021-01-06 12:00:34 -08:00
Mouse Reeve
7bf57c60fb Avoid throwing database error trying to fav unknown statuses 2021-01-06 11:43:39 -08:00
Mouse Reeve
6638c9bb44 Handles query params in urls 2021-01-06 11:36:28 -08:00
Mouse Reeve
9e07f094ad Improves link detecting regex 2021-01-06 10:08:43 -08:00
Mouse Reeve
a25bc2383b Improves tagging regex 2021-01-06 09:45:36 -08:00
Mouse Reeve
f87a138d49 Better matching for links in statuses 2021-01-05 21:23:36 -08:00
Mouse Reeve
a60cf0ea22
Merge pull request #485 from mouse-reeve/invite-created-date
Adds site invite migration
2021-01-05 11:45:51 -08:00
Mouse Reeve
c8d53ee0df Adds site invite created date 2021-01-05 11:38:03 -08:00
Mouse Reeve
aa5bf8a382
Merge pull request #483 from mouse-reeve/registration-text-format
Fixes html formatting for registration closed text
2021-01-05 11:37:09 -08:00
Mouse Reeve
6261080836
Merge pull request #484 from mouse-reeve/user-page-feed
Fixes bug that shows your own posts in every user page
2021-01-05 11:34:57 -08:00
Mouse Reeve
5864c9a6e7 Revert "Add created date and sorting to invites"
This reverts commit 11212401a0.
2021-01-05 11:33:33 -08:00
Mouse Reeve
3d6f113543 Fixes bug that shows your own posts in every user page 2021-01-05 11:16:24 -08:00
Mouse Reeve
11212401a0 Add created date and sorting to invites 2021-01-05 11:08:24 -08:00
Mouse Reeve
7c34889586 Fixes html formatting for registration closed text 2021-01-05 10:46:07 -08:00
Mouse Reeve
cc44331073 activity feed should handle looged out users 2021-01-04 19:47:22 -08:00
Mouse Reeve
35696934da refactors get_activity_feed function
is it better? idk
2021-01-04 19:30:05 -08:00
Mouse Reeve
8301bec4ff Use accurate review count 2021-01-04 17:59:46 -08:00
Mouse Reeve
a0a8ad508a Book page filters ratings with empty string content 2021-01-04 17:55:29 -08:00
Mouse Reeve
1046aa7ad2 Re-organizes metadata on book page 2021-01-04 17:42:02 -08:00
Mouse Reeve
89e2e75c0b Only show rate action for logged in users 2021-01-04 16:50:58 -08:00
Mouse Reeve
10523e38e8 Updates fields in edit book form 2021-01-04 16:42:28 -08:00
Mouse Reeve
35e2410642 Show series in book page 2021-01-04 16:33:45 -08:00
Mouse Reeve
0f4a30324e Makes more about instance text customizable 2021-01-04 12:58:31 -08:00
Mouse Reeve
0c0e9bebdf Use uploaded logos in templates 2021-01-04 12:47:10 -08:00
Mouse Reeve
7cc2dfe517 Merge branch 'main' into logo-default 2021-01-04 12:18:40 -08:00
Mouse Reeve
1d2b56da85 Fixes outgoing tests 2021-01-04 12:00:53 -08:00
Mouse Reeve
9102d81767 Fixes checking invite validity 2021-01-04 11:14:10 -08:00
Mouse Reeve
81e60cea16 Fixes login form 2021-01-04 11:14:07 -08:00
Mouse Reeve
3fe7b95786 Fixes setting remote user username on update 2021-01-04 10:42:31 -08:00
Mouse Reeve
4090b336db Fixes outgoing test users 2021-01-04 10:20:49 -08:00
Mouse Reeve
15b9f62136 Fixes users in views tests 2021-01-04 10:08:45 -08:00
Mouse Reeve
50f61f5d19 Merge branch 'main' into validate-username 2021-01-04 09:41:17 -08:00
Mouse Reeve
34e9847da3 Still need to remove validator arg in username field 2021-01-04 09:40:23 -08:00
Mouse Reeve
d8eb3454d6 Fixes null value in status attachment array 2021-01-03 20:03:35 -08:00
Mouse Reeve
b608e36946 Filter books for discover page for privacy 2021-01-03 15:44:07 -08:00
Mouse Reeve
c0bd0736d3 Hide join button when registration is closed 2021-01-03 15:41:20 -08:00
Mouse Reeve
6668f54889 Fixes openlibrary test and navbar hover aria unfurl 2021-01-03 14:41:10 -08:00
Mouse Reeve
eec3e6c4b4 Hide top bar login form on login page 2021-01-03 14:35:28 -08:00
Mouse Reeve
7242adadaa Hide login form for authenticated users 2021-01-03 14:31:32 -08:00
Mouse Reeve
0247f89c0b Use recent reviews instead of most reviewed books 2021-01-03 14:28:28 -08:00
Mouse Reeve
8e923d6333 User container class in layout 2021-01-03 12:53:51 -08:00
Mouse Reeve
e3fa0afa9a Hide large logo on mobile 2021-01-03 11:52:37 -08:00
Mouse Reeve
721d20efab Creates snippets for discover preview boxes 2021-01-03 11:24:26 -08:00
Mouse Reeve
ef42d29bd9 Discovery landing page 2021-01-03 11:10:04 -08:00
Mouse Reeve
04eb518633 Make the top bar dropdown accessible to NVDA screenreaders
plus, it's just better for this to be a ul
2021-01-03 10:03:57 -08:00
Mouse Reeve
18e0347077
Merge pull request #470 from mouse-reeve/duplicate-replies-in-feed
Fixes replies showing up twice in feed
2021-01-03 08:32:01 -08:00
Mouse Reeve
1187016aba
Merge pull request #469 from mouse-reeve/user-search
Search on username and localname in user search
2021-01-03 08:31:46 -08:00
Mouse Reeve
4d4b27e844 Fixes replies showing up twice in feed 2021-01-03 08:17:00 -08:00
Mouse Reeve
e54e1f2459 Tests user search 2021-01-03 07:57:57 -08:00
Mouse Reeve
b5ce7a0c25 Search on username and localname in user search 2021-01-03 07:48:57 -08:00
Renato "Lond" Cerqueira
b389cfb013 Use user-agent to determine whether to show pure representation
Together with #434 and #435, this fixes #429. Use the user-agent to
determine if the call is coming from a BookWyrm instance or not. If it's
not, give a pure activitypub representation for the status. Otherwise,
give a BookWyrm one, to allow for a complete integration between
instances.
2021-01-03 14:24:03 +01:00
Mouse Reeve
8afd111ff4
Merge pull request #466 from mouse-reeve/search-tweaks
Search tweaks
2021-01-02 16:30:28 -08:00
Mouse Reeve
d3c181cacb Re-sorts search results after deduplication 2021-01-02 16:09:54 -08:00
Mouse Reeve
a413c87963 Separate search for unique identifiers out from text search 2021-01-02 15:58:25 -08:00
Mouse Reeve
a2e8cf1993 Return best matching edition instead of default in search 2021-01-02 15:15:25 -08:00
Mouse Reeve
afa1921968 Deduplicates search results 2021-01-02 14:33:01 -08:00
Mouse Reeve
4c968c417b cleans up search tests 2021-01-02 14:20:39 -08:00
Mouse Reeve
22f5fa154c Add readthroughs even when a book is already shelved 2021-01-02 13:26:42 -08:00
Mouse Reeve
b2c22c5b7f Tests handle import shelving 2021-01-02 13:09:40 -08:00
Mouse Reeve
8c8aae2c92 Check if a book is already shelved after import 2021-01-02 12:08:30 -08:00
Mouse Reeve
3344eed3b9 Tests for goodreads import lookup 2021-01-02 11:35:56 -08:00
Mouse Reeve
97b56e9bc2 Removes references to max entries in views 2021-01-02 09:45:51 -08:00
Mouse Reeve
204967e421 Adds tests file for goodreads import 2021-01-02 09:42:50 -08:00
Mouse Reeve
1f5d95e2be Removes import limit 2021-01-02 09:42:33 -08:00