449 commits

Author	SHA1	Message	Date
Mouse Reeve	0171b5a427	Fixes typo in notifications link	2020-11-08 12:24:50 -08:00
Jim Fingal	8c6c28c7d8	Move initdb into a management command	2020-11-08 10:30:55 -08:00
Mouse Reeve	edc653e273	Fixes typo in edit user manually approve followers label	2020-11-08 09:45:42 -08:00
Mouse Reeve	01f7d2ac44	Updates nodeinfo and api info	2020-11-07 21:07:07 -08:00
Mouse Reeve	e21d59386c	Don't show reshelve buttons on other people's shelves ... yikes	2020-11-07 20:47:56 -08:00
Mouse Reeve	50aaa8d9a1	Don't error on statuses that didn't get created	2020-11-07 20:13:13 -08:00
Mouse Reeve	4710e65269	create notification for local favs/boosts	2020-11-07 19:15:04 -08:00
Mouse Reeve	aa170d0d6c	Merge pull request #310 from mouse-reeve/unboost ... Unboost	2020-11-07 19:00:10 -08:00
Mouse Reeve	57fad30b6b	Fixes unboost	2020-11-07 18:59:38 -08:00
Mouse Reeve	dce766a929	Merge pull request #307 from mouse-reeve/test ... corrects tests for latest code changes	2020-11-07 18:32:35 -08:00
Mouse Reeve	c58538539a	Outgoing unboost	2020-11-07 18:31:01 -08:00
Mouse Reeve	e6d46878fb	Fixes like/unlike statuses	2020-11-07 18:18:44 -08:00
Mouse Reeve	cfa4cb015d	corrects tests for latest code changes	2020-11-07 17:48:50 -08:00
Mouse Reeve	20395ff2ec	Corrects serialization of Add activity	2020-11-07 16:11:12 -08:00
Mouse Reeve	65770b8dd4	Merge pull request #303 from mouse-reeve/nodeinfo-user-count ... Only report local users in user count	2020-11-07 12:39:47 -08:00
Mouse Reeve	3ba02f8fbd	Only report local users in user count	2020-11-07 12:07:09 -08:00
Mouse Reeve	5a842ca6ad	Merge pull request #301 from mouse-reeve/shelf-controls ... Pulldown for moving books between or off shelves	2020-11-07 11:55:55 -08:00
Mouse Reeve	794aeb299c	Max on books shown from shelves in suggestions bar	2020-11-07 11:54:32 -08:00
Mouse Reeve	70cd706ce3	Pulldown for moving books between or off shelves	2020-11-07 11:49:57 -08:00
Mouse Reeve	dd4e323e18	Fixes cover filesnames	2020-11-07 10:59:08 -08:00
Mouse Reeve	1ffa21b67d	Fixes suggested books and serialize covers in status	2020-11-07 10:56:24 -08:00
Mouse Reeve	83770abfd2	Deduplicate incoming create activities ... This is a regression.	2020-11-07 10:29:46 -08:00
Mouse Reeve	ba97870276	get suggested books from shelfbook	2020-11-06 20:51:11 -08:00
Mouse Reeve	a02f380472	Merge pull request #295 from mouse-reeve/suggested-books ... Show shelf names with suggested books	2020-11-06 20:40:23 -08:00
Mouse Reeve	b763b7469b	Show shelf names with suggested books	2020-11-06 20:36:52 -08:00
Mouse Reeve	275527f255	Merge branch 'main' into load_remote_statuses	2020-11-06 15:48:17 -08:00
Mouse Reeve	ce4c02936d	Merge pull request #293 from mouse-reeve/tagging ... fixes tagging	2020-11-06 15:46:45 -08:00
Mouse Reeve	3641661c9b	Merge pull request #292 from mouse-reeve/markup-cleanup ... Markup cleanup	2020-11-06 15:46:03 -08:00
Mouse Reeve	a8b1c1ce98	button audit	2020-11-06 15:20:11 -08:00
Mouse Reeve	a1242cd83f	Invalid title for status page causing 500	2020-11-06 15:14:30 -08:00
Mouse Reeve	7f7cce3bb8	Group invite form elements	2020-11-06 15:08:40 -08:00
Mouse Reeve	0b34b6cd96	Updates code for loading remote statuses	2020-11-06 14:56:05 -08:00
Mouse Reeve	d320ba1ff9	Don't put deleted statuses in outbox	2020-11-06 14:53:27 -08:00
Mouse Reeve	ad25e75282	fixes tagging	2020-11-06 14:25:48 -08:00
Mouse Reeve	9d1f1ce84b	tweaks tag markup	2020-11-06 14:01:43 -08:00
Mouse Reeve	404ec82657	Simplify markup for creating status	2020-11-06 13:33:26 -08:00
Mouse Reeve	9ef63fff4a	More formatting for editing readthrough	2020-11-06 13:04:58 -08:00
Mouse Reeve	ec463ff4c8	Confirm deleting readthroughs	2020-11-06 12:51:49 -08:00
Mouse Reeve	981628260a	Don't show read dates of "None"	2020-11-06 12:40:21 -08:00
Mouse Reeve	f868471460	cleans up cover upload form	2020-11-06 12:27:52 -08:00
Mouse Reeve	c883893dd6	Slightly less messy boost status header	2020-11-06 12:09:14 -08:00
Mouse Reeve	8550cbc710	Move user header into snippets	2020-11-06 12:02:25 -08:00
Mouse Reeve	681ebd136a	Links on user page	2020-11-06 12:00:00 -08:00
Mouse Reeve	8b5b6e13a5	Use check icon instead of unicode character	2020-11-06 11:55:32 -08:00
Mouse Reeve	6aa7522c34	Put status form in a visual distinct box on book page ... and clean up create status markup	2020-11-06 11:54:31 -08:00
Mouse Reeve	2ad16f86a0	Move privacy selector to snippet	2020-11-06 09:07:15 -08:00
Mouse Reeve	4ec6104cac	Want to read activity	2020-11-06 09:07:04 -08:00
Mouse Reeve	8f5d6c11ef	button spacing in shelve button pulldown	2020-11-06 09:00:33 -08:00
Mouse Reeve	86f170b11c	Functional cancel buttons	2020-11-06 08:54:59 -08:00
Mouse Reeve	c64acf559b	create readthroughs	2020-11-06 08:51:50 -08:00
Mouse Reeve	7bf39d3bf7	html for updated reading progress flow	2020-11-05 16:48:15 -08:00
Mouse Reeve	7612df5161	Use html in code of conduct	2020-11-05 13:51:16 -08:00
Mouse Reeve	632ef258b7	Colors for follow/unfollow buttons	2020-11-05 12:09:05 -08:00
Mouse Reeve	a48bb5a16e	Adds cancel button to edit book page	2020-11-05 12:05:29 -08:00
Mouse Reeve	a3bf31796a	Make status footer more mobile friendly	2020-11-05 11:40:03 -08:00
Mouse Reeve	7f11afa081	Revamps reply form	2020-11-05 10:48:28 -08:00
Mouse Reeve	1c442f0dfe	More legible statuses on mobile	2020-11-05 08:21:00 -08:00
Mouse Reeve	152343d251	Boost and unboost federation fixes	2020-11-04 16:28:32 -08:00
Mouse Reeve	21c0a0163a	Deduplicate incoming Create notes	2020-11-04 15:23:52 -08:00
Mouse Reeve	722f44ac9f	actual fix for status deserialization	2020-11-04 14:19:06 -08:00
Mouse Reeve	4bde389d6b	Fixes matching activities to models	2020-11-04 14:13:34 -08:00
Mouse Reeve	61ac7b1426	Removes stray paren from quoation pure serializer	2020-11-04 14:01:28 -08:00
Mouse Reeve	19a9136ebb	Correctly serialize edition ids in work page	2020-11-04 13:31:44 -08:00
Mouse Reeve	9238f4c74a	Correclty parse ordered collection json for editions	2020-11-04 13:18:30 -08:00
Mouse Reeve	6bf9a7159b	Load expanded book data from bookwyrm connector	2020-11-04 13:09:11 -08:00
Mouse Reeve	53a358f2fd	Activitypub serializable edition list	2020-11-04 12:55:00 -08:00
Mouse Reeve	441220a547	Fixes edition/work author correction check	2020-11-04 12:12:29 -08:00
Mouse Reeve	ff96835c2a	Migrate default edition field to work model ... Fixes #281	2020-11-04 11:27:49 -08:00
Mouse Reeve	c6b8357c77	Make tags optional in activitypub Notes	2020-11-02 16:32:56 -08:00
Mouse Reeve	842291d729	Fixes shelving tests	2020-11-02 16:28:02 -08:00
Mouse Reeve	0c73a1f42e	updates test data and serialization	2020-11-02 16:24:56 -08:00
Mouse Reeve	8a4e00c6b9	migrations are fucked	2020-11-02 16:17:48 -08:00
Mouse Reeve	ce5d847a1d	Merge pull request #279 from mouse-reeve/data-encoding ... Stop double-encoding broadcasts	2020-11-02 15:39:51 -08:00
Mouse Reeve	752193d0e2	Merge pull request #278 from mouse-reeve/incoming-shelve ... Incoming shelve	2020-11-02 15:39:37 -08:00
Mouse Reeve	f9d8115ba6	Stop double-encoding broadcasts ... Fixes #234	2020-11-02 15:37:39 -08:00
Mouse Reeve	5501318f95	Incoming shelve activities	2020-11-02 15:10:41 -08:00
Mouse Reeve	4cfded3d19	Fixes activitypub serializer local ids	2020-11-02 15:01:28 -08:00
Mouse Reeve	a539b77dfa	Different titles for different pages	2020-11-02 14:25:16 -08:00
Mouse Reeve	c5a215b11d	Fixes serialization of parent work remote_id	2020-11-02 14:13:24 -08:00
Mouse Reeve	0c9dff61ca	Re-adds hiding book in reviews feed	2020-11-02 13:41:43 -08:00
Mouse Reeve	917c97daba	Merge pull request #273 from mouse-reeve/follow-reqest-dupe ... Prevent creating follow requests when there's already a follow	2020-11-02 11:52:36 -08:00
Mouse Reeve	64d75fe014	Merge pull request #275 from mouse-reeve/update-book ... Fixes updating books from remote instances	2020-11-02 11:52:05 -08:00
Mouse Reeve	b5467f7d6d	Refactor status display	2020-11-02 11:47:21 -08:00
Mouse Reeve	2ac9a6fcee	Fixes updating books from remote instances	2020-11-02 09:34:46 -08:00
Mouse Reeve	30d5846fa4	Adds missing template snippet	2020-11-02 09:23:47 -08:00
Mouse Reeve	afa2aff30a	Merge pull request #274 from mouse-reeve/search-ui ... Search ui	2020-11-02 09:06:53 -08:00
Mouse Reeve	903e68f64a	Show extended search results automatically for empty local results	2020-11-02 09:03:48 -08:00
Mouse Reeve	485f3831b9	Priortize other instances over openlibrary	2020-11-02 08:50:21 -08:00
Mouse Reeve	277c0c4bfe	Hide search results from external datasources	2020-11-02 08:48:58 -08:00
Mouse Reeve	ad3d492fcc	Prevent creating follow requests when there's already a follow ... Fixes #90	2020-11-01 13:14:56 -08:00
Mouse Reeve	2b0b88802b	Fixes weirdness in handling avatars ... - urls weren't serialized correctly for activitypub - the filename shouldn't have been preserved as-is	2020-11-01 12:36:56 -08:00
Mouse Reeve	4b7de93c90	still tweaking webfinger syntax	2020-11-01 12:29:31 -08:00
Mouse Reeve	65371d6904	Don't show "None" in book description	2020-11-01 12:09:39 -08:00
Mouse Reeve	a2692f92d2	Fixes logic issues in saving user model	2020-11-01 12:07:51 -08:00
Mouse Reeve	beb5e1f11e	Show empty string, not "None" for books with no text	2020-11-01 11:59:51 -08:00
Mouse Reeve	fdaa63d5dc	Fixes error in text trimming tag	2020-11-01 11:57:46 -08:00
Mouse Reeve	76a4f0e9a7	Merge migration	2020-11-01 11:13:34 -08:00
Mouse Reeve	8ae9519bf2	Merge branch 'main' into mention_users	2020-11-01 11:09:16 -08:00
Mouse Reeve	85a7e83340	Adds regex util file	2020-11-01 10:57:17 -08:00
Mouse Reeve	b941bb7ad5	format webfinger "subject"	2020-11-01 10:53:47 -08:00
Mouse Reeve	203a0a25eb	Fixes webfinger	2020-11-01 10:49:28 -08:00
Mouse Reeve	29094f3c3f	Notification text for mentions	2020-11-01 10:15:56 -08:00
Mouse Reeve	0cf1838276	Mention and notify users when creating a status	2020-11-01 10:13:51 -08:00
Mouse Reeve	4e02a8df99	Track when user was last active ... fixes #10	2020-11-01 09:20:35 -08:00
Mouse Reeve	c334451216	code cleanup	2020-11-01 08:57:43 -08:00
Mouse Reeve	4684a83e6f	fixes quote character	2020-10-31 21:56:45 -07:00
Mouse Reeve	93baaf261a	Show/hide toggle for long book descriptions	2020-10-31 14:18:56 -07:00
Mouse Reeve	c45247e236	correctly grab book data from tags	2020-10-31 13:39:52 -07:00
Mouse Reeve	418971e9f8	Merge pull request #266 from mouse-reeve/book-lookup ... lookup books when resolving activity json	2020-10-31 13:08:15 -07:00
Mouse Reeve	a7d8376b6a	Small activitypub serialization issues	2020-10-31 13:06:22 -07:00
Mouse Reeve	2463e64321	wrong quote in blockquote	2020-10-31 13:00:28 -07:00
Mouse Reeve	9ef03664f2	lookup books when resolving activity json	2020-10-31 12:59:15 -07:00
Mouse Reeve	02265b1e49	Show federated servers and connectors in admin	2020-10-31 12:45:39 -07:00
Mouse Reeve	fd76d1a585	Merge pull request #263 from mouse-reeve/delete ... Send Delete activity, not Tombstone on deletion	2020-10-31 11:05:07 -07:00
Mouse Reeve	301a452d9f	Send Delete activity, not Tombstone on deletion	2020-10-31 11:04:19 -07:00
Mouse Reeve	3db1e7a6d0	Merge pull request #262 from mouse-reeve/minor-ui ... Preserve linebreaks in display text	2020-10-31 10:55:33 -07:00
Mouse Reeve	2cdd281e98	Prevent error on serializing book cover	2020-10-31 10:50:20 -07:00
Mouse Reeve	b8e9f90138	no need to assign book var in incoming	2020-10-30 17:41:32 -07:00
Mouse Reeve	0393d81230	Fixes loading covers and authors	2020-10-30 17:18:25 -07:00
Mouse Reeve	203e526a83	Fixes loading remote books ... - saves remote_id correctly - loads remote books for incoming statuses	2020-10-30 17:04:10 -07:00
Mouse Reeve	72219ace77	Merge pull request #260 from mouse-reeve/shelves ... tab through user shelves	2020-10-30 15:23:12 -07:00
Mouse Reeve	a17f54e457	Fixes federation bugs	2020-10-30 15:22:20 -07:00
Mouse Reeve	95455d9538	Preserve linebreaks in text	2020-10-30 14:43:39 -07:00
Mouse Reeve	6e97592518	Trying to catch more http request errors	2020-10-30 14:19:43 -07:00
Mouse Reeve	eece662ec1	tab through user shelves	2020-10-30 14:01:43 -07:00
Mouse Reeve	c9354a5ad1	Make federated server blankable	2020-10-30 13:11:13 -07:00
Mouse Reeve	3ca50a7573	safer isbn normalization	2020-10-30 12:57:31 -07:00
Mouse Reeve	3fc1f46897	Handle dashes in isbns	2020-10-30 12:43:02 -07:00
Mouse Reeve	9780879ce6	Still shelve books in no-reviews import mode	2020-10-30 12:07:22 -07:00
Mouse Reeve	701be26100	Fixes unit tests	2020-10-30 11:55:41 -07:00
Mouse Reeve	e2f39a1bd5	Merge pull request #256 from mouse-reeve/import-review-settings ... Allow users to set privacy on imported reviews	2020-10-30 11:23:43 -07:00
Mouse Reeve	905c99b075	Merge pull request #250 from mouse-reeve/readthrough ... UI for editable readthroughs	2020-10-30 11:23:27 -07:00
Mouse Reeve	0b0de12968	Allow users to set privacy on imported reviews ... or not import them at all. Fixes #252	2020-10-30 11:21:02 -07:00
Mouse Reeve	0dfdcf3c4e	Didn't end up using a readthrough form	2020-10-30 10:41:30 -07:00
Mouse Reeve	e39bf026cb	Handle edit and delete readthroughs	2020-10-30 10:40:05 -07:00
Mouse Reeve	45f39fab48	upping confidence for import search ... better to query OL than to get the wrong book locally	2020-10-29 23:28:23 -07:00
Mouse Reeve	5641c36539	UI for editable readthroughs	2020-10-29 22:40:31 -07:00
Mouse Reeve	7fb593af8c	Remove status associated with import	2020-10-29 16:48:28 -07:00
Mouse Reeve	cca98d9051	removes confidence displaying in search results page	2020-10-29 16:08:23 -07:00
Mouse Reeve	7ce0890a41	Stop assuming every book is Hamlet	2020-10-29 15:30:53 -07:00
Mouse Reeve	a46d7f5dc7	Change how goodread import writes reviews ... - adds published date - broadcasts review imports - completes review and shelve actions as it goes - some small connector fixes fixes #247	2020-10-29 14:31:06 -07:00
Mouse Reeve	7febcec229	convert between ibsn 10 and 13	2020-10-29 12:32:37 -07:00
Mouse Reeve	90cccc455e	Another error check point in abstract connector	2020-10-28 17:16:16 -07:00
Mouse Reeve	069b4eae2a	Unshelve button on shelf page	2020-10-28 16:52:23 -07:00
Mouse Reeve	bdde69473a	Merge pull request #243 from mouse-reeve/post-privacy ... post privacy	2020-10-28 13:17:28 -07:00
Mouse Reeve	bdbf449dc0	Usbale navbar links	2020-10-28 13:17:02 -07:00
Mouse Reeve	3c5f6d19fb	Adds envelope icon	2020-10-28 12:44:30 -07:00
Mouse Reeve	544605007b	Fixes post icons	2020-10-28 12:33:27 -07:00
Mouse Reeve	9f291d8ebd	Show posts based on privacy settings	2020-10-27 15:41:53 -07:00
Mouse Reeve	2c48904e40	Merge pull request #242 from mouse-reeve/privacy ... Refactors status creation	2020-10-27 15:17:02 -07:00
Mouse Reeve	bf2538cab2	let user set privacy in UI	2020-10-27 15:16:17 -07:00
Mouse Reeve	003740ca21	One last function we don't need	2020-10-27 12:02:24 -07:00
Mouse Reeve	e3317ff771	restores creating reviews in goodreads import	2020-10-27 12:01:41 -07:00
Mouse Reeve	c43c566783	Removes tests of deleted code	2020-10-27 11:55:15 -07:00
Mouse Reeve	5a09ce68ec	Removed unused status generation code	2020-10-27 11:52:23 -07:00
Mouse Reeve	b7061c0f4d	Fixes create status forms	2020-10-27 11:42:17 -07:00
Mouse Reeve	39b9fe8f4a	Fixes serializing reviews with no rating	2020-10-26 15:10:32 -07:00
Mouse Reeve	5389144318	Fixes login validation form	2020-10-26 15:09:51 -07:00
Mouse Reeve	2afa111b70	Create statuses from django form	2020-10-26 15:00:15 -07:00
Mouse Reeve	6243cf0e4a	uses enum for post privacy database field	2020-10-26 14:33:02 -07:00
Mouse Reeve	1cc0c14f86	Deleted date should be null-able ... Fixes #240	2020-10-20 18:50:39 -07:00
Mouse Reeve	1de3f34224	Merge pull request #238 from mouse-reeve/incoming-update-user ... Handle incoming update user activities	2020-10-19 08:05:44 -07:00
Mouse Reeve	8cf7e4405d	minor style fixes	2020-10-16 19:13:18 -07:00
Mouse Reeve	d1d339225c	Merge migrations	2020-10-16 17:11:17 -07:00
Mouse Reeve	1672c699e5	Merge pull request #239 from mouse-reeve/deletion ... Deletion	2020-10-16 17:03:34 -07:00
Mouse Reeve	7f579ffefa	Read incoming deletion activities	2020-10-16 17:00:10 -07:00
Mouse Reeve	c0f51fa6aa	Handle incomign update user activities	2020-10-16 16:06:45 -07:00
Mouse Reeve	4f07a567bd	Shelving tests	2020-10-16 15:07:41 -07:00
Mouse Reeve	75c695b3c6	Updates and tests outgoing reject	2020-10-16 14:28:25 -07:00
Mouse Reeve	a567bd4e61	Simplifies outgoing follow logic	2020-10-16 14:14:07 -07:00
Mouse Reeve	694de44f3f	reorganize incoming/outgoing tests	2020-10-16 14:04:06 -07:00
Mouse Reeve	b32fce25d9	tweaks follow handling	2020-10-16 12:24:29 -07:00
Mouse Reeve	43c6b9880a	Merge pull request #236 from mouse-reeve/relationship-activitypub ... Uses activitypub mixin in relationship models	2020-10-16 11:04:14 -07:00
Mouse Reeve	2a0af0138d	Uses activitypub mixin in relationship models ... plus tests	2020-10-16 10:37:33 -07:00
Mouse Reeve	7a153e185a	User activitypub tests	2020-10-16 09:45:14 -07:00
Mouse Reeve	7a01d284c6	Incoming follow accept test	2020-10-16 09:23:14 -07:00
Mouse Reeve	2d2863d4a8	Adds more incoming follow test cases	2020-10-15 17:46:23 -07:00
Mouse Reeve	db18014325	Adds test for incoming follow request	2020-10-15 17:32:53 -07:00
Mouse Reeve	e8ef8f7101	Fixes data encoding for signing tests	2020-10-15 10:55:04 -07:00
Mouse Reeve	cedc79a962	Tweaks handle_follow behavior for unknown users	2020-10-14 17:29:43 -07:00
Mouse Reeve	2ce3cae193	Keep user page at local domain	2020-10-14 10:26:41 -07:00
Mouse Reeve	122418deb8	wrong variable in byte check	2020-10-14 10:24:05 -07:00
Mouse Reeve	cdf23fce31	Merge pull request #233 from mouse-reeve/search-results-page ... Search results page	2020-10-14 10:06:36 -07:00
Mouse Reeve	7a9d6099fc	Use triagram similarity for user search	2020-10-14 10:04:03 -07:00
Mouse Reeve	aa2e4da6f0	Search local users as well as webfinger	2020-10-14 09:54:07 -07:00
Mouse Reeve	fe03e95049	better bytes checking ... but this still seems like the wrong thing	2020-10-14 09:26:46 -07:00
Mouse Reeve	b36b306934	differentiate local user search and webfinger lookup	2020-10-14 09:21:53 -07:00
Mouse Reeve	22410e3f47	Adds deleted database fields to Status	2020-10-14 09:20:36 -07:00
Mouse Reeve	4ba9b7a119	Revamps search page ... still needs to expand user search to do database lookups	2020-10-14 09:19:23 -07:00
Mouse Reeve	d689b6e7c4	Adds Delete verb	2020-10-14 08:38:51 -07:00
Mouse Reeve	a6d436d05d	Fixes avatar in top bar on user page	2020-10-13 16:20:04 -07:00
Mouse Reeve	10a0a6ac37	hide deleted statuses from threads	2020-10-08 12:40:47 -07:00
Mouse Reeve	0d614c7ebb	Don't show deleted statuses	2020-10-08 12:38:06 -07:00
Mouse Reeve	48df06aea7	Filter out deleted statuses in feed	2020-10-08 12:35:27 -07:00
Mouse Reeve	704e1092c4	Delete statuses	2020-10-08 12:32:45 -07:00
Mouse Reeve	1705a550d4	Merge pull request #230 from mouse-reeve/bytes ... Received bytes, expecting a string	2020-10-06 12:36:33 -07:00
Mouse Reeve	d424a38396	Merge pull request #229 from mouse-reeve/nonunique-email ... Email should *not* be unique	2020-10-06 12:36:15 -07:00
Mouse Reeve	74a1bbf624	Merge pull request #228 from mouse-reeve/site-name ... Uses fixed string as site name	2020-10-06 12:35:56 -07:00
Mouse Reeve	51e9977d55	Received bytes, expecting a string ... This doesn't seem like a *good* solution, but I'm not sure why sometimes this receives strings and sometimes bytes (maybe it's based on how the data is served).	2020-10-05 15:23:39 -07:00
Mouse Reeve	d8800b09c4	use remote id for followers links ... this should be stored in the db	2020-10-05 14:58:57 -07:00