Commit graph

745 commits

Author SHA1 Message Date
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 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
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
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
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 d8b2afff3d Replace naive datetimes with aware ones 2020-11-27 16:35:03 -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
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 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