Commit graph

817 commits

Author SHA1 Message Date
Mouse Reeve
64c2313a5d Merge branch 'main' into inventaire 2021-04-26 14:22:05 -07:00
Mouse Reeve
3ade2d3bb1 New version of black, new whitespace 2021-04-26 09:15:42 -07:00
Mouse Reeve
013d5f1db3
Merge pull request #987 from bookwyrm-social/duplicate-boosts
Don't broadcast boosts twice
2021-04-23 11:58:01 -07:00
Mouse Reeve
79424f7bfb Python formatting 2021-04-23 10:56:17 -07:00
Mouse Reeve
32e694032b Fixes duplicate boost model verification 2021-04-23 10:49:17 -07:00
Mouse Reeve
b457446f2f Don't save duplicate boosts 2021-04-22 19:36:27 -07:00
Mouse Reeve
563623616c Merge branch 'main' into remove-tags 2021-04-22 18:18:24 -07:00
Mouse Reeve
9148f36719 Fixes duplicate boosts 2021-04-22 18:16:00 -07:00
Mouse Reeve
c455585262 Adds missing data file 2021-04-22 10:30:00 -07:00
Mouse Reeve
3ed822b9ea Don't erase follows on update 2021-04-22 10:28:10 -07:00
Mouse Reeve
9c87c91c62
Merge pull request #979 from bookwyrm-social/allow-refollow
Allow refollow
2021-04-22 08:56:48 -07:00
Mouse Reeve
6b84e53ddd Send accepts to duplicate follow requests 2021-04-22 08:40:32 -07:00
Mouse Reeve
db09ca4331 Adds last edited by to author 2021-04-22 07:51:06 -07:00
Mouse Reeve
ae5e744731 Save last edited by user 2021-04-22 07:29:09 -07:00
Mouse Reeve
77775d9bf8 Remove superfluous calls to all() 2021-04-19 14:47:59 -07:00
Mouse Reeve
d69ce8cbbd
Merge pull request #923 from SavinaRoja/584-sorting-lists
584 sorting of lists
2021-04-19 14:37:50 -07:00
D Anzorge
7a2731aef4 Use object ids with our instance base path for follow accept/reject 2021-04-18 18:08:13 +02:00
Mouse Reeve
02e6602a0b Reject statuses from deactivated remote users 2021-04-17 17:55:22 -07:00
Mouse Reeve
8421a2e832 Clarifies logic in if statement 2021-04-17 15:14:23 -07:00
Mouse Reeve
44528eaa09 Don't double-override to_activity 2021-04-17 13:31:37 -07:00
Mouse Reeve
ebdbdc8790 Broadcast deletions 2021-04-17 13:19:23 -07:00
Mouse Reeve
5b7f2007e8 Broadcast user deletions 2021-04-17 12:51:36 -07:00
Pablo Barton
f6824268ed 584 sorting of lists 2021-04-16 22:17:15 -04:00
Mouse Reeve
f792dd0dac
Merge pull request #943 from bookwyrm-social/activity-serialize-errors
Activity serialize errors
2021-04-15 17:00:00 -07:00
Mouse Reeve
220fb926c9 Rename Image to Document 2021-04-15 16:35:04 -07:00
Mouse Reeve
9176a2b9ee Fixes bug that causes recusive broadcasts 2021-04-15 15:51:49 -07:00
Pablo Barton
88d37736ee 902 using get_page for Paginator instead of page 2021-04-15 08:54:23 -04:00
Mouse Reeve
878b3c6fe8 Only reactivate appropriate users when undoing domain block 2021-04-12 10:16:03 -07:00
Mouse Reeve
93fe091034 Adds field for user deactivation reason 2021-04-12 09:51:10 -07:00
Mouse Reeve
db4519b2e1 Fixes visible_to_user check for non-federated objs
why did this cause a problem _now_??
2021-04-11 10:45:08 -07:00
Mouse Reeve
77caf1a8fa Merge branch 'main' into domain-block 2021-04-11 10:02:11 -07:00
Mouse Reeve
edf3fad54d Make sure user is available when testing blocks 2021-04-11 09:42:55 -07:00
Mouse Reeve
b6a7871b04 Makes visibility evaluator a model function 2021-04-11 09:31:18 -07:00
Mouse Reeve
26f16cf5a4 Limit broadcast with viewer-aware users
Removes inactive or blocked users
2021-04-11 09:09:13 -07:00
Mouse Reeve
98ff66cd16 Don't broadcast curation rejects 2021-04-10 18:15:13 -07:00
Mouse Reeve
1903812b1d Class method for checking if urls are blocked 2021-04-10 11:44:29 -07:00
Mouse Reeve
2741aa55be Makes blocking it's own view 2021-04-10 10:37:28 -07:00
Mouse Reeve
13d54871b7 Merge branch 'main' into domain-block 2021-04-10 09:26:01 -07:00
Mouse Reeve
fdf5113143 Removes tag code 2021-04-08 16:02:02 -07:00
Mouse Reeve
b1491c2ac6 Adds privacy and recipient details to list items 2021-04-08 15:09:56 -07:00
Mouse Reeve
e550f8cde6 Fixes list item fields and broadcast updates 2021-04-08 14:47:38 -07:00
Mouse Reeve
31077a9790 Update ordered collection classes to use CollectionItem 2021-04-08 14:17:29 -07:00
Mouse Reeve
779377bd0c Makes localname case insensitive 2021-04-08 09:00:32 -07:00
Mouse Reeve
8261fbf86a Updates federated server model with notes field
Also makes it more editable, and changes the status types
2021-04-07 11:28:31 -07:00
Mouse Reeve
4e0225749d Merge branch 'main' into domain-block 2021-04-07 11:23:15 -07:00
Mouse Reeve
2c5f62e6cd
Merge pull request #905 from mouse-reeve/shelve-action-serialization
Safer serialization of shelve and un-shelve activities
2021-04-07 11:18:39 -07:00
Mouse Reeve
5427790c4e Safer serialization of shelve and unshelve activities 2021-04-07 11:02:56 -07:00
Mouse Reeve
ef12b077dd Adds following field to actor serialization 2021-04-07 10:32:16 -07:00
Mouse Reeve
45006afdf3 Remove character limit on some book fields 2021-04-07 08:50:50 -07:00
Mouse Reeve
82c2f2eeb1 Adds more author identifier fields 2021-04-06 17:46:06 -07:00
Mouse Reeve
295842badd Adds inventaire id to book data model 2021-04-06 10:40:39 -07:00
Mouse Reeve
f30d05acfc Update connector model to add new connector 2021-04-06 10:40:13 -07:00
Mouse Reeve
1901f7e6cb Check if incoming domains are blocked 2021-04-05 15:16:41 -07:00
Mouse Reeve
bfacfbb09a
Merge pull request #852 from mouse-reeve/optional-outbox
Makes outbox an optional field on the user table
2021-04-02 07:56:55 -07:00
Mouse Reeve
45d229d712 Makes outbox an optional field on the user table 2021-04-02 07:35:56 -07:00
Mouse Reeve
2174ea11ec Makes user to_activity serializer args consistent 2021-04-02 07:33:36 -07:00
Mouse Reeve
29792080a9 Don't create notifications when deleting statuses 2021-04-01 20:40:28 -07:00
Mouse Reeve
634509a7f3 Associate users with their invites 2021-04-01 17:20:02 -07:00
Mouse Reeve
32bd426999 Fixes shelf remote ids 2021-03-31 11:04:20 -07:00
Mouse Reeve
f8ce9b0956 Backwards compatibility with "shelf" urls 2021-03-31 09:50:16 -07:00
Mouse Reeve
f7b0a282a7 Set updated date on list when item is added 2021-03-30 10:28:50 -07:00
Mouse Reeve
e86f160c53
Merge pull request #812 from SavinaRoja/357-tz-in-datetimes
357 Users set preferred timezone, used for readthroughs
2021-03-29 15:20:01 -07:00
Mouse Reeve
cc00a66b90
Merge pull request #800 from SavinaRoja/716-book-multiple-shelves
716 books can be on multiple shelves, but only on one shelf for reading status
2021-03-29 12:59:49 -07:00
Mouse Reeve
f63b6fb325 Fixes sending invite emails
Corrects the email sender and avoids integrity error on saves
2021-03-29 08:33:12 -07:00
Pablo Barton
b0dc5f3f93 357 Users set preferred timezone, used for readthroughs 2021-03-28 19:16:43 -04:00
Pablo Barton
daf69d2375 716 books can be on multiple shelves, but only on one shelf for reading status 2021-03-26 08:21:42 -04:00
Mouse Reeve
9acb8e53d8 Adds privacy fields to boost activities 2021-03-24 13:35:49 -07:00
Mouse Reeve
3fe3b0b2d5 Adds published date field to boost activity 2021-03-24 13:25:00 -07:00
Mouse Reeve
28dc67bf5c Fixes ignore test for valid remote statuses 2021-03-24 12:37:42 -07:00
Mouse Reeve
81bd3f5be8 Tests not showing notifications for self boosts 2021-03-24 12:13:00 -07:00
Mouse Reeve
1d53a06e35 Fixes decimaal formatting 2021-03-24 09:51:49 -07:00
Mouse Reeve
9dc19b8bff Python formatting 2021-03-24 09:34:21 -07:00
Mouse Reeve
bde6ce8525 Fixes review name in pure serialization 2021-03-24 09:31:45 -07:00
Mouse Reeve
320dfd1a59 Python formatting 2021-03-24 08:39:37 -07:00
Mouse Reeve
1707bba8a8 Adds ordering to status model 2021-03-24 08:37:25 -07:00
Mouse Reeve
39f34bc6e6 Adds activity stream utility for adding and removing statuses 2021-03-22 20:32:59 -07:00
Mouse Reeve
7eb494b4ab Removes get activity feed function 2021-03-22 19:17:46 -07:00
Mouse Reeve
3efabf1da3 Creates activity stream class 2021-03-22 18:39:16 -07:00
Mouse Reeve
459479db43 Add statuses to timelines 2021-03-22 16:19:02 -07:00
Mouse Reeve
3e75253ff1 Updates activitpub and tests for discoverability 2021-03-21 14:50:36 -07:00
Mouse Reeve
16994908d8 Lets users opt in to directory 2021-03-21 14:45:11 -07:00
Mouse Reeve
5e24b438ff Placeholders for send/ignore request flows 2021-03-20 20:16:13 -07:00
Mouse Reeve
4d07cb1eb5 Adds invite request model 2021-03-20 18:27:30 -07:00
Mouse Reeve
d3a4282f11 Show progress on status 2021-03-20 18:03:20 -07:00
Mouse Reeve
2a612f7278 Formatting 2021-03-20 17:39:05 -07:00
Mouse Reeve
daa0268eb3 Update progress with comments 2021-03-20 17:35:10 -07:00
Mouse Reeve
942c4a6664 Move progress updates into modal 2021-03-20 17:18:18 -07:00
Mouse Reeve
5a0723cde7 Migrations for django 3.1 upgrade 2021-03-19 12:43:36 -07:00
Mouse Reeve
266c6fe777 Make rating a decimal field 2021-03-19 12:14:59 -07:00
Mouse Reeve
9a20b5dbd5 Hide goal using database field instead of localstorage 2021-03-18 09:00:25 -07:00
Mouse Reeve
ba09377041 Use None instead of empty dict for endpoint default value 2021-03-17 13:59:16 -07:00
Mouse Reeve
8e1e4572f6
Merge pull request #747 from mouse-reeve/edit-book-fields
Adds publishers to edit book form
2021-03-16 14:03:49 -07:00
Mouse Reeve
9251883d77 Checks if publisher fields is present (it isn't on works) 2021-03-16 13:54:15 -07:00
Mouse Reeve
6370fbf2c6 Formatting 2021-03-16 13:39:33 -07:00
Mouse Reeve
b285fb2fc0 Set shelf user by default 2021-03-16 13:37:22 -07:00
Mouse Reeve
550eba1f68 Black formatting 2021-03-16 12:59:25 -07:00
Mouse Reeve
e5750de3dd Notify admins when a report is filed 2021-03-16 12:57:23 -07:00
Mouse Reeve
c50ca9f951 Still trying to catch connection error
I guess I was catching the wrong TYPE of connection error? annoying.
2021-03-15 16:23:35 -07:00
Mouse Reeve
0550918e5c
Merge pull request #744 from mouse-reeve/images
Fixes image attachments
2021-03-15 16:02:29 -07:00
Mouse Reeve
def834a0ac
Merge pull request #736 from mouse-reeve/rating-template
Render rating status from template
2021-03-15 15:42:36 -07:00
Mouse Reeve
d947632b69 Adds publisher to book cover alt text 2021-03-15 15:39:16 -07:00
Mouse Reeve
f79bb60d81 Adds ability to reset default edition based on computer ranks 2021-03-15 15:08:20 -07:00
Mouse Reeve
220f2c1eb4 Fixes image attachments 2021-03-15 13:55:48 -07:00
Mouse Reeve
aa2950daf3 Render rating status from template 2021-03-13 18:24:46 -08:00
Mouse Reeve
a1d95d5010
Merge pull request #725 from mouse-reeve/incoming-unshelve
Fixes handling incoming unshelve activities
2021-03-13 08:53:37 -08:00
Mouse Reeve
e1a8c4d260 Fixes handling incoming unshelve activities 2021-03-13 08:43:36 -08:00
Mouse Reeve
3edfcb7631 Trying to fix broadcast connectionerror exceptions 2021-03-13 08:15:58 -08:00
Mouse Reeve
919b166241 Catch error in serializing unknown boosts 2021-03-13 08:13:20 -08:00
Mouse Reeve
848edd2972 Adds missing migration for reports model 2021-03-12 16:32:11 -08:00
Mouse Reeve
9245b9d9ca Comments on reports 2021-03-12 15:56:54 -08:00
Mouse Reeve
33b8537a3d Let user supply a note for report 2021-03-11 17:38:21 -08:00
Mouse Reeve
0d2c641d01 Reformats report model 2021-03-09 12:57:38 -08:00
Mouse Reeve
21f199c548 Make reports 2021-03-08 18:36:50 -08:00
Mouse Reeve
e59c127686 Adds models for reporting 2021-03-08 17:16:59 -08:00
Mouse Reeve
3bdfc341e4 Runs black 2021-03-08 09:54:02 -08:00
Mouse Reeve
ad43e5c83a
Merge branch 'main' into review-rate 2021-03-08 09:48:25 -08:00
Mouse Reeve
70296e760b Runs black 2021-03-08 08:49:10 -08:00
Mouse Reeve
410e0b04bb Fixes fav logic and base activity test 2021-03-07 13:13:16 -08:00
Mouse Reeve
47cf77145d Updates tests for inbox tweaks 2021-03-07 09:48:39 -08:00
Mouse Reeve
71bbea83f9 Adds discard check to favs 2021-03-07 09:42:31 -08:00
Mouse Reeve
c0ccb7065c Safer federation of book data changes
Only broadcast to other BW instances, plus bonus error handling
2021-03-07 09:22:35 -08:00
Henri Bourcereau
703ff60271 isbn search 2021-03-06 18:09:15 +01:00
Mouse Reeve
b70e728ffb Removes the word "cover" from cover alt text
Fixes #694
2021-03-05 06:58:22 -08:00
Mouse Reeve
2542b72f3a Try to get github to re-run checks 2021-03-04 08:51:10 -08:00
Mouse Reeve
6caf45ac4f fixes error catching 2021-03-04 08:45:03 -08:00
Mouse Reeve
9842e63cb4 Ignore group not found error creating user 2021-03-04 08:35:13 -08:00
Mouse Reeve
54687b7b35 Make users editors by default 2021-02-28 13:45:49 -08:00
Mouse Reeve
5bc4456d4e Merge branch 'main' into review-rate 2021-02-28 10:35:20 -08:00
Mouse Reeve
04ed5d62dd
Merge pull request #649 from mmai/feature/importLibrarything
librarything import
2021-02-27 12:17:41 -08:00
Mouse Reeve
7622bef35d Adds separate privacy policy section 2021-02-27 11:53:36 -08:00
Mouse Reeve
ffd57dfef4 Use modern string formatting syntax in status model 2021-02-25 10:34:28 -08:00
Mouse Reeve
ed7c13531f Merge branch 'main' into review-rate 2021-02-25 10:17:52 -08:00
Mouse Reeve
0ecfff0f16
Merge pull request #625 from mouse-reeve/inbox-refactor
Inbox refactor
2021-02-24 13:34:59 -08:00
Mouse Reeve
bb7c41ee5f Tweaks where serialize is called 2021-02-24 13:13:29 -08:00
Henri Bourcereau
b85fed3595 librarything import 2021-02-24 20:20:14 +01:00
Mouse Reeve
cad19ee878 Merge branch 'main' into inbox-refactor 2021-02-24 09:51:34 -08:00
Mouse Reeve
9465455af2 Catch ssl errors in broadcast 2021-02-24 08:27:16 -08:00
Mouse Reeve
4d0e52bf51 Test tag and list add 2021-02-23 17:18:25 -08:00
Mouse Reeve
6e6bcb2f48 gotta simplify the add activity 2021-02-23 15:51:02 -08:00
Mouse Reeve
e042805f38
Merge pull request #632 from mouse-reeve/remote-server-set
Safer set remote server
2021-02-23 15:13:32 -08:00
Mouse Reeve
baed291889 Don't broadcast after saving remote server 2021-02-23 14:45:39 -08:00
Mouse Reeve
fdbd3688f4
Merge pull request #636 from mouse-reeve/follow-block-button
Cleans up display of follow/block/unfollow/unblock buttons
2021-02-23 13:38:02 -08:00
Mouse Reeve
364b053d9a Better user block privacy 2021-02-23 12:41:37 -08:00
Mouse Reeve
6e09d485c4 Outbox sensitive to user agent strings 2021-02-23 11:34:15 -08:00
Mouse Reeve
cbccdea468 fixes ordered collection serializations 2021-02-23 11:13:20 -08:00
Mouse Reeve
ef9acaf878 Adds tests for setting remote server 2021-02-22 11:38:11 -08:00
Mouse Reeve
6b74f56381 Safer set remote server 2021-02-22 10:01:19 -08:00
Mouse Reeve
bff75cedf5 Boolean error in user save causing infinite recursion 2021-02-22 09:41:52 -08:00
Mouse Reeve
f654444aab Fixes bug in saving remote server 2021-02-22 08:53:01 -08:00
Mouse Reeve
dbe9431d5a Fixes pure serializer 2021-02-20 11:24:41 -08:00
Mouse Reeve
fb98ef4b38 Remove redundant activitypub dataclass 2021-02-19 11:16:01 -08:00
Mouse Reeve
42ca32a985 Merge branch 'main' into review-rate 2021-02-18 13:12:04 -08:00
Mouse Reeve
e707374888 Don't broadcast from inbox tests 2021-02-17 14:37:20 -08:00
Mouse Reeve
3f02b5f6f2 Fixes view tests 2021-02-17 13:34:36 -08:00
Mouse Reeve
e8e4ed773c Fixes deletion for boosts 2021-02-17 13:07:19 -08:00
Mouse Reeve
7b21a0a208 Fix things, unfix things, refix things, break things, fix things 2021-02-17 12:23:55 -08:00
Mouse Reeve
08dc5b4d86 Fixes unfollow 2021-02-17 11:45:21 -08:00
Mouse Reeve
d022fef625 broadcast accepts correctly 2021-02-17 11:28:54 -08:00
Mouse Reeve
92e40e1cec Pass model instances into activities instead of json 2021-02-17 10:36:05 -08:00
Mouse Reeve
a9ca3a4290 Fixes calls to to_model, init with activitypub partially serialized 2021-02-16 20:17:38 -08:00
Mouse Reeve
3f61675a0a Updates usage of resolve_remote_id 2021-02-16 19:35:43 -08:00
Mouse Reeve
d81bfb6573 Fixes unfollow 2021-02-16 16:35:28 -08:00
Mouse Reeve
b57a86d4e2 Fixes approving follow requests automatically 2021-02-16 12:58:29 -08:00
Mouse Reeve
f5a022184f Fixes discarding boosts 2021-02-16 12:31:27 -08:00
Mouse Reeve
3f1b62eb98 Fixes Add activity
still janky
2021-02-16 11:04:13 -08:00
Mouse Reeve
b393df8cab Fixes deletion 2021-02-16 09:35:00 -08:00
Mouse Reeve
08c1553e71 Fixes Favs 2021-02-15 21:41:08 -08:00
Mouse Reeve
606d89d3bd Fixes boost, recursive to_model calls 2021-02-15 21:20:00 -08:00
Mouse Reeve
a16b81a6eb Adds actions for all verbs 2021-02-15 20:49:23 -08:00
Mouse Reeve
f974b9b895 Better blocking checks 2021-02-15 12:51:34 -08:00
Mouse Reeve
8cf7da4b19 Merge branch 'main' into user-creation 2021-02-15 12:26:15 -08:00
Mouse Reeve
65f81bd5f0 Moves blocking to save function
I just like these better than signals??
2021-02-15 12:21:48 -08:00
Ilona Brand
73c30e8c9a Add user default privacy setting to the privacy_select and user preferences 2021-02-13 19:42:25 -06:00
Mouse Reeve
06feef44ad Merge branch 'main' into review-rate 2021-02-12 18:33:05 -08:00
Mouse Reeve
4a58cd42a6 More thorough check to prevent following blocked users 2021-02-12 18:14:51 -08:00
Mouse Reeve
5f7466e92d Fixes bugs in how lists/shelves federate Adds 2021-02-10 19:17:16 -08:00
Mouse Reeve
b774e946f3 fixes avoiding mention and reply notification 2021-02-10 16:28:50 -08:00
Mouse Reeve
e0cfb009e4 Deduplicate notifications in notification model 2021-02-10 16:21:29 -08:00
Mouse Reeve
d9e65aa363 Notifications for follow requests 2021-02-10 16:06:50 -08:00
Mouse Reeve
ac57db5375 Boost notifications 2021-02-10 16:00:02 -08:00
Mouse Reeve
6f748a6a24 Fixes status notifications 2021-02-10 15:18:20 -08:00
Mouse Reeve
74d39c3e24 Move fav notifications to model 2021-02-10 14:31:39 -08:00
Mouse Reeve
106d442a0b Moves import complete notification to model 2021-02-10 14:18:55 -08:00
Mouse Reeve
13d8ccb016 Moves status notifications into model 2021-02-10 14:13:36 -08:00
Mouse Reeve
8842db3c1b Create notification when adding or suggesting a book to a list 2021-02-10 13:46:56 -08:00
Mouse Reeve
2bf4b17113 Adds notification type referencing lists 2021-02-10 13:15:12 -08:00
Mouse Reeve
930d9429ef User save() override instead of signal to set user fields
this gets gnarly because of transaction.atomic, so it bears further
testing
2021-02-10 12:43:53 -08:00
Mouse Reeve
759a384852
Merge pull request #592 from mouse-reeve/local-paths
Fixes local paths with remote users
2021-02-10 11:38:54 -08:00
Mouse Reeve
7c5b9f563f Fixes double slash in path 2021-02-10 11:11:55 -08:00
Mouse Reeve
486b660351
Merge pull request #594 from mouse-reeve/broadcast-fixes
Refactors broadcasting
2021-02-10 08:52:15 -08:00
Mouse Reeve
9c3bec23b8 More mocks in tests 2021-02-09 17:26:27 -08:00
Mouse Reeve
25e8b3ddeb Send activitypub pure mode activities when possible 2021-02-09 12:23:59 -08:00
Mouse Reeve
8fb08e09fd Filter pending books from list display 2021-02-09 11:40:35 -08:00
Mouse Reeve
e998ac28da Fixes broadcasting created status that needs second save 2021-02-09 11:13:02 -08:00
Mouse Reeve
4ad51e62c6 Use recipients model attribute in broadcast 2021-02-09 10:26:04 -08:00
Mouse Reeve
2fcfebd4e5 fixes broadcasting for incoming activities 2021-02-07 16:23:20 -08:00
Mouse Reeve
ad7a045582 Makes shelbook user required 2021-02-07 11:29:13 -08:00
Mouse Reeve
ee2b656b08 fixes change password view 2021-02-06 22:37:40 -08:00
Mouse Reeve
272685f27d sketchy fix for boost broadcasting 2021-02-06 21:30:43 -08:00
Mouse Reeve
63fe9777e2 Fixes shelf model tests 2021-02-06 21:02:58 -08:00
Mouse Reeve
b02a2c1aa4 broadcasting for follow, accept, and reject 2021-02-06 19:18:02 -08:00
Mouse Reeve
ffd0759f6f Fixes field and lists tests 2021-02-06 16:13:59 -08:00
Mouse Reeve
3b17c0ed44 Fixes broadcast recipients with software constraint 2021-02-06 12:41:35 -08:00
Mouse Reeve
ff721896c0 Fixes call to mention_users 2021-02-06 12:06:45 -08:00
Mouse Reeve
c7c975d695 Use save method override instead of a signal
and gets the new test file working
2021-02-06 12:00:47 -08:00
Mouse Reeve
2ef777f87e Use activity type mixin 2021-02-04 14:36:57 -08:00
Mouse Reeve
7381536ad6 circular import issues and added_by migration 2021-02-04 14:27:26 -08:00
Mouse Reeve
5a3a6151a6 separate mixins for AP types 2021-02-04 13:22:27 -08:00
Mouse Reeve
42d80ce238 Remove explicit broadcast calls 2021-02-04 13:21:55 -08:00
Mouse Reeve
44996917c7 Activitypub model code in more files 2021-02-04 12:36:39 -08:00
Mouse Reeve
feb8190d8f Created mixin for ordered collection items 2021-02-04 12:25:07 -08:00
Mouse Reeve
12e0e6a1f0 Broadcast implicitly from model save 2021-02-04 11:44:31 -08:00
Mouse Reeve
d633826a20 full path in user-based remote id 2021-02-04 10:48:56 -08:00
Mouse Reeve
dfb5c396b0 Moves activitypub mixin to its own file 2021-02-04 10:47:18 -08:00
Mouse Reeve
582ebc0fe3 Fixes local paths with remote users
Fixes #590
2021-02-04 10:31:08 -08:00
Mouse Reeve
bbc05578fb Fixes tests 2021-02-02 14:59:40 -08:00
Mouse Reeve
f42a5444e5 User ordered collection subtype for shelves 2021-02-02 11:17:31 -08:00
Mouse Reeve
e61d8b7638 Serialize lists as custom activitypub object 2021-02-02 11:13:15 -08:00
Mouse Reeve
e53b4e57fa Federating lists and shelves 2021-02-02 09:37:46 -08:00
Mouse Reeve
d7c32cc314 Paginates lists view 2021-01-31 17:34:06 -08:00
Mouse Reeve
5939a72c81 More list models tests 2021-01-31 13:31:49 -08:00
Mouse Reeve
d73a1b4ec1 handles list privacy in display 2021-01-31 08:41:11 -08:00
Mouse Reeve
69c2b192a4 Adds list creation form 2021-01-31 08:08:52 -08:00
Mouse Reeve
fe088f21fb Model and migration for lists 2021-01-30 21:00:36 -08:00
Mouse Reeve
d994d8d3c8 Moves blocking side effects to model 2021-01-24 17:07:19 -08:00
Mouse Reeve
cc8888dea2 Adds incoming handler for blocking 2021-01-23 11:03:10 -08:00
Joel Bradshaw
85edee42ef Merge branch 'main' into progress_update 2021-01-19 23:49:35 -08:00
Joel Bradshaw
070fa04b63 Add validators and more tests
I don't think these validators will do anything unless we use them or
are submitting a form, but they're there nonetheless
2021-01-19 23:40:11 -08:00
Joel Bradshaw
32346cf9a3 Cascade-delete progress updates
Add a warning about it, and update test to confirm it works
2021-01-19 22:36:44 -08:00
Mouse Reeve
6efe4d54f0 Sets minimum goal 2021-01-19 07:30:35 -08:00
Joel Bradshaw
29140be78e Merge branch 'main' into progress_update 2021-01-18 19:41:06 -08:00
Mouse Reeve
69b38bfe91 Show latest read books first in goals page 2021-01-18 12:22:36 -08:00
Mouse Reeve
8a00c7741a Nullable email 2021-01-18 11:51:51 -08:00
Mouse Reeve
11dd8c8f82 Allow users to log in with email or username 2021-01-18 11:06:28 -08:00
Joel Bradshaw
a4519d55c9 Merge branch 'main' into progress_update 2021-01-17 13:05:38 -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
Joel Bradshaw
ddb5848d32 Move error down into to_ordered_queryset 2021-01-16 23:31:47 -08:00
Mouse Reeve
112b9f9332 Create goal with privacy 2021-01-16 11:34:19 -08:00
Mouse Reeve
b648012af5 Adds form and models for reading goal 2021-01-16 08:18:54 -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
48147883ce Merge branch 'main' into progress_update 2021-01-13 19:53:26 -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
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
6eb7872598 Fixes queryset for shelf page json 2021-01-10 07:54:58 -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
c8d53ee0df Adds site invite created date 2021-01-05 11:38:03 -08:00
Mouse Reeve
a73f51ad78 Merge branch 'main' into review-rate 2021-01-04 13:42:39 -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
3fe7b95786 Fixes setting remote user username on update 2021-01-04 10:42:31 -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
d828b0ead9 Remove books manager at long last 2021-01-02 08:14:28 -08:00
Mouse Reeve
385ec4d70a Adds ReviewRating model
I can't just calling Rating because that would clash with the rating
field
2021-01-01 11:51:52 -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
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
a444c5f6fc Fixes model deduplication from data 2020-12-31 12:22:00 -08:00
Mouse Reeve
69af2f4cd3 Fixes untag 2020-12-31 08:42:09 -08:00
Mouse Reeve
29ee027f6d Tests tag page and orders tag collection json 2020-12-31 08:05:24 -08:00
Mouse Reeve
7bcf0a1d53 Fixes missing code for editions list json 2020-12-31 07:46:35 -08:00
Mouse Reeve
dc68fdd53e User generated local paths 2020-12-30 17:36:35 -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
babc604397 Fixes outbox privacy 2020-12-30 12:41:19 -08:00
Mouse Reeve
74a25f205b Validator for username field 2020-12-28 14:14:22 -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
e89bfdc572 Makes registration user/localname fields more sensible 2020-12-24 11:39:57 -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
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
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
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
60738011a2 user's name and bio field are optional
get it together, mouse
2020-12-20 12:09:19 -08:00
Mouse Reeve
a6efd51bb2 Only parse mardown on outgoing activities 2020-12-20 11:38:13 -08:00
Mouse Reeve
ef696782ab Allow markdown in html fields 2020-12-19 18:54:56 -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
6149f36c7f Fixes bug in alt text breaing serializing work 2020-12-17 13:55:31 -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
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
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
a3c7d324d6 Sanitize incoming html 2020-12-16 16:47:23 -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
5dbacb3524 Merge branch 'main' into switch-edition 2020-12-16 09:22:04 -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
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
b36eaef172 Merge branch 'main' into switch-edition 2020-12-13 21:10:37 -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
ae435a3165 Removes sqlite support 😢
RIP, things have gotten too complicated for this I think
2020-12-12 20:11:23 -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
ae07bbffb7 Merge branch 'main' into logo-default 2020-12-12 16:03:23 -08:00
Mouse Reeve
49979fabef More user serialization tests 2020-12-12 15:00:20 -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
801b6c3a77 Merge branch 'main' into follow-remote-ids 2020-12-12 09:34:54 -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
117d243577 Expand site settings and add footer 2020-12-11 12:31:02 -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
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
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
8a900689d3 Generalizes link format in many to many field 2020-12-04 17:57:14 -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
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
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
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
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
205fa0d465 set user's remote server in a celery task 2020-11-29 10:08:19 -08:00
Mouse Reeve
34e8fb3e5c style fix and removing stray print statement 2020-11-28 18:28:09 -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
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
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
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
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
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
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
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
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
847014720e Refactors bookwyrm connector to use activitypub serializer 2020-11-24 16:05:00 -08:00
Mouse Reeve
3dc0fc7e8f Merge branch 'main' into edit-books-erros 2020-11-24 13:40:53 -08:00
Mouse Reeve
9bbedc5d9a Fixes field causing form invalidation when editing books 2020-11-24 13:25:58 -08:00
Mouse Reeve
ff5a0f7bc2 Adds alt text to status images 2020-11-24 11:44:13 -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
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
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
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
28e1c9525c tweaks search rankings for better results 2020-11-13 11:03:39 -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
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