Commit graph

1332 commits

Author SHA1 Message Date
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
Mouse Reeve
1e7aa283c2 Patches celery calls in connector tests 2021-01-02 09:08:37 -08:00
Mouse Reeve
86060f795d Updates tests 2021-01-02 08:55:42 -08:00
Mouse Reeve
d828b0ead9 Remove books manager at long last 2021-01-02 08:14:28 -08:00
Mouse Reeve
e169565e00 Makes expanding book data fully part of the connector 2021-01-02 07:45:45 -08:00
Mouse Reeve
fc8f43273e
Merge pull request #459 from mouse-reeve/status-model-files
Moves models that don't inherit Status to their own files
2021-01-01 11:23:23 -08:00
Mouse Reeve
521934b4f3 Moves models that don't inherit Status to their own files 2021-01-01 10:46:15 -08:00
Mouse Reeve
bb5ae850e1 Mention users implicitly (without needing @mentions) 2021-01-01 09:35:14 -08:00
Mouse Reeve
b3449040d9 Fixes server error posting status 2021-01-01 07:27:56 -08:00
Mouse Reeve
1246042c12 move some code around for readability 2020-12-31 16:30:04 -08:00
Mouse Reeve
c5a3e57bb4 Script for removing duplicates in book data 2020-12-31 16:03:54 -08:00
Mouse Reeve
87b8e5f39d
Merge pull request #451 from mouse-reeve/views-tests
Views tests
2020-12-31 14:03:34 -08:00
Mouse Reeve
2f9123c206 Add sort order to followers/following ordered collection querysets 2020-12-31 13:47:26 -08:00
Mouse Reeve
e066c53dd0 tests hella views 2020-12-31 13:45:36 -08:00
Mouse Reeve
a444c5f6fc Fixes model deduplication from data 2020-12-31 12:22:00 -08:00
Mouse Reeve
141e7b90e8 Cleans up abstract connector tests
a buncha linting errors and junk we don't need in setup
2020-12-31 11:11:59 -08:00
Mouse Reeve
03ed1cfa94 Small syntax changes in openlibrary connector 2020-12-31 11:03:30 -08:00
Mouse Reeve
9afbf3196f Cleans up paths in import model tests 2020-12-31 09:49:27 -08:00
Mouse Reeve
171d09599c Fixes author path in openlibrary connector 2020-12-31 09:32:40 -08:00
Mouse Reeve
c1e1bdac4b Fixes url formatting in openlibrary connector 2020-12-31 09:19:39 -08:00
Mouse Reeve
69af2f4cd3 Fixes untag 2020-12-31 08:42:09 -08:00
Mouse Reeve
a7a586ea90 Fixes tagging 2020-12-31 08:30:51 -08:00
Mouse Reeve
29ee027f6d Tests tag page and orders tag collection json 2020-12-31 08:05:24 -08:00
Mouse Reeve
d04a1956f5 Test that editions page loads 2020-12-31 07:52:08 -08:00
Mouse Reeve
7bcf0a1d53 Fixes missing code for editions list json 2020-12-31 07:46:35 -08:00
Mouse Reeve
17b9c6ecc5 Adds label to reply textarea 2020-12-30 17:38:38 -08:00
Mouse Reeve
dc68fdd53e User generated local paths 2020-12-30 17:36:35 -08:00
Mouse Reeve
d821a08cff include tags in replies
I was against this but apparently it helps the replies actually WORK
2020-12-30 16:33:04 -08:00
Mouse Reeve
d42ebbaf4a Link to local versions of statuses in notifications 2020-12-30 16:10:32 -08:00
Mouse Reeve
885bb023a3 Sort shelves by shelfbook updated date 2020-12-30 16:07:29 -08:00
Mouse Reeve
670036f8a9 Fixes user preview on rating display 2020-12-30 15:52:17 -08:00
Mouse Reeve
c33095dfe0
Merge pull request #442 from mouse-reeve/views-tests
Views tests
2020-12-30 15:51:54 -08:00
Mouse Reeve
4e413a3779 Adds tests for generating feeds 2020-12-30 14:57:57 -08:00
Mouse Reeve
48f002727a small change and test to get_user_from_username 2020-12-30 14:57:43 -08:00
Mouse Reeve
45c13bd76c Only get reviews when loading user data 2020-12-30 13:16:09 -08:00
Mouse Reeve
c1243b5c21 Makes outbox filter-able 2020-12-30 13:14:16 -08:00
Mouse Reeve
747167c579
Merge pull request #439 from mouse-reeve/filter-outbox
Updates outbox
2020-12-30 13:13:47 -08:00
Mouse Reeve
2e36da3f9e
Merge pull request #438 from mouse-reeve/accept-button-color
Makes follow request button a different color than an unread notification
2020-12-30 12:44:18 -08:00
Mouse Reeve
babc604397 Fixes outbox privacy 2020-12-30 12:41:19 -08:00
Mouse Reeve
88d8b6e577 Cleans up outbox function 2020-12-30 12:38:34 -08:00
Mouse Reeve
b71eda6e38
Merge pull request #434 from renatolond/activitypub/use_activitypub_content_type
Create a ActivitypubResponse class and use it in the views
2020-12-30 12:37:04 -08:00
Renato "Lond" Cerqueira
44a8184f72 Create a ActivitypubResponse class and use it in the views
This improves compatibility with other fediverse software by using the
expected content type for any api calls.
2020-12-30 21:25:28 +01:00
Mouse Reeve
877e3356e5
Merge pull request #436 from mouse-reeve/search-errors
Catch error response decoding json in search connector
2020-12-30 12:18:43 -08:00
Mouse Reeve
e290dec035
Merge pull request #437 from mouse-reeve/version-setting
Set application version number in settings
2020-12-30 12:16:47 -08:00
Mouse Reeve
8bb7a081c2 Makes follow request button a different color than an unread
notification

Fixes #420
2020-12-30 12:12:32 -08:00
Mouse Reeve
e0adb3307b Gracefully handle unknown status types
Fixes #432
2020-12-30 12:05:20 -08:00
Mouse Reeve
5623c268d6 Set application version number in settings 2020-12-30 11:55:13 -08:00
Mouse Reeve
d3161ea361 Send appropriate error codes back with error pages 2020-12-30 11:42:07 -08:00
Mouse Reeve
490591623f Adds test for search view 2020-12-30 11:37:49 -08:00
Mouse Reeve
e5a914c3c2 Fixes API search causing 500 error 2020-12-30 11:37:26 -08:00
Mouse Reeve
8ffb22291a Add connector to tested fields on search result 2020-12-30 09:51:37 -08:00
Mouse Reeve
c8d031e311 Tests connector search 2020-12-30 09:48:37 -08:00
Mouse Reeve
6a8353de09 Adds test for SearchResult dataclass
also just cleans up the styles in the test file for linting
2020-12-30 09:26:02 -08:00
Mouse Reeve
d7db6d50ba Log errors in conenctor search 2020-12-30 09:14:07 -08:00
Mouse Reeve
21f67c9e28 Catch error response decoding json in search connector 2020-12-30 09:11:00 -08:00
Renato "Lond" Cerqueira
fb10cb35ad Add BookWyrm user-agent to http requests
This allows other software to identify BookWyrm in calls, as well as
will allow BookWyrm to differentiate between calls done from other
fediverse software and BookWyrm to answer with specific BookWyrm data.
2020-12-30 12:36:50 +01:00
Mouse Reeve
74a25f205b Validator for username field 2020-12-28 14:14:22 -08:00
Mouse Reeve
7e987fc446 Updates unit tests for new username handling
still some failing tho
2020-12-27 17:21:01 -08:00
Mouse Reeve
26c0880fe4
Merge pull request #425 from mouse-reeve/import-error
Fixes goodreads import failing on every book
2020-12-27 14:45:31 -08:00
Mouse Reeve
ac261d7b1a Send connector with search result
also fix typo in get_work_from_edition_data function
2020-12-27 14:33:34 -08:00
Anton Strömkvist
97a5364b70
Fix docstring for to_reject_activity 2020-12-27 23:31:14 +01:00
Mouse Reeve
9f74e95b00 stylistic cleanup of import model tests 2020-12-27 13:32:27 -08:00
Mouse Reeve
e89bfdc572 Makes registration user/localname fields more sensible 2020-12-24 11:39:57 -08:00
Mouse Reeve
25d72c5d1e Save attachments on incoming statuses 2020-12-23 13:38:36 -08:00
Mouse Reeve
365408e86b Handle reverse serialized fields with no serialized field 2020-12-23 13:33:46 -08:00
Mouse Reeve
a3df0847e1 Fixes celery tasks expanding data not setting many to many fields 2020-12-23 12:45:40 -08:00
Mouse Reeve
e7e90360b3 Adds model import 2020-12-22 10:28:04 -08:00
Mouse Reeve
c34d90051f
Merge pull request #416 from mouse-reeve/book-data-model
Remove sync fields and share fields between book and author
2020-12-22 10:25:12 -08:00
Mouse Reeve
9977fed007
Merge pull request #419 from mouse-reeve/close-suggested-post
Close suggested post
2020-12-22 10:23:23 -08:00
Mouse Reeve
7c3f2373c7 Adds noopener to link 2020-12-22 10:19:01 -08:00
Mouse Reeve
f2f2f3dd3e Remove useless if/else on null state radio button 2020-12-22 10:12:41 -08:00
Mouse Reeve
7d1cbb7be1 Adds tests for edit author view 2020-12-22 10:10:36 -08:00
Mouse Reeve
77948f64d2 Merge branch 'main' into book-data-model 2020-12-22 09:29:32 -08:00
Mouse Reeve
6ca8728d7c
Merge pull request #418 from mouse-reeve/edit-user-view
Edit user view
2020-12-22 09:28:21 -08:00
Mouse Reeve
25dee8362d Adds edit author form and stores last edited by 2020-12-22 09:26:55 -08:00
Mouse Reeve
fd2f452b46 Adds title along with alt attributes on images 2020-12-22 08:26:02 -08:00
Mouse Reeve
fdbce5d05e Adds close button to suggested post window on mobile 2020-12-22 08:21:43 -08:00
Mouse Reeve
db281d5154 Simplifies update user view 2020-12-21 16:19:36 -08:00
Mouse Reeve
fcce1a5a36 Fixes outgoing tests 2020-12-21 15:52:06 -08:00
Mouse Reeve
e6105c6cb0 Simplify edit user function 2020-12-21 14:54:45 -08:00
Mouse Reeve
65e9afd271 Fixes user in outgoing tests 2020-12-21 14:54:27 -08:00
Mouse Reeve
98aa946519 Merge branch 'main' into outgoing-tests 2020-12-21 14:39:39 -08:00
Mouse Reeve
fa1ddf359a create single outgoing tests file 2020-12-21 14:37:28 -08:00
Mouse Reeve
b4c60c0591 Catches exception thrown when boosting unknown statuses 2020-12-21 14:25:10 -08:00
Mouse Reeve
830aaf9d1c Add identifier fields to author activity 2020-12-21 13:21:17 -08:00
Mouse Reeve
15c22fa6c9 Merge branch 'main' into book-data-model 2020-12-21 13:16:40 -08:00
Mouse Reeve
1fb728edbd
Merge pull request #415 from mouse-reeve/author_text
Generate author_text field dynamically
2020-12-21 13:09:40 -08:00
Mouse Reeve
0de479a89f Fixes authors set in tests 2020-12-21 13:03:48 -08:00
Mouse Reeve
adfb1e696a typo in test 2020-12-21 12:49:33 -08:00
Mouse Reeve
bc64ae0504 Fixes assigning authors in test 2020-12-21 12:49:00 -08:00
Mouse Reeve
bcb972ddf7
Merge pull request #414 from mouse-reeve/openlibrary-covers
Fixes openlibrary import to prefer editions with covers
2020-12-21 12:45:09 -08:00
Mouse Reeve
862f1d2580 Fixes cover unit test 2020-12-21 12:22:47 -08:00
Mouse Reeve
cfa1a1b42c Remove sync fields and share fields between book and author 2020-12-21 12:17:18 -08:00
Mouse Reeve
aac264c998 Generate author_text field dynamically 2020-12-21 12:10:42 -08:00
Mouse Reeve
c3d0e8e7f7 Fixes openlibrary import to prefer editions with covers 2020-12-21 11:47:47 -08:00
Mouse Reeve
c4b9b82000 Use author name as a deduplication field
I feel iffy about this but openlibrary has hella duplicates
2020-12-20 13:31:11 -08:00
Mouse Reeve
e72c3e11dd Fixes incoming user test 2020-12-20 12:54:30 -08:00
Mouse Reeve
79973687d5 Updates tests 2020-12-20 12:50:35 -08:00
Mouse Reeve
3597ca460c Don't let author and book remote ids get overridden 2020-12-20 12:40:20 -08:00
Mouse Reeve
23cbeab4c1 cleans up remote version of quote status 2020-12-20 12:31:39 -08:00
Mouse Reeve
689cc65790 keep saved version of bio and description field as markdown 2020-12-20 12:24:17 -08:00
Mouse Reeve
60738011a2 user's name and bio field are optional
get it together, mouse
2020-12-20 12:09:19 -08:00
Mouse Reeve
7f1ac33859 Format html on book descriptions 2020-12-20 12:09:13 -08:00
Mouse Reeve
646df03d81 show books for authors who only have editions 2020-12-20 11:51:17 -08:00
Mouse Reeve
3f95f9257d
Merge pull request #411 from mouse-reeve/markdown-refinement
Only parse mardown on outgoing activities
2020-12-20 11:42:06 -08:00
Mouse Reeve
a6efd51bb2 Only parse mardown on outgoing activities 2020-12-20 11:38:13 -08:00
Mouse Reeve
fdb9b71030
Merge pull request #410 from mouse-reeve/atomicity
Change transaction atomic to avoid cascading errors
2020-12-20 11:24:37 -08:00
Mouse Reeve
592721ec76 Fixes unit tests 2020-12-19 20:26:29 -08:00
Mouse Reeve
ffa354be7c html format links and mentions 2020-12-19 20:03:33 -08:00
Mouse Reeve
ef696782ab Allow markdown in html fields 2020-12-19 18:54:56 -08:00
Mouse Reeve
1204679cbd Change transaction atomic to avoid cascading errors 2020-12-19 18:34:37 -08:00
Mouse Reeve
c407015a82 Fixes tests 2020-12-19 16:33:56 -08:00
Mouse Reeve
3e61f48da2 Fixes loading more data 2020-12-19 16:16:39 -08:00
Mouse Reeve
d3671d981f Use author activitypub in OL connector 2020-12-19 15:20:31 -08:00
Mouse Reeve
2128219b05 Use activitypub to_model de-serializer in openlibrary connector 2020-12-19 14:56:03 -08:00
Mouse Reeve
0c6049b81c Discard remote boosts 2020-12-18 12:38:27 -08:00
Mouse Reeve
606e93fb12 Hacky fix for serializing boost 2020-12-18 11:34:21 -08:00
Mouse Reeve
80de6079fa User p tags for pure status serializer 2020-12-18 11:00:30 -08:00
Mouse Reeve
40c4f4f5de Disable boosting private statuses 2020-12-18 09:30:08 -08:00
Mouse Reeve
3649642653 Show all authors 2020-12-17 15:14:52 -08:00
Mouse Reeve
be43e0772c box around create status on feed page 2020-12-17 14:13:28 -08:00
Mouse Reeve
73f94a76d2 Show subtitle in book page 2020-12-17 14:11:24 -08:00
Mouse Reeve
6149f36c7f Fixes bug in alt text breaing serializing work 2020-12-17 13:55:31 -08:00
Mouse Reeve
d024d44b79 Fixes incoming tests 2020-12-17 13:46:32 -08:00
Mouse Reeve
c4c01f4950
Merge pull request #404 from mouse-reeve/rate-action
Rate action
2020-12-17 13:25:35 -08:00
Mouse Reeve
666ae117d2
Merge pull request #403 from mouse-reeve/cover-max-width
Set max width on cover container
2020-12-17 13:24:49 -08:00
Mouse Reeve
d109ac0626
Merge pull request #402 from mouse-reeve/alt-text
Federate cover alt text
2020-12-17 13:22:09 -08:00
Mouse Reeve
5cadd48aef Fixes rate action 2020-12-17 13:21:21 -08:00
Mouse Reeve
dccd9ac052 uuids for content warners loaded correctly 2020-12-17 13:14:44 -08:00
Mouse Reeve
60239c867a Updates unit tests 2020-12-17 13:06:17 -08:00
Mouse Reeve
3f1bf4e1d6 Set max width on cover container 2020-12-17 12:57:56 -08:00
Mouse Reeve
530198adea Serialize alt text of images 2020-12-17 12:54:04 -08:00
Mouse Reeve
39dc0501a5 Make alt text a model property 2020-12-17 12:30:49 -08:00
Mouse Reeve
04ba5abf45 Fixes infinite recursion when loading books
Also fixes bug in serializing page nubmers
2020-12-17 12:02:59 -08:00
Mouse Reeve
2799ed68e3 Propogate content warning from parent 2020-12-17 11:32:09 -08:00
Mouse Reeve
34a2afc788 Change text on cw button 2020-12-17 11:05:37 -08:00
Mouse Reeve
172c36b641 Adds content warning field in status forms 2020-12-16 20:10:50 -08:00
Mouse Reeve
0d42b9cf8f Display status cw's 2020-12-16 19:50:36 -08:00
Mouse Reeve
b796686483 Adds cw field 2020-12-16 19:20:15 -08:00
Mouse Reeve
33c2f6c3b2 Merge branch 'main' into content-warnings 2020-12-16 19:14:34 -08:00
Mouse Reeve
f0767de363
Merge pull request #394 from mouse-reeve/sanitize-html
Sanitize html
2020-12-16 19:12:37 -08:00
Mouse Reeve
f7cb525981 Fixes logic error 2020-12-16 18:40:43 -08:00
Mouse Reeve
42167af3e9 Tests fro html field 2020-12-16 18:39:18 -08:00
Mouse Reeve
a3c7d324d6 Sanitize incoming html 2020-12-16 16:47:23 -08:00
Mouse Reeve
f1926ce76d Avoid duplicate notifitions
And render html
2020-12-16 16:20:40 -08:00
Mouse Reeve
d79a756813 Fixes pure status serializer 2020-12-16 15:59:42 -08:00
Mouse Reeve
ef92e562fd
Merge pull request #382 from mouse-reeve/switch-edition
Adds shelf info to book page
2020-12-16 14:58:36 -08:00
Mouse Reeve
21b0bec8d7 Switch edition from editions list page 2020-12-16 14:45:35 -08:00
Mouse Reeve
8a1800ea26 Federate shelve activities when switching editions 2020-12-16 13:59:18 -08:00
Mouse Reeve
5dbacb3524 Merge branch 'main' into switch-edition 2020-12-16 09:22:04 -08:00
Mouse Reeve
b2c1bc1481 Migration consistency 2020-12-16 09:20:24 -08:00
Mouse Reeve
729e50de63 Show consistent book status regardless of edition 2020-12-16 09:15:26 -08:00
Mouse Reeve
da05b99bb8 Fixes incoming shelve activity 2020-12-15 18:57:17 -08:00
Mouse Reeve
948e938040 Handles outdated Add with Book type
should be edition.
2020-12-15 18:16:33 -08:00
Mouse Reeve
af823cf645 Merge migration 2020-12-15 17:53:20 -08:00
Mouse Reeve
fabf880a94 Adds post attribute to resolve book endpoint 2020-12-15 16:50:10 -08:00
Mouse Reeve
bde75766f2 test for registration and password reset 2020-12-15 16:36:22 -08:00
Mouse Reeve
710fbc949b Better username validator and remove trailing whitespace 2020-12-15 15:52:22 -08:00
Mouse Reeve
ee2121095c Separate update editon and work functions 2020-12-15 12:39:09 -08:00
Mouse Reeve
2ef4df41b4 Fixes boosts 2020-12-15 11:54:57 -08:00
Mouse Reeve
8787599692 tests unfavorite 2020-12-14 13:04:07 -08:00
Mouse Reeve
1bcae45145 Remove notifications related to deleted statuses 2020-12-14 12:54:39 -08:00
Mouse Reeve
d49e49f021 Notify mentioned users 2020-12-14 12:31:11 -08:00
Mouse Reeve
8d27f02a9a Fixes typo in handle_unfollow 2020-12-14 11:46:31 -08:00
Mouse Reeve
171b8c75ae use require_POST decorator in inbox 2020-12-14 11:29:22 -08:00
Mouse Reeve
7f6390f722 Test incoming in one file 2020-12-14 10:25:43 -08:00
Mouse Reeve
badc5d0dab Adds another shelf model test 2020-12-14 10:18:14 -08:00
Mouse Reeve
61041a0dba Adds migration for privacy field
no actual change here, but it's a new field type
2020-12-13 21:11:53 -08:00
Mouse Reeve
b36eaef172 Merge branch 'main' into switch-edition 2020-12-13 21:10:37 -08:00
Mouse Reeve
693dfc42ac Match privacy level in reply 2020-12-13 16:20:59 -08:00
Mouse Reeve
943d97c0bc Adds direct messages UI 2020-12-13 16:17:14 -08:00
Mouse Reeve
4fcdbe5299 Fixes clashing test model name 2020-12-13 15:56:30 -08:00
Mouse Reeve
c75f5a1598 Unit tests for privacy model field 2020-12-13 15:50:02 -08:00
Mouse Reeve
5c7ac46116 Fixes foreign key field setting wrong value on activity 2020-12-13 14:53:25 -08:00
Mouse Reeve
44cbf7c07f Fixes checking privacy when serializing status 2020-12-13 14:35:56 -08:00
Mouse Reeve
b6907f39e9 Creates Privacy field that handles setting to/cc 2020-12-13 13:03:17 -08:00
Mouse Reeve
c470aeb3ce Create helper function on field for settings values 2020-12-13 12:02:26 -08:00
Mouse Reeve
b67aea22fc Aggregates (de)serializable model fields 2020-12-13 11:40:46 -08:00
Mouse Reeve
957f0889aa Clean up models
removes unused function and sorts replies correctly
2020-12-13 11:15:42 -08:00
Mouse Reeve
d65657882e Keep any status that mentions a local user 2020-12-12 21:11:51 -08:00
Mouse Reeve
ffc4cc2018 Fixes create status handler 2020-12-12 20:59:41 -08:00
Mouse Reeve
d3371991e1 Remove deleted util file from migrations 2020-12-12 20:18:03 -08:00
Mouse Reeve
ae435a3165 Removes sqlite support 😢
RIP, things have gotten too complicated for this I think
2020-12-12 20:11:23 -08:00
Mouse Reeve
47981dc15e Show year in time_since when ambiguous 2020-12-12 20:02:14 -08:00
Mouse Reeve
b61a7cccff Use trimmedwords_html instead of a custom filter 2020-12-12 19:34:51 -08:00
Mouse Reeve
1e08eeb4c2 Renames custom template tags file 2020-12-12 18:25:57 -08:00
Mouse Reeve
2b3daa0227 disable some warnings 2020-12-12 18:13:00 -08:00
Mouse Reeve
1e01e76ac2 removes unneeded imports 2020-12-12 18:06:48 -08:00
Mouse Reeve
aacf5b7ba4 fields for content warnings 2020-12-12 18:00:39 -08:00
Mouse Reeve
823da2e7de Re-create migration 2020-12-12 16:14:41 -08:00
Mouse Reeve
ae07bbffb7 Merge branch 'main' into logo-default 2020-12-12 16:03:23 -08:00
Mouse Reeve
9b7f0366e7 Adds site settings to initdb 2020-12-12 16:01:43 -08:00
Mouse Reeve
e58ef83f20 Fixes image fields breaking user import 2020-12-12 15:44:17 -08:00
Mouse Reeve
37aaaa97b2 Catch http erros for remote_id 2020-12-12 15:33:07 -08:00
Mouse Reeve
cb28c19abc Use get_data in resolving remote id 2020-12-12 15:19:57 -08:00
Mouse Reeve
49979fabef More user serialization tests 2020-12-12 15:00:20 -08:00
Mouse Reeve
eb28708230 Reverts site settings to correct state
this was just changed to debug tests
2020-12-12 14:33:51 -08:00
Mouse Reeve
e7f400533e Fixes missing book and user objects 2020-12-12 14:15:10 -08:00
Mouse Reeve
4ed713662e Fixes skipping refresh on matched object 2020-12-12 13:59:44 -08:00
Mouse Reeve
804066c523 a couple more assertions for testing fk field 2020-12-12 13:47:51 -08:00
Mouse Reeve
7c43fa1f7c Adds deduplication fields 2020-12-12 13:39:55 -08:00
Mouse Reeve
31a407d74a Use name field only for author name
It feels janky to remove a more granular name designation, but all these
first/last name fields were algorithmically populated by a dubious
process of splitting the name by a space character. If it makes sense to
have first/last name fields, it should be re-added with some
consideration.
2020-12-12 09:53:21 -08:00
Mouse Reeve
5cf9e24ae5 Fixes name import in openlibrary 2020-12-12 09:43:07 -08:00
Mouse Reeve
a176c6cd35 Creates merge migration 2020-12-12 09:38:05 -08:00
Mouse Reeve
801b6c3a77 Merge branch 'main' into follow-remote-ids 2020-12-12 09:34:54 -08:00
Mouse Reeve
733e0e19ac Don't show boost and original status in timeline
Fixes #381
2020-12-11 17:39:17 -08:00
Mouse Reeve
716068474e Merge branch 'main' into switch-edition 2020-12-11 16:59:59 -08:00
Mouse Reeve
2d7f8ada61 Functional switch editions button 2020-12-11 16:57:38 -08:00
Mouse Reeve
72eb94315a Adds shelf info to book page
- includes change shelf button
- WIP button for switching to the current edition
2020-12-11 16:40:48 -08:00
Mouse Reeve
e2bc751ee4
Merge pull request #380 from mouse-reeve/site-settings
Site settings
2020-12-11 12:50:21 -08:00
Mouse Reeve
117d243577 Expand site settings and add footer 2020-12-11 12:31:02 -08:00
Mouse Reeve
b33ea40da2 Use context processor to include site settings in templates 2020-12-11 12:07:37 -08:00
Mouse Reeve
adbc8c3f4c Preview statuses in notifications
Fixes #363
2020-12-11 11:26:34 -08:00
Mouse Reeve
7204068d2a Removes unnecessary override of field_from_activity on foreign key 2020-12-09 13:35:36 -08:00
Mouse Reeve
6b9db97ab8 tests set_related_field 2020-12-09 13:11:42 -08:00
Mouse Reeve
ef2a07884f Throws validation error when remote_id is None 2020-12-09 11:57:29 -08:00
Mouse Reeve
cc42e9d149 Asyncronously set related fields 2020-12-08 09:43:12 -08:00
Mouse Reeve
4d4ee8b8c3 Starts getting reverse fields working for deserialization
also fixes the fields on the image model and runs a long overdue
migration
2020-12-07 18:28:42 -08:00
Mouse Reeve
d0c1a68df6 Patches celery call in field tests and fixes tag field 2020-12-07 13:39:05 -08:00
Mouse Reeve
0a576c325c Fixes deserializing tags of varied types 2020-12-07 13:16:42 -08:00
Mouse Reeve
6817babf3c adds some tests for to_model 2020-12-07 12:19:15 -08:00
Mouse Reeve
f61fcb1261 Adds tests for resolve_remote_id 2020-12-07 10:46:41 -08:00
Mouse Reeve
74ac8d60f8 Starts adding tests for base_activity
includes init and find_existing_by_remote_id
2020-12-07 10:32:31 -08:00
Mouse Reeve
4599df752d Adds tests for many to many field deserialization 2020-12-07 09:31:12 -08:00
Mouse Reeve
69bb3f2751 Fixes validation error in many to many field deserializer 2020-12-07 09:14:30 -08:00
Mouse Reeve
7a90aa8f6c Start moving serializing from to_model to fields 2020-12-05 21:33:48 -08:00
Mouse Reeve
8500a7cfe1 Unit test fails in CI but not local 2020-12-05 15:38:12 -08:00
Mouse Reeve
ef1558628f Fixes transient failure in image field test 2020-12-05 14:48:47 -08:00
Mouse Reeve
05cde33a0c Adds tests for remaining nontrivial model fields 2020-12-05 14:42:54 -08:00
Mouse Reeve
8a900689d3 Generalizes link format in many to many field 2020-12-04 17:57:14 -08:00
Mouse Reeve
f116ce378d Fixes foreign key test 2020-12-04 17:42:41 -08:00
Mouse Reeve
aa6e312cfb Starts adding tests for custom model fields 2020-12-04 17:38:39 -08:00
Mouse Reeve
142a39cf55 Updates remote user when refreshing key 2020-12-04 16:26:07 -08:00
Mouse Reeve
9c9da35d9a Tests base_model to_activity 2020-12-04 15:14:26 -08:00
Mouse Reeve
800ddf2a6b fixes inconsistency in to_undo activity helper 2020-12-04 11:53:50 -08:00
Mouse Reeve
39307ce1cd Fixes remote_id on Update activities 2020-12-04 11:48:34 -08:00
Mouse Reeve
2e4aff90a3 Fixes signing Create activities
and some tests for the base_model
2020-12-04 11:29:38 -08:00
Mouse Reeve
9989641f4c fixes bug in update user public key 2020-12-04 09:46:40 -08:00
Mouse Reeve
1ae3830ae4 Removes test state of signatures 2020-12-04 08:42:34 -08:00
Mouse Reeve
de6147ecfa Ignore many to many activitypub serialization of non-lists 2020-12-04 08:29:54 -08:00
Mouse Reeve
ae8d0e1974 Adds sort order for outbox 2020-12-04 08:07:47 -08:00
Mouse Reeve
d92fb53333 Handle absent remote ids
it oughtent get to this state, but...
2020-12-03 17:23:08 -08:00
Mouse Reeve
646ced80ce Test fixes 2020-12-03 17:18:23 -08:00
Mouse Reeve
bbbfbe721e Removes update user test 2020-12-03 16:23:13 -08:00
Mouse Reeve
27c45c0584 Catch json decode error in loading data 2020-12-03 13:42:02 -08:00
Mouse Reeve
b1640c5dc9 Sets mocks up for incoming tests 2020-12-03 13:35:51 -08:00
Mouse Reeve
9c6db1cc0e Updates connector tests 2020-12-03 13:22:50 -08:00
Mouse Reeve
de7e64932a Fixes name of book field on status 2020-12-03 13:15:05 -08:00
Mouse Reeve
3a75127301 Removes half-baked field serializers 2020-12-03 13:00:04 -08:00
Mouse Reeve
e87236d78f Remove unnecessary user create action 2020-12-03 12:57:44 -08:00
Mouse Reeve
6d137ccada mock celery task in test signing 2020-12-03 12:50:21 -08:00
Mouse Reeve
77a1fc26f1 Save key pair when creating new User 2020-12-03 12:45:01 -08:00
Mouse Reeve
a85043b351 Updates to_model to use fields 2020-12-03 12:35:57 -08:00
Mouse Reeve
8fb8e93e37
Merge pull request #375 from mouse-reeve/username-regex
Allow usernames with dots
2020-12-02 15:27:03 -08:00
Mouse Reeve
2cf73188f2 fixes localname regex 2020-12-02 15:24:43 -08:00
Mouse Reeve
b5e92fe65e Allow usernames with dots 2020-12-02 15:21:15 -08:00
Mouse Reeve
d7e9a00cf1 Fixes password reset flow 2020-12-02 15:19:29 -08:00
Mouse Reeve
1610d81ce6 fixes some of the signing test issues 2020-11-30 19:53:42 -08:00
Mouse Reeve
fee5846aa8 Fixes generating new key paris for user
and the broadcast test
2020-11-30 19:33:50 -08:00
Mouse Reeve
eb6206252d cleans up ordered collection mixin 2020-11-30 19:24:31 -08:00
Mouse Reeve
1ec2f20486 avoid naming clash is to_activity for field vs model 2020-11-30 14:54:45 -08:00
Mouse Reeve
77aead722d serialize book and author models 2020-11-30 14:40:26 -08:00
Mouse Reeve
3966c84e08 Updates status model and serializer 2020-11-30 14:24:31 -08:00
Mouse Reeve
8bc0a57bd4 Remove outdated user fields 2020-11-30 11:40:04 -08:00
Mouse Reeve
74a58e5267 Use custom model fields in user model 2020-11-30 10:32:29 -08:00
Mouse Reeve
96563598bf mock celery tasks for broadcast tests 2020-11-29 10:13:30 -08:00
Mouse Reeve
205fa0d465 set user's remote server in a celery task 2020-11-29 10:08:19 -08:00
Mouse Reeve
9ddd60ce16 Fixes broadcast tests 2020-11-29 09:40:15 -08:00
Mouse Reeve
e9be31e9c1 merge migrations 2020-11-28 19:06:40 -08:00
Mouse Reeve
d8fdc66450 removes outdated update book code 2020-11-28 19:03:37 -08:00
Mouse Reeve
c9433a3c7e Simplify bookwyrm connector abstract 2020-11-28 18:56:28 -08:00
Mouse Reeve
9d84346d3c remove need for get_or_create_book 2020-11-28 18:46:50 -08:00
Mouse Reeve
34e8fb3e5c style fix and removing stray print statement 2020-11-28 18:28:09 -08:00
Mouse Reeve
1789b091d6 not all that better way to distinguish add book to shelf vs tag 2020-11-28 18:23:34 -08:00
Mouse Reeve
b4fe9f160f Correctly look up books by remote/origin id 2020-11-28 18:11:52 -08:00
Mouse Reeve
dfd730757d handle unset default editions 2020-11-28 17:42:09 -08:00
Mouse Reeve
72c7829bab Preserve remote_id syntax for authors and books 2020-11-28 17:29:03 -08:00
Mouse Reeve
7ed2e310c0 User origin ids for books and authors 2020-11-28 13:40:09 -08:00
Mouse Reeve
1483b0b62c Merge branch 'main' into follow-remote-ids 2020-11-28 13:14:53 -08:00
Mouse Reeve
0a8ef98854 use localized remote_ids for books 2020-11-28 13:14:18 -08:00
Mouse Reeve
421a13fda0 automatically load authors and editions 2020-11-28 13:00:04 -08:00
Mouse Reeve
e99394e6f7 User serializer to create follow request 2020-11-28 12:25:53 -08:00
Mouse Reeve
76ce20a5e0 Fixes tests 2020-11-28 11:52:00 -08:00
Mouse Reeve
b0202eb8e8 Remove special remote user handling code
also fixes date parsing
2020-11-28 11:48:17 -08:00
Joel Bradshaw
7fadbeeb55 Merge branch 'main' into progress_update 2020-11-28 11:06:01 -08:00
Mouse Reeve
fd7e476c9b refactors tag model to fit ordered collection structure 2020-11-28 11:04:54 -08:00
Mouse Reeve
a93b5cf5bc Use remote_id resolver to load books, user 2020-11-28 10:18:24 -08:00
Mouse Reeve
e0fec9f570 fixes incorrect decorators 2020-11-28 09:17:24 -08:00
Mouse Reeve
81bdd2b3f1 Merge branch 'main' into follow-remote-ids 2020-11-28 08:40:37 -08:00
Mouse Reeve
1c8a0c942a
Merge branch 'main' into quick-add-description 2020-11-28 08:36:46 -08:00
Mouse Reeve
b2ca67a67c Make adding a description require edit perms 2020-11-28 08:29:55 -08:00
Mouse Reeve
9c33d0ebfa use require_GET decorator 2020-11-28 08:22:25 -08:00
Mouse Reeve
78fa949237 Inline form to add description to book 2020-11-28 07:55:31 -08:00
Joel Bradshaw
a951f20ff6 Add a couple forgotten files 2020-11-28 00:36:01 -08:00
Joel Bradshaw
500f05266a Add option for progress percentage
And rework display on book page as well
2020-11-28 00:07:04 -08:00
Mouse Reeve
ebb82287c2 First pass at recursively resolving foreign keys 2020-11-27 22:10:38 -08:00
Mouse Reeve
5638597112 Fixes errors caught in tests 2020-11-27 20:27:56 -08:00
Mouse Reeve
86cbb3edbd Merge branch 'main' into activitypub-cleanup 2020-11-27 20:13:32 -08:00
Mouse Reeve
4626d94ab9 handle image attachments recursively 2020-11-27 20:11:46 -08:00
Mouse Reeve
2480690378 Automatically handle image fields in model serializer 2020-11-27 18:26:07 -08:00
Joel Bradshaw
9ed7d23000 Test updating a progress
Also remove spurious whitespace change
2020-11-27 18:19:12 -08:00
Joel Bradshaw
6455cc7fe9 Add initial tests and some fixes
Make timezones aware, and create a progress update if we can upon
starting a readthrough
2020-11-27 18:16:13 -08:00
Mouse Reeve
4ae785a7f7 move image activity to its own file 2020-11-27 17:59:46 -08:00
Mouse Reeve
624ff71a11 Makes attachment Images a serializable class 2020-11-27 17:20:01 -08:00
Joel Bradshaw
3cb28273c4 Merge branch 'main' into progress_update 2020-11-27 17:05:54 -08:00
Joel Bradshaw
d8b2afff3d Replace naive datetimes with aware ones 2020-11-27 16:35:03 -08:00
Joel Bradshaw
5f2ac6d961 Rename fr_* to bw_* 2020-11-27 16:12:47 -08:00
Joel Bradshaw
3b0b8f16f6 Merge migration branches
Also add $@ to bw-dev migrations, and factor the shift 1 out
2020-11-27 16:08:04 -08:00
Joel Bradshaw
85026b837c Merge branch 'main' into progress_update 2020-11-27 15:52:55 -08:00
Mouse Reeve
69a6644011 Corrects activitypub fields to camelcase in Book 2020-11-27 15:34:47 -08:00
Mouse Reeve
7b6035898b Serialize activitypub authors from data in connector 2020-11-27 14:54:08 -08:00
Mouse Reeve
f593970332 Merge branch 'main' into refactor-bookwyrm-connector 2020-11-27 14:26:02 -08:00
Mouse Reeve
9e48328e9e Mocks broadcast task for outgoing shelve tests 2020-11-27 14:18:45 -08:00
Mouse Reeve
4ec557fc5d fixes unit tests for incoming and outgoing follows 2020-11-27 14:15:13 -08:00
Mouse Reeve
f173d674ac Mock fetch_user function which makes http request 2020-11-27 13:53:38 -08:00
Mouse Reeve
a8f3ddec05 Trying to avoid issues from execusing http requests 2020-11-27 13:39:33 -08:00
Mouse Reeve
829615cdd7 Fixes celery mocks on more signature unit tests 2020-11-27 13:18:10 -08:00
Mouse Reeve
73279d65d7 Fix test remote signer and comment out failing tests 2020-11-27 13:08:01 -08:00
Mouse Reeve
48ab993861 Mocks celery task for follow request 2020-11-27 13:02:26 -08:00
Mouse Reeve
0c01af4042 Another nondeterministic list order problem 2020-11-27 12:42:01 -08:00
Mouse Reeve
44a0ef3b0b Fixes nondeterministic order of query causing test failure 2020-11-27 12:25:01 -08:00
Mouse Reeve
257a29dcfd Comment out failing tests
Obviously this is not a SOLUTION, it's an intermediary step in resolving
the redis dependency issues. this PR isn't mergable until the tests are
restored.
2020-11-27 11:53:30 -08:00
Joel Bradshaw
97e49c4bd2 Undo stray css edit 2020-11-25 23:12:05 -08:00
Joel Bradshaw
692aa08364 Remove unneeded class, wrap line 2020-11-25 23:11:30 -08:00
Joel Bradshaw
64fb88cc10 ProgressUpdate doesn't need its own date field
Just use the base model's created_date
2020-11-25 23:03:32 -08:00
Joel Bradshaw
090cf2aea7 Make inline progress form actually work 2020-11-25 23:03:27 -08:00
Joel Bradshaw
e7c0368168 PR feedback 2020-11-25 22:36:55 -08:00
Mouse Reeve
9b79eb5fc3 Removes outdated test of bookwyrm connector updater 2020-11-25 11:44:19 -08:00
Mouse Reeve
4f6ce0307d fixes import in abstract connector unit test 2020-11-25 11:24:36 -08:00
Mouse Reeve
0ec40ae748 Merge branch 'main' into refactor-bookwyrm-connector 2020-11-25 11:21:13 -08:00
Mouse Reeve
aed360d07e Fixes serializer handling default dataclass fields 2020-11-25 11:16:01 -08:00
Mouse Reeve
9b57cfd331 Fixes default lists on activitypub dataclasses 2020-11-25 10:45:39 -08:00
Mouse Reeve
641ac22786 remove outdated tests 2020-11-24 16:26:28 -08:00
Mouse Reeve
847014720e Refactors bookwyrm connector to use activitypub serializer 2020-11-24 16:05:00 -08:00
Mouse Reeve
7b4847852a Merge migrations manually 2020-11-24 13:42:47 -08:00
Mouse Reeve
3dc0fc7e8f Merge branch 'main' into edit-books-erros 2020-11-24 13:40:53 -08:00
Mouse Reeve
1fd498c306 Display error messages in edit book form 2020-11-24 13:37:35 -08:00
Mouse Reeve
9bbedc5d9a Fixes field causing form invalidation when editing books 2020-11-24 13:25:58 -08:00
Mouse Reeve
6cc1e241fe display images at a reasonable size 2020-11-24 12:07:00 -08:00
Mouse Reeve
ff5a0f7bc2 Adds alt text to status images 2020-11-24 11:44:13 -08:00
Mouse Reeve
45a0bd79fd Very basic image display 2020-11-24 11:28:17 -08:00
Mouse Reeve
ad7ce6595b Receive and save incoming images 2020-11-24 11:25:07 -08:00
Mouse Reeve
88e4705717 Use attachment database table 2020-11-23 20:42:05 -08:00
Mouse Reeve
17fca8181b Simplify user creation code 2020-11-23 13:50:14 -08:00
Mouse Reeve
e2debd855c Convert activitypub Image into model ImageField 2020-11-23 13:43:46 -08:00
Mouse Reeve
5526b4773e Formatter for converting model images to AP Images
Replaces reduntant properties on user and book models
2020-11-23 13:07:26 -08:00
Mouse Reeve
dab0aeffb2 Adds image attachment field to status model 2020-11-23 12:48:41 -08:00
Mouse Reeve
56638f79cf
Merge pull request #359 from mouse-reeve/activity-tags
Serialize and deserialize activitypub "Tags" on statuses
2020-11-22 09:35:19 -08:00
Mouse Reeve
5e34d136fd
Merge pull request #361 from cincodenada/fix-navbar
Fix navbar on mobile, make search an addon
2020-11-20 21:51:33 -08:00
Joel Bradshaw
f57d9ee45d Rework to use bulma better 2020-11-20 21:45:12 -08:00
Joel Bradshaw
df2dc5a8a1 Remove placebo class
is-third-mobile was the wrong class, it turns out just column is what
was making it work like I wanted it to
2020-11-20 21:27:50 -08:00
Joel Bradshaw
8945e70e42 Fix navbar on mobile, make search an addon
In reading up on Bulma I found the has-addons option which is a nice
touch, I think
2020-11-20 21:19:26 -08:00
Mouse Reeve
56b6fb9c97
Merge pull request #360 from mouse-reeve/shelve_buttons
Fixes unset active shelf in shelve button pulldown
2020-11-20 21:18:28 -08:00
Mouse Reeve
448efff648 Fixes unset active shelf in shelve button pulldown 2020-11-20 10:05:37 -08:00
Mouse Reeve
9a55dba315 Special handling for setting many to many fields in serializer 2020-11-20 09:59:55 -08:00
Mouse Reeve
72b4c150f6 (De)serializers for tag fields 2020-11-20 09:28:54 -08:00
Mouse Reeve
73e41d568e Serialize model user and book tags to activitypub 2020-11-20 08:14:16 -08:00
Joel Bradshaw
a579ea52f4 Add initial inline progress update
Doesn't work yet
2020-11-19 19:38:38 -08:00
Joel Bradshaw
1d0c0ae5c5 Add rename_app command and use it
This allows users to migrate from a pre-rename database without
resetting their database, hopefully
2020-11-19 13:49:53 -08:00
Joel Bradshaw
ff7d87b1c4 Make progress updates toggle-able
Also move into their own section
2020-11-18 19:05:52 -08:00
Mouse Reeve
6553e5df34 Makes sure pages have h1 header heirarchy 2020-11-18 12:31:53 -08:00
Joel Bradshaw
c9b2b4efac Add migration for ProgressUpdate 2020-11-16 23:54:03 -08:00
Joel Bradshaw
f524f0cd4d Add basic view logic for testing 2020-11-16 23:53:46 -08:00
Joel Bradshaw
00b8608a50 Make ProgressUpdate attached to a readthrough 2020-11-16 23:53:17 -08:00
Joel Bradshaw
13229ea937 Add progress updates as their own table 2020-11-16 23:29:32 -08:00
Joel Bradshaw
7ffc3114a6 Add display and form for existing pages_read
Commented out the new update type because it was breaking and I don't
need it quite yet
2020-11-16 22:47:55 -08:00
Joel Bradshaw
3beebe4727 Add initial draft of progress update 2020-11-16 22:33:04 -08:00
Mouse Reeve
680211cff5 refactors re-shelve button dropdown to be accessible
still looks janky as heck, but fixes #350
2020-11-16 16:34:26 -08:00
Mouse Reeve
699a661f00 Remove broken add book link 2020-11-13 12:18:13 -08:00
Mouse Reeve
28e1c9525c tweaks search rankings for better results 2020-11-13 11:03:39 -08:00
Mouse Reeve
6300c37a4e Select all checkbox 2020-11-13 10:14:24 -08:00
Mouse Reeve
86504989b4 fixes import matching with local books 2020-11-13 09:59:57 -08:00
Mouse Reeve
e3a803b907 Allow import retry 2020-11-13 09:02:41 -08:00
Mouse Reeve
083b576bc4 fixes broken activity serializer error import 2020-11-13 07:34:37 -08:00
Mouse Reeve
211ac4241b
Merge pull request #348 from mouse-reeve/incoming-errors
Incoming errors
2020-11-12 14:38:57 -08:00
Mouse Reeve
1ad347ffdb
Merge pull request #346 from mouse-reeve/trim-text
Collapse long review text
2020-11-12 14:38:43 -08:00
Mouse Reeve
1f11ffd646 Uses task.ready for checking if the job is running 2020-11-12 14:11:39 -08:00
Mouse Reeve
932b4f8b81 Small fix in goodreads import error handling 2020-11-12 14:01:17 -08:00
Mouse Reeve
032ce8efba Show failed books 2020-11-12 13:52:57 -08:00
Mouse Reeve
799496bb86 Move past all book loading exceptions during import 2020-11-12 13:33:12 -08:00
Mouse Reeve
74236c4810 Handle errors tryingt o load covers from instances 2020-11-12 13:20:32 -08:00
Mouse Reeve
0a2d762d3b Fixes error state when there are author duplicates
there shouldn't be, but it shouldn't crash a goodreads import either
2020-11-12 13:16:26 -08:00
Mouse Reeve
ffeed6047e Fixes reporting import task status 2020-11-12 13:12:08 -08:00
Mouse Reeve
123fe5e769 Error handling in remote user 2020-11-12 12:27:49 -08:00
Mouse Reeve
4ccf1c4818 Small html style changes on import pages 2020-11-12 12:22:06 -08:00
Mouse Reeve
c0bc4f3903 Catch error trying to get status id in delete 2020-11-12 12:02:43 -08:00
Mouse Reeve
648e7a7581 Special error for catching activitypub serialization issues 2020-11-12 11:59:34 -08:00
Mouse Reeve
2f0b91d843
Merge pull request #343 from mouse-reeve/readthrough-ui
Make readthrough edit/delete toggle a button
2020-11-12 11:41:34 -08:00
Mouse Reeve
23ef1e8b7d Collapse long review text 2020-11-12 11:40:20 -08:00
Mouse Reeve
44b798b423 Puts reply form below button that shows it
still think this is janky.
2020-11-11 18:32:52 -08:00
Mouse Reeve
801c2cdad2 Make readthrough edit/delete toggle a button 2020-11-11 16:47:11 -08:00
Mouse Reeve
ad948e7313 Remove more info box when it's not used 2020-11-11 11:52:14 -08:00
Mouse Reeve
c1567826ca Paginate reviews page 2020-11-11 10:50:51 -08:00
Mouse Reeve
90d0d721dd Paginates user activity feed 2020-11-11 10:43:47 -08:00
Mouse Reeve
91a32c014e Uses django paginator for feed page 2020-11-11 10:35:34 -08:00
Mouse Reeve
1d0b7fa64f Proper privacy on user page shelf previews 2020-11-11 10:14:04 -08:00
Mouse Reeve
c08be903b1
Merge pull request #338 from mouse-reeve/code-cleanup
Code cleanup
2020-11-10 22:29:30 -08:00
Mouse Reeve
56850b9574
Merge pull request #336 from mouse-reeve/user-shelves
User-created shelves
2020-11-10 22:06:40 -08:00
Mouse Reeve
1e7b5f7981 remove unused forms
also some more get_object_or_404s
2020-11-10 22:06:06 -08:00
Mouse Reeve
de7de3d3d5 json view for tags page 2020-11-10 21:50:05 -08:00
Mouse Reeve
c3d2018411 Unused forms 2020-11-10 21:47:28 -08:00
Mouse Reeve
d71b451eef More model ids in urls 2020-11-10 21:45:22 -08:00
Mouse Reeve
4297e8647d put status id in path for delete-status 2020-11-10 21:39:24 -08:00
Mouse Reeve
7f9cc31040 consistent style for urls 2020-11-10 21:34:26 -08:00
Mouse Reeve
8ae05c1350 Use get_object_or_404 2020-11-10 21:13:13 -08:00
Mouse Reeve
a6796275b8 Fixes duplicate ids 2020-11-10 20:50:46 -08:00
Mouse Reeve
60e699efeb Make shelves delete-able 2020-11-10 20:33:46 -08:00
Mouse Reeve
ee59c64a10 Edit shelf 2020-11-10 20:11:21 -08:00
Mouse Reeve
c16047d0bc Control display of shelves based on privacy settings 2020-11-10 16:43:52 -08:00
Mouse Reeve
176257eb85 SHow privacy icon on shelves 2020-11-10 16:18:48 -08:00
Mouse Reeve
81d09a3d1b Fixes aria that should be role 2020-11-10 14:57:44 -08:00
Mouse Reeve
0e13616e73 lowercase shelf identifier 2020-11-10 14:56:53 -08:00
Mouse Reeve
408ca6609c Let users create shelves 2020-11-10 14:52:04 -08:00
Mouse Reeve
c3fe8e041a Disentangles user pages 2020-11-10 14:07:12 -08:00
Mouse Reeve
4ee2fab58f Refactors menu for re-shelving a book in shelf page 2020-11-10 13:40:42 -08:00
Mouse Reeve
ab0f9230c7 Adds privacy setting to shelves 2020-11-10 13:39:58 -08:00
Mouse Reeve
a5a1af418c Adds ui for editing and adding shelves 2020-11-10 13:39:37 -08:00
Mouse Reeve
de744483ec
Merge pull request #334 from mouse-reeve/comment-form
More interactive clickable elements
2020-11-10 12:48:45 -08:00
Mouse Reeve
a0243d089c star rating label can't surround input for css to work 2020-11-09 21:26:22 -08:00
Mouse Reeve
c4bf2653f7 Fixes text for absent star rating 2020-11-09 21:15:55 -08:00
Mouse Reeve
5a1cf9ce83 more search results clickable 2020-11-09 18:57:56 -08:00
Mouse Reeve
5e3426236a
Merge pull request #333 from mouse-reeve/show-more-less
Show more less
2020-11-09 16:56:32 -08:00
Mouse Reeve
29013ca91b Fixes mobile-only navbar menu 2020-11-09 16:53:52 -08:00
Mouse Reeve
37bb53aba5 set tabindex on show more show less toggles 2020-11-09 16:28:38 -08:00
Mouse Reeve
68cb1612e2 make comment toggle clickable 2020-11-09 16:27:45 -08:00
Mouse Reeve
be12ec49a3 Gives more/less toggles button role 2020-11-09 16:16:57 -08:00
Mouse Reeve
ae27570812 Adds tablist and tabpanel elements for covers tabs 2020-11-09 13:24:11 -08:00
Mouse Reeve
82896e7d81
Merge pull request #330 from mouse-reeve/wave-evaluator
Various small WAVE suggestions
2020-11-09 13:12:50 -08:00
Mouse Reeve
a40a1bdcb4 Fixes labels on import page 2020-11-09 12:40:22 -08:00
Mouse Reeve
cdc7af89cf Fixes header numbers in edit book page 2020-11-09 12:35:18 -08:00
Mouse Reeve
0f4df08769 Fixes contrast on danger buttons 2020-11-09 12:10:37 -08:00
Mouse Reeve
7042e59402 Convert h2s to h1s where obvious 2020-11-09 12:06:44 -08:00
Mouse Reeve
79f7c55a04 indicate if menu has been expanded 2020-11-09 11:58:19 -08:00
Mouse Reeve
607612a1d9 Adds label to privacy pulldown 2020-11-09 11:44:24 -08:00
Mouse Reeve
e176d5d288 Labels textareas in create status form 2020-11-09 11:40:19 -08:00
Mouse Reeve
b4d1a23ef6 Expose "no rating" option in create review form 2020-11-09 11:33:50 -08:00
Mouse Reeve
c3c59ce3d8 Adds label to mobile dropdown button
and changes the icon
2020-11-09 11:29:17 -08:00
Mouse Reeve
716ab3a78d make the start reading button always use the modal
are the modals good??? who knows
2020-11-09 11:16:39 -08:00
Mouse Reeve
52cb5fbb0e
Merge pull request #327 from mouse-reeve/create-status-tabs
Covers and create status tabs
2020-11-08 20:12:21 -08:00
Mouse Reeve
0b97efd94d
Merge pull request #323 from jimfingal/jim/cli-tooling
Add some extra Python / Docker cli tooling
2020-11-08 20:12:03 -08:00
Mouse Reeve
c37c6aae40 nested covers tabs should work with screen reader 2020-11-08 19:34:41 -08:00
Mouse Reeve
b7bc089d86 Improves tabbing javascript for create status tabs 2020-11-08 19:09:29 -08:00
Mouse Reeve
b7f8055ede Fixes review/comment/quote tabs in create status form 2020-11-08 18:23:12 -08:00
Mouse Reeve
957afed8bb Make star ratings in reviews accessible in voiceover 2020-11-08 16:45:32 -08:00
Mouse Reeve
36dc41620a Set tabbing on shelve button items 2020-11-08 16:25:22 -08:00
Mouse Reeve
096d5008c3 Adds start and finish modal snippets 2020-11-08 15:53:53 -08:00
Mouse Reeve
5042344bca Fix accessibility for shelve buttons/read forms 2020-11-08 15:15:42 -08:00
Mouse Reeve
07b0112e1a
Merge pull request #312 from mouse-reeve/api_info
Updates nodeinfo and api info
2020-11-08 14:15:50 -08:00
Mouse Reeve
a8afc3fc36
Merge pull request #322 from mouse-reeve/voiceover-review
Fixes "notifications" typo and adds alt text to avatars
2020-11-08 14:12:20 -08:00
Christa Hartsock
037697a382 Associate 'tags' label to formfield
So that the tags label is read by screenreaders
2020-11-08 13:42:01 -08:00
Christa Hartsock
2e944bceb9 Remove "for" from start/end date labels
The "for" value pointed to an ID for an input that didn't exist, which
caused screenreaders to not read the value of the label when
specififying readthrough dates. Removing the
'for' tags makes the screenreader read the label as expected since the
label wraps the input, so we don't need a 'for'.
2020-11-08 13:40:36 -08:00
Christa Hartsock
b684e929b4 Add label text to search input
For use by screenreaders.
2020-11-08 13:23:05 -08:00
Jim Fingal
1f9891dcf5 Create example marker to avoid tests that require external domain 2020-11-08 13:07:37 -08:00
Mouse Reeve
8f95c1e728 Clearer logo link to home page and missing filter import 2020-11-08 12:38:27 -08:00
Mouse Reeve
77b0a3b67f Adds alt text to avatars 2020-11-08 12:25:05 -08:00
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