Commit graph

624 commits

Author SHA1 Message Date
Mouse Reeve
2867d703cc Fixes python formatting 2021-04-30 07:57:38 -07:00
Mouse Reeve
454dd25681 Only make notification count red for mentions 2021-04-30 07:49:34 -07:00
Mouse Reeve
a31d05c694 Don't crash on books with no isbn 2021-04-29 11:31:01 -07:00
Mouse Reeve
d1b5f3b6f0 Fixes ranks and normalizes isbns 2021-04-29 11:06:05 -07:00
Mouse Reeve
7853610a20 Load descriptions correctly 2021-04-29 10:54:36 -07:00
Mouse Reeve
b1c38d291c Set preferred language 2021-04-29 10:40:49 -07:00
Mouse Reeve
6551c59c45 Don't store default edition in the dataase 2021-04-28 16:05:17 -07:00
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