Commit graph

489 commits

Author SHA1 Message Date
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
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