Commit graph

781 commits

Author SHA1 Message Date
Hugh Rundle
5fccb991a7 remove list from group when changing curation
Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
2021-09-26 18:28:16 +10:00
Hugh Rundle
686198472d update group and list models
- remove GroupList model
- add a group foreign key value  to List model
- remove reference to lists in Group model
2021-09-26 15:50:15 +10:00
Hugh Rundle
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
b74cd37096 add models for groups 2021-09-24 07:49:54 +10:00
Mouse Reeve
c54609d7fd Refactors how readthroughs get updated 2021-09-22 16:08:25 -07:00
Mouse Reeve
8648bdc879 Merge branch 'main' into refactor-readthroughs 2021-09-22 15:08:58 -07:00
Mouse Reeve
2160a5c729 Newly created readthroughs are active by default 2021-09-22 13:00:38 -07:00
Mouse Reeve
a05ef1a222 Adds active field to readthrough model 2021-09-22 11:23:56 -07:00
Mouse Reeve
50ca3eef31 Encompass all status models in notification signal 2021-09-22 11:10:37 -07:00
Mouse Reeve
b1ff46a562 Remove unused import 2021-09-22 10:42:42 -07:00
Mouse Reeve
a4ac25bfae Move notifications to signals 2021-09-22 09:24:39 -07:00
Mouse Reeve
2419942770 Create model function to update user last active date 2021-09-22 08:35:20 -07:00
Mouse Reeve
673f49bf21 Tests fixes 2021-09-20 18:01:12 -07:00
Mouse Reeve
1be33c97a2 Fixes string formatting in site model 2021-09-20 17:19:26 -07:00
Mouse Reeve
ea303fb285 Updating string format synatx part 3 2021-09-20 16:45:26 -07:00
Mouse Reeve
cf3157a3b5 Merge branch 'main' into pylint-update 2021-09-20 16:31:27 -07:00
Mouse Reeve
6f0b1d10bb Fixes line length 2021-09-18 16:00:21 -07:00
Mouse Reeve
38c66b208c Adds customizable invite request copy 2021-09-18 15:45:04 -07:00
Mouse Reeve
08f6a97653 Python formatting 2021-09-18 11:33:43 -07:00
Mouse Reeve
acfb1bb376 Updating string format synatx part 2 2021-09-18 11:32:00 -07:00
Mouse Reeve
be86fbcf4d Merge branch 'main' into pylint-update 2021-09-18 07:46:12 -07:00
Mouse Reeve
377a4e1ef1 Updating string format syntax part 1 2021-09-17 21:39:18 -07:00
Mouse Reeve
2a2dddf5f4 Adds IP blocklist model 2021-09-17 11:58:59 -07:00
Mouse Reeve
1f06d1a1d8 Removes local connector 2021-09-14 15:26:36 -07:00
Mouse Reeve
717dc91d49 Merge branch 'main' into admin-tests 2021-09-11 17:43:45 -07:00
Mouse Reeve
d972ad2541 Merge branch 'main' into csv-import-failures 2021-09-11 14:42:59 -07:00
Mouse Reeve
992e478e95 Use readable/translatable strings for db choices 2021-09-11 14:23:47 -07:00
Mouse Reeve
3e7847e645 Set deactivation date 2021-09-11 09:00:52 -07:00
Mouse Reeve
430554444f Adds deactivation date to user model
Also fixes django admin around saved lists
2021-09-11 08:57:38 -07:00
Mouse Reeve
b36f7d7b69 Merge branch 'main' into csv-import-failures 2021-09-11 07:19:40 -07:00
Mouse Reeve
def4d89bf8 Adds short description to edit site form 2021-09-10 12:13:24 -07:00
Mouse Reeve
9413dacaf2 Updates instance info endpoint 2021-09-10 11:44:51 -07:00
Mouse Reeve
de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve
658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve
8717d8a675 Create new email domain block entries 2021-09-08 15:31:01 -07:00
Mouse Reeve
c705178c3b Adds create block form 2021-09-08 15:08:22 -07:00
Mouse Reeve
7a684a2f96 Adds model 2021-09-08 14:39:38 -07:00
Mouse Reeve
d9090e723d
Merge pull request #1384 from bookwyrm-social/generate-image-transaction
Generate image task failing when transaction hasn't completed
2021-09-08 12:17:58 -07:00
Mouse Reeve
88a65b0b88 Only re-rank on bookwyrm instances 2021-09-08 11:47:36 -07:00
Mouse Reeve
d3b3dd6d99 Update suggestions on domain block 2021-09-08 11:38:22 -07:00
Mouse Reeve
b826d29b0d Generate image task failing when transaction hasn't completed 2021-09-08 10:20:44 -07:00
Mouse Reeve
a5ef8aa6e9 Adds flag on user model to hide suggested users 2021-09-08 09:30:13 -07:00
Mouse Reeve
e0f5f13a5a Fixes guessing read dates from goodreads csv 2021-09-07 18:09:43 -07:00
Mouse Reeve
aa91361fe4 Fixes celery kwarg for queue 2021-09-07 17:09:44 -07:00
Mouse Reeve
de3f18655c Set priorities on tasks 2021-09-07 16:33:43 -07:00
Mouse Reeve
8a748fa675 Adds format fields to edit book view 2021-09-07 12:49:28 -07:00
Mouse Reeve
5a224b5aa4 Use atomic when creating new users 2021-09-07 10:09:28 -07:00
Mouse Reeve
22caf34d86 Merge branch 'main' into book-format-choices 2021-09-06 22:13:24 -07:00
Mouse Reeve
cb21099e0b Fixes serialization of delete activity 2021-09-06 12:00:10 -07:00
Mouse Reeve
ae81d6cf71 More tests 2021-09-06 11:55:04 -07:00
Mouse Reeve
5640ae4f7e Handle deletions of ordered collections 2021-09-06 11:24:08 -07:00
Mouse Reeve
b80de929fd Create and view quotation page numbers 2021-09-05 16:00:40 -07:00
Mouse Reeve
57ef1522b5 Merge branch 'main' into readthrough-dates 2021-08-29 11:18:35 -07:00
Mouse Reeve
082c2708a7 Fixes attribution field logic 2021-08-29 08:50:46 -07:00
Mouse Reeve
8c8b1168d4 Support attribution field on boosts 2021-08-29 08:22:14 -07:00
Mouse Reeve
0569bce610 Cleaner string formatting in user model 2021-08-29 07:37:21 -07:00
Mouse Reeve
9eea60b35c Fixes call to followers url in serialization 2021-08-29 07:36:59 -07:00
Mouse Reeve
a5dcc0e5e4 Support multiple possible fields that indicate user ownership 2021-08-28 12:11:15 -07:00
Mouse Reeve
9c4fd1e602 Set user default values 2021-08-28 12:06:03 -07:00
Mouse Reeve
2c26b04119 Uses correct object to determine author 2021-08-28 11:30:54 -07:00
Mouse Reeve
dc72df7339 Generate likely followers url for existing users 2021-08-28 11:15:17 -07:00
Mouse Reeve
53d9ff87d9 Look up followers url to determine post privacy 2021-08-28 10:40:52 -07:00
Mouse Reeve
e9d951e4cd Add user model field for followers url 2021-08-28 10:33:57 -07:00
Mouse Reeve
01d82cfa3a Merge branch 'main' into readthrough-dates 2021-08-27 10:25:41 -07:00
Mouse Reeve
eca0ff371c Adds saved lists many to many field 2021-08-23 11:19:15 -07:00
Mouse Reeve
0829696add
Merge pull request #1138 from joachimesque/images-django-imagekit
Generate thumnails for books
2021-08-18 19:53:12 -06:00
Mouse Reeve
c2763f0c18
Merge pull request #1304 from bookwyrm-social/prevent-import-overwrite
Prevent overwriting data on import form outside data source
2021-08-17 12:13:12 -06:00
Mouse Reeve
ad0fff7030 Prevent overwriting data on import form outside data source 2021-08-17 10:08:07 -07:00
Mouse Reeve
2d20fa4146 Adds reading status field to book statuses 2021-08-16 13:32:12 -07:00
Mouse Reeve
1e1bf83201 Create abstract parent class for book statuses 2021-08-16 13:14:29 -07:00
Mouse Reeve
45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -06:00
Mouse Reeve
1be125fc1d Adds database constraint for readthrough dates 2021-08-11 11:19:06 -07:00
Mouse Reeve
1b4db49035 Fixing bug preventing csv imports to match via title/author 2021-08-10 14:30:28 -07:00
Mouse Reeve
ef1896da18 Return confidence rating 2021-08-10 14:02:22 -07:00
Mouse Reeve
fa396d4bc8 Save best-guess search results on import 2021-08-10 13:54:52 -07:00
Mouse Reeve
6301656a0e Fixes setting book results from title/author search 2021-08-10 13:46:20 -07:00
Mouse Reeve
65e982e35b Uses more general requests exception 2021-08-08 18:13:02 -07:00
Mouse Reeve
5926224d7e Confirm email views 2021-08-06 16:26:46 -07:00
Mouse Reeve
247a7f7489 Email confirmation email 2021-08-06 15:38:37 -07:00
Mouse Reeve
3e2f1806e9 Adds email confirmation code field 2021-08-06 14:42:18 -07:00
Joachim
6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve
2e7dd9d4ef Fixes over-reporting user last active date 2021-08-05 19:52:15 -07:00
Mouse Reeve
fd0f9324d3 Merge branch 'main' into book-format-choices 2021-08-04 14:13:55 -07:00
Mouse Reeve
9bbdde1597 Python formatting 2021-08-04 10:58:23 -07:00
Mouse Reeve
63c8301eb9 Merge branch '253-user-post-privacy-v2' of https://github.com/ibrand/bookwyrm into ibrand-253-user-post-privacy-v2 2021-08-04 10:44:30 -07:00
Mouse Reeve
97b643ac72
Merge pull request #1243 from bookwyrm-social/fixes-set-remote-server
Fixes remote server not getting set
2021-08-04 11:35:49 -06:00
Joachim
c1673ef717 Update fields.py 2021-08-04 19:25:19 +02:00
Joachim
0db3512eb3 Revert previous commit 2021-08-04 19:21:56 +02:00
Joachim
ee39e8c036 Fix R0201: Method could be a function (no-self-use) 2021-08-04 19:16:24 +02:00
Joachim
c6f8236b07 Fix tests 2021-08-04 19:11:57 +02:00
Joachim
bc7710a4a7 Update Status Model Test 2021-08-04 18:18:18 +02:00
Mouse Reeve
89acfa4f3e Patches stray redis calls 2021-08-04 08:50:50 -07:00
Joachim
60e805ac2b Fix tests 2021-08-04 17:39:46 +02:00
Joachim
7a716db48a lint 2021-08-04 16:56:07 +02:00
Joachim
b8b491bbf2 Add get_absolute_url to ImageField 2021-08-04 16:55:12 +02:00
Joachim
843127efa8 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-08-04 10:00:20 +02:00
Mouse Reeve
ebc0680288 Fixes logic error in detecting changed fields when serializing 2021-08-03 12:21:11 -07:00
Mouse Reeve
cfbe1b29cd Pass update fields when ticking last active date 2021-08-03 09:12:22 -07:00
Mouse Reeve
a84a744e8d Track changed fields in activity to model code 2021-08-03 08:48:15 -07:00
Mouse Reeve
ee7bdc956a Streamline saves on user create 2021-08-03 07:43:03 -07:00
Mouse Reeve
851410006a Fixes remote server not getting set
Omg this took so long for me to figure out
2021-08-03 07:00:31 -07:00
Mouse Reeve
9093170660 Correct test structure 2021-08-02 20:16:17 -07:00
Mouse Reeve
39b2f37947 One (hopefully) last fix 2021-08-02 20:07:46 -07:00
Mouse Reeve
815dbc81e3 Remove static tempaletag from image_serializer 2021-08-02 19:50:33 -07:00
Mouse Reeve
68f9b67fd9 Updates test 2021-08-02 19:30:42 -07:00
Mouse Reeve
9e6f78c0f5 Fixes linting issue 2021-08-02 19:01:16 -07:00
Mouse Reeve
8ef1d0d3ac Fixes image federation 2021-08-02 18:55:08 -07:00
Mouse Reeve
af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Joel Bradshaw
a16d759766 Add shelved_date field and populate it on import 2021-07-13 21:04:11 -07:00
Mouse Reeve
88c23117ff Fixes outbox pagination 2021-07-07 10:56:19 -07:00
Mouse Reeve
7c15fbbb0b More efficient search index
Co-authored-by: asmr-hex <0.0@asmr.software>
2021-06-23 16:54:59 -07:00
Mouse Reeve
4a5e4e8ca2 Safer cover image naming 2021-06-20 09:38:01 -07:00
Joachim
0c83882a11 Fix lint 2021-06-19 19:44:14 +02:00
Joachim
e251b687dc Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-19 19:32:56 +02:00
Mouse Reeve
15555e61d0 Merge branch 'main' into book-format-choices 2021-06-19 07:43:34 -07:00
Mouse Reeve
60626eaca1 Catches straggler preview_image signal 2021-06-18 15:28:43 -07:00
Mouse Reeve
59938e2d46 Linter fixes for models 2021-06-18 15:24:10 -07:00
Mouse Reeve
a20c4d583c Merge branch 'main' into pylint 2021-06-18 14:48:31 -07:00
Mouse Reeve
9e5c7053e9 More pylint fixes 2021-06-18 14:29:24 -07:00
Mouse Reeve
4479864008 Updates code for linter 2021-06-18 14:12:56 -07:00
Mouse Reeve
20f74ba02b More disables 2021-06-18 13:23:06 -07:00
Mouse Reeve
973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Mouse Reeve
27a3d0ae96
Merge branch 'main' into 253-user-post-privacy-v2 2021-06-14 16:47:57 -07:00
Mouse Reeve
cd014e43ad Python formatting 2021-06-14 15:29:07 -07:00
Mouse Reeve
290a99bf17 Fixes renaming images on save 2021-06-14 15:19:54 -07:00
Mouse Reeve
46be7292fd Don't try title/author search when isbn search fails 2021-06-14 12:30:43 -07:00
Joachim
4359505124 Update book.py 2021-06-07 19:54:16 +02:00
Joachim
2731ea9aa9 Add env var to enable/disable thumbnail generation 2021-06-07 19:52:25 +02:00
Joachim
7ed2ed116a lint 2021-06-06 21:13:16 +02:00
Joachim
1f2c296cfd This should now work 2021-06-06 21:12:21 +02:00
Mouse Reeve
ff45238667
Merge pull request #1123 from eatsleepdeploy/add-max-upload-size-config
Add max upload size config
2021-06-01 14:09:50 -07:00
Joachim
d9d34d8220 Fix linting 2021-05-27 21:40:23 +02:00
Joachim
b8bff8a882 Use field tracker to launch task on field change 2021-05-27 21:09:57 +02:00
Joachim
eb56cced8d Lint 2021-05-26 14:46:34 +02:00
Joachim
bf503d370c Add user preview task 2021-05-26 12:54:57 +02:00
Joachim
34caa36ab7 Add site preview task 2021-05-26 10:19:39 +02:00
Joachim
101ca0ff81 Refactor some 2021-05-26 09:44:32 +02:00
Joachim
a83aa47c9a Generate on new rating 2021-05-26 09:10:05 +02:00
Joachim
8c25272462 Fix last night's bugs 2021-05-26 09:09:13 +02:00
Joachim
fa7334826c Update 2021-05-25 23:04:28 +02:00
Joachim
d1737b44bd First functioning commit
TODO

- [ ] Delay task (Celery?)
- [ ] Store the image in a subfolder unique to the edition, to make cleaning up the image easy
- [ ] Clean up the image before replacing it
- [ ] Ensure that the image will be cleaned when the edition is deleted ??
- [ ] Use instance custom colors?
- [ ] Use book cover color base?
2021-05-25 00:41:53 +02:00
Jason Kelly
b362b72c57 Python linting 2021-05-24 09:35:21 +08:00
Jason Kelly
6e655cb0e0 Added new widget to alert if a file is set at larger than 10 MB.
- Updated default widget to use template that adds a notification box.
- Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits.
2021-05-23 14:12:00 +08:00
Mouse Reeve
368d2cd716 Reduces feed page queries for goals
9 fewer queries
2021-05-22 17:34:16 -07:00
Mouse Reeve
6b3447761f Adds book format field with choices 2021-05-20 18:16:35 -07:00
Mouse Reeve
cefc5994a6 Makes extra content optional 2021-05-20 12:40:03 -07:00
Mouse Reeve
346d718265 Don't need both name and preview 2021-05-19 15:18:43 -07:00
Mouse Reeve
d1f2d9812f Adds model for instance admin announcements 2021-05-19 14:00:46 -07:00
Mouse Reeve
82117a7d28 Tests deactivating connectors 2021-05-18 12:29:01 -07:00
Mouse Reeve
19f788b9aa Deactivate connectors related to blocked federated servers 2021-05-11 11:31:02 -07:00
Mouse Reeve
e7c5b77b4c Removes unused connector fields and adds active boolean 2021-05-11 09:54:04 -07:00
Mouse Reeve
27fe09a32b
Merge pull request #1062 from alisww/storygraph-import
add storygraph import
2021-05-10 16:23:00 -07:00
Mouse Reeve
e34ae18e98 Don't show following years' books in a year's goal 2021-05-10 14:40:41 -07:00
Allie Signet
85a8210f5e fix rating property on ImportItem 2021-05-10 18:11:28 -03:00
Mouse Reeve
735ef369b9
Merge pull request #1020 from bookwyrm-social/notification-color
Only make notification count red for mentions
2021-04-30 13:49:57 -07:00
Mouse Reeve
c373a0b818 Highlight report notifications 2021-04-30 13:38:03 -07:00
Mouse Reeve
e15d6654e3 Free text field for the site footer 2021-04-30 10:42:27 -07:00
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