Commit graph

4724 commits

Author SHA1 Message Date
Hugh Rundle
c704c7eb8f
remove from any shelf in all books shelf view
- fixes removing book from 'all books' shelf erroring
- remove from any shelf item is on when in 'all books'
2021-11-25 07:38:08 +11:00
Joachim
7d24568dcd Update test_updates.py 2021-11-24 20:54:53 +01:00
Joachim
5f81be74cb Add test 2021-11-24 20:52:30 +01:00
Joachim
0001d6e92a PyLint 2021-11-24 19:04:14 +01:00
Joachim
8712b2fdab ESLint 2021-11-24 19:02:07 +01:00
Joachim
db5e7a886a Handle count of notifications banner 2021-11-24 19:00:30 +01:00
Joachim
2ad37a22dd Move stream filter to helpers 2021-11-24 13:37:09 +01:00
Joachim
40e4591a24 Apply review suggestions 2021-11-24 11:59:45 +01:00
Mouse Reeve
ad6c860951
Merge pull request #1627 from joachimesque/fix-preview-image-url
Don't change the preview image URL on update
2021-11-23 15:01:15 -08:00
Joachim
63e284dc41 Forgive me pylint 2021-11-22 18:59:46 +01:00
Joachim
47cfc2f157 Hardcode form 2021-11-22 18:52:57 +01:00
Hugh Rundle
d8e83ffe82
moar code linting 2021-11-22 13:01:58 +11:00
Hugh Rundle
a9d921cc06
code cleanup 2021-11-22 12:52:59 +11:00
Hugh Rundle
09c5a3861b
prefer English language sources for ISNI titles 2021-11-22 12:15:06 +11:00
Joachim
0b46db49a3 Fix pylint 2021-11-22 00:46:24 +01:00
Joachim
bc7de410b7 Add migration 2021-11-22 00:33:08 +01:00
Joachim
a0093a8a2e Add status type filters 2021-11-22 00:25:47 +01:00
Chad Nelson
6be9ac4f70 Abstract JS for multivalue form fields 2021-11-21 17:32:48 -05:00
Hugh Rundle
fd3ed7fb8c
fix author is now class object not dict 2021-11-22 09:25:31 +11:00
Hugh Rundle
8691023fa9
display link to isni in author page when other identifiers missing 2021-11-22 09:24:05 +11:00
Hugh Rundle
a218fa21ea Merge branch 'main' into isni-poc 2021-11-22 08:53:58 +11:00
Hugh Rundle
fd2ade2313
refactor isni author enrichment
- use activitypub.Author instead of custom dict
- prefer to display "Author of [title]" from ISNI data instead of short description
- merge isni and db authors for edit_book display
- fix edit_book template to use changed data
- rename some functions in utils/isni.py
2021-11-22 08:49:22 +11:00
Hugh Rundle
e2836d468d
don't use author name as deduplication field 2021-11-22 08:47:12 +11:00
Hugh Rundle
1e6e4b0f8d
use activitypub dataclass for isni authors
- add timeout to isni API call
- use activitypub.Author dataclass instead of bespoke dict
- display isni authors as "Author of" first title in ISNI record if possible
- sensible fallbacks if title info unavailable in isni record
2021-11-21 19:55:55 +11:00
Joachim
ad6aaa6bc8 Update preview_images.py 2021-11-20 17:15:58 +01:00
Joachim
f26a41bd10 Prevent empty file name 2021-11-20 17:10:29 +01:00
Joachim
d74df047c5 Clean up file before saving 2021-11-20 16:59:05 +01:00
Joachim
40264e372d Update preview_images.py 2021-11-20 16:26:02 +01:00
Joachim
37508d2583 Update preview_images.py 2021-11-20 16:23:50 +01:00
Hugh Rundle
e247e96832
remove incorrect comment 2021-11-20 19:34:37 +11:00
Hugh Rundle
a3270551f9
code cleanup 2021-11-20 19:19:51 +11:00
Hugh Rundle
b406a03533
don't persist form state in firefox
Fixes shelves not being disabled in dropdowns.
See https://stackoverflow.com/questions/5985839/bug-with-firefox-disabled-attribute-of-input-not-resetting-when-refreshing
2021-11-20 19:04:51 +11:00
Hugh Rundle
4b6f5c9f51
remove out of date comment 2021-11-20 19:03:57 +11:00
Hugh Rundle
b273123708
code style 2021-11-20 16:06:16 +11:00
Hugh Rundle
12810d8e34
don't try to update non-existent readthroughs 2021-11-20 16:03:46 +11:00
Hugh Rundle
af9768a2e3
force page reload when adding status from move button 2021-11-20 14:59:59 +11:00
Hugh Rundle
41862e854c
move from reading to editable shelf with logic that actually works 2021-11-20 13:57:37 +11:00
Hugh Rundle
c6a2de3bbc
pass readthrough id to shelf_selector
- allows user to move book from a shelf to the 'Read' shelf using the move button.
2021-11-20 10:29:17 +11:00
Hugh Rundle
373cc2c762
active_shelf should always be a reading status shelf 2021-11-20 09:58:34 +11:00
Hugh Rundle
a082121930
fix shelves not being unshelved if any shelf is read-status 2021-11-20 08:55:43 +11:00
Hugh Rundle
6951b52365
disallow moving to shelf already used 2021-11-20 08:18:43 +11:00
Hugh Rundle
9ffe4d340e
trigger reading status modals from move button
- unhide reading status shelves
- trigger modals when moving to a read status shelf
- force page refresh when using move button
2021-11-20 08:06:13 +11:00
Mouse Reeve
417f09690f Include admin and moderator in reporting email 2021-11-18 15:08:00 -08:00
Mouse Reeve
21c90ac99e Use groups not permissions 2021-11-18 14:51:00 -08:00
Mouse Reeve
3787a31c67 Updates image helpers on site 2021-11-18 14:39:22 -08:00
Mouse Reeve
41dd915d7f Email templates 2021-11-17 20:22:00 -08:00
Mouse Reeve
9961a08c93 Adds Galician locale 2021-11-17 10:02:39 -08:00
Mouse Reeve
b206aae32b Tasks tests 2021-11-17 09:47:24 -08:00
Mouse Reeve
3bf1121fa6 Signals tests 2021-11-17 09:38:02 -08:00
Mouse Reeve
157d891681 Adds tests files 2021-11-17 09:10:28 -08:00
Mouse Reeve
e3fec5885a Fixes logic on nodeinfo page 2021-11-16 16:20:29 -08:00
Mouse Reeve
4cb572f4c7 Updates management tests 2021-11-16 11:25:59 -08:00
Mouse Reeve
903aaaf4c4 Adds management and bw-dev commands 2021-11-16 10:41:08 -08:00
Mouse Reeve
6dd7eebd98 Fixes tests 2021-11-16 10:16:28 -08:00
Mouse Reeve
50ca16a46f Merge branch 'main' into inventaire-connector-tests 2021-11-16 09:59:50 -08:00
Mouse Reeve
1d28c7e73d Load lists from redis cache 2021-11-16 09:21:12 -08:00
Hugh Rundle
8658e36ca8
code formatting 2021-11-16 20:40:22 +11:00
Hugh Rundle
03c59f2431
improve security on isni url 2021-11-16 20:37:37 +11:00
Hugh Rundle
9ca18d9cd4
isni utils cleanup
Utilises the requests module's built in functionality to pass params as a dict
which is url encoded by requests.
2021-11-16 20:35:47 +11:00
Hugh Rundle
ec39346e67
check shelf.editable instead of custom filter 2021-11-16 19:26:49 +11:00
Mouse Reeve
2968145627
Merge pull request #1614 from bookwyrm-social/outbox-error
Safer call to get preview image or books
2021-11-15 13:47:00 -08:00
Mouse Reeve
f22ae23574 Safer call to get preview image or books 2021-11-15 13:34:02 -08:00
Mouse Reeve
fc520fdbdc Adds quick first pass on lists stream manager 2021-11-15 13:09:17 -08:00
Mouse Reeve
58f63280fd
Merge pull request #1612 from bookwyrm-social/lithuanian-space
Preserve spaces between links
2021-11-15 12:11:36 -08:00
Mouse Reeve
5e5cb26290 Preserve spaces between links 2021-11-15 11:47:39 -08:00
Mouse Reeve
bcfe13bb4e Sort followers/following lists by if you follow the user 2021-11-15 11:28:43 -08:00
Mouse Reeve
7d66013b52 Adds Lithuanian to the user options 2021-11-15 10:26:00 -08:00
Mouse Reeve
afbc742f47
Merge pull request #1600 from bookwyrm-social/import-field-names
Refactors import process
2021-11-15 09:59:54 -08:00
Mouse Reeve
30afe42b3a Removes extra space in progress bar 2021-11-15 09:41:05 -08:00
Mouse Reeve
83e468a4f8 Fixes "indeterminate" state of progress indicator on screen reader 2021-11-15 09:34:36 -08:00
Mouse Reeve
77ee1147d5 Adds return_first tests to book_search 2021-11-15 09:03:00 -08:00
Hugh Rundle
eab2ec0ffd
code cleanup in is_shelf_type template tag 2021-11-15 21:19:16 +11:00
Hugh Rundle
168a2488e2
refactor shelf activity on book page
- disallow moving from custom shelf to a reading status shelf with shelf_selector
- always use shelve_button for moving books from a reading status shelf
- redesign shelf information as a list of boxes
2021-11-15 20:59:22 +11:00
Mouse Reeve
8612cf654d Invalid href 2021-11-14 11:31:47 -08:00
Mouse Reeve
14e2960d06 Update legacy jobs 2021-11-14 10:58:46 -08:00
Mouse Reeve
9f6796bbf5 Safer request for normalized data 2021-11-14 10:29:12 -08:00
Mouse Reeve
31f3351854 Fixes bug comparing dates to nonetype 2021-11-14 10:22:26 -08:00
Mouse Reeve
8cede05d32 Retry hanging items 2021-11-14 10:20:14 -08:00
Mouse Reeve
f92863ad3e Notify when import completes 2021-11-14 09:56:23 -08:00
Mouse Reeve
47b98ad0d9 Track completed items on job 2021-11-14 09:04:12 -08:00
Mouse Reeve
9e673834dc Check for duplicates 2021-11-14 08:35:16 -08:00
Mouse Reeve
6cca3f9772 Updates test data 2021-11-14 07:57:13 -08:00
Mouse Reeve
2748e0a824 Check for existing reviews/ratings on import items 2021-11-14 07:50:19 -08:00
Mouse Reeve
bdc3f6828b Python formatting 2021-11-14 07:11:48 -08:00
Mouse Reeve
c614f638fd Merge branch 'import-field-names' of github.com:bookwyrm-social/bookwyrm into import-field-names 2021-11-14 07:06:48 -08:00
Hugh Rundle
3357953a53
whoops forgot inventaire_id 2021-11-14 21:26:23 +11:00
Hugh Rundle
8495cf8a45
don't delete non-form data when editing authors
fixes #1584

This is a temporary fix. As Mouse has suggested, ultimately it would be good to re-import data from one or more of the linked data sources if there is anything missing.
2021-11-14 21:21:37 +11:00
Mouse Reeve
32d0d8d027 Expand librarything csv processing tests 2021-11-13 13:04:54 -08:00
Mouse Reeve
7f06ee3844 Fixes getting isbn for librarything imports 2021-11-13 12:46:27 -08:00
Mouse Reeve
fb91c33682 Fixes isbn assignment for goodreads 2021-11-13 12:24:16 -08:00
Mouse Reeve
a9622942cd Test correctly adding goodreads isbns 2021-11-13 12:11:07 -08:00
Mouse Reeve
8b7720c8b8 Use "reject" instead of "delete" on review page 2021-11-13 11:54:28 -08:00
Mouse Reeve
712d8ecfb4 Don't show empty stars when there's no review 2021-11-13 11:52:08 -08:00
Mouse Reeve
1e46de4c9d Associate imported review with import item 2021-11-13 11:44:05 -08:00
Mouse Reeve
1e2dca402b Adds null value to breadcrumb links 2021-11-13 11:40:19 -08:00
Mouse Reeve
644d969330 Fixes importer tests 2021-11-13 11:22:07 -08:00
Mouse Reeve
4dae851da0 Adds breadcrumbs 2021-11-13 11:18:10 -08:00
Mouse Reeve
e77eea9c81 Adds tests for import manual review 2021-11-13 10:52:11 -08:00
Mouse Reeve
c3156a1de5 Fixes import path in test 2021-11-13 10:22:28 -08:00
Mouse Reeve
628f104b13 Separates out imports views tests 2021-11-13 10:16:25 -08:00
Mouse Reeve
232e051dcb Fixes import job creates in tests 2021-11-13 10:16:05 -08:00
Mouse Reeve
3bdda973bc Creates subdirectory for import views tests 2021-11-13 09:52:09 -08:00
Mouse Reeve
d3f23b4a0a Updates calls in tests 2021-11-13 09:50:56 -08:00
Mouse Reeve
659d0f19eb Improves import table ui
adds table container, plays with display a bit
2021-11-13 09:43:52 -08:00
Mouse Reeve
60fb1ac2e6 More flexible templates 2021-11-13 09:34:10 -08:00
Mouse Reeve
acc32d579e Preview review in import preview 2021-11-13 09:22:35 -08:00
Mouse Reeve
c245ad09bb Make sure book is in the right format 2021-11-13 09:07:50 -08:00
Mouse Reeve
08f4ad6cd4 Fixes call to import task 2021-11-13 09:02:42 -08:00
Mouse Reeve
40fff02eec Approve or delete import guesses 2021-11-12 17:10:47 -08:00
Mouse Reeve
221cde9be4 Adds manual review view 2021-11-12 16:24:45 -08:00
Mouse Reeve
9bff27e61f Separate import classes into files 2021-11-12 15:50:33 -08:00
Mouse Reeve
be26e8363a Create import directory 2021-11-12 15:43:15 -08:00
Mouse Reeve
5558ed810e Show manual review flag 2021-11-12 15:40:07 -08:00
Mouse Reeve
6a5a598345 Raise errors when import items fail
This should make is way easier to debug
2021-11-12 15:17:01 -08:00
Mouse Reeve
b784dcdb46 Removes uninformative test 2021-11-12 15:07:26 -08:00
Mouse Reeve
1d0f6d5243 Python formatting 2021-11-12 15:06:23 -08:00
Mouse Reeve
6161f60695 Use normalized data in table 2021-11-12 14:54:20 -08:00
Mouse Reeve
61eaf51310 Fixes html validity 2021-11-12 14:49:24 -08:00
Mouse Reeve
e09c02017c Fixes title/author search handling 2021-11-12 14:46:39 -08:00
Mouse Reeve
60c777ed49 Updates tests 2021-11-12 14:41:25 -08:00
Mouse Reeve
d8197cdcfa Indicate retry on status page 2021-11-12 14:38:41 -08:00
Mouse Reeve
a65f07e0bf Adds retry page 2021-11-12 14:36:28 -08:00
Mouse Reeve
2a84c0a370 title author search already working correctly with return first 2021-11-12 13:59:54 -08:00
Mouse Reeve
80c1954aa3 Fixes first_search_result behavior 2021-11-12 13:48:31 -08:00
Mouse Reeve
1e8269b6c9 Refactors import status view 2021-11-12 13:10:52 -08:00
Mouse Reeve
309d289a65 A few more mocks 2021-11-12 10:49:49 -08:00
Mouse Reeve
cad5a128ac Fixes call to add_status signal 2021-11-12 10:19:13 -08:00
Mouse Reeve
e6a251fdad Updates mocks across tests 2021-11-12 10:07:38 -08:00
Mouse Reeve
f71ef286b6 Updates mocks 2021-11-12 08:55:47 -08:00
Mouse Reeve
3190ef4346 Deprioritize adding old statuses to timelines 2021-11-11 19:19:23 -08:00
Mouse Reeve
9fee860b00 Adds enum for queue names 2021-11-11 19:10:22 -08:00
Mouse Reeve
6aa57d4d34 Set queue for broadcast task 2021-11-11 19:00:01 -08:00
Mouse Reeve
c33d791974 adds tests for new task system 2021-11-11 15:17:32 -08:00
Mouse Reeve
908c9dc689 Use many small tasks instead of one big task 2021-11-11 14:42:29 -08:00
Mouse Reeve
f0ce236ffc Removes unused code 2021-11-11 14:28:49 -08:00
Mouse Reeve
be94818a10 Fixes views tests 2021-11-11 14:27:29 -08:00
Mouse Reeve
915c41f59f Merge branch 'main' into import-field-names 2021-11-11 14:08:16 -08:00
Mouse Reeve
50ab4e8248 Updates model tests 2021-11-11 14:08:00 -08:00
Mouse Reeve
c37472b484
Merge pull request #1599 from bookwyrm-social/remove-serialize-image-helper
Remove serialize image helper
2021-11-11 13:53:17 -08:00
Mouse Reeve
ffcaef0559 Python formatting 2021-11-11 13:39:58 -08:00
Mouse Reeve
8c4e8361f2 Fixes tests 2021-11-11 13:35:56 -08:00
Mouse Reeve
c744faf393 Fixes dictionary list html validity 2021-11-11 13:00:34 -08:00
Mouse Reeve
d807774c2d Fixes label for privacy field 2021-11-11 12:53:48 -08:00
Mouse Reeve
efcf7824dd iUpdates storygraph tests 2021-11-11 12:39:12 -08:00
Mouse Reeve
5967834805 Adds migration 2021-11-11 12:29:51 -08:00
Mouse Reeve
f3bcced0a0 Adds shelf mappings 2021-11-11 12:29:38 -08:00
Mouse Reeve
147dd95e8d Removes unused import 2021-11-11 11:59:15 -08:00
Mouse Reeve
a95e031140 Validate html in unit tests 2021-11-11 11:33:12 -08:00
Mouse Reeve
4d574a3536 Process dates in librarything import 2021-11-11 09:54:36 -08:00
Mouse Reeve
20baf9385d Updates goodreads tests 2021-11-11 09:22:44 -08:00
Mouse Reeve
4ccd9fc633 Use generalized mappings to handle import 2021-11-10 16:49:54 -08:00
Mouse Reeve
81450ac2d5
Merge pull request #1597 from bookwyrm-social/import-fixes
Don't broadcast imported reviews outside bookwyrm
2021-11-10 12:32:51 -08:00
Mouse Reeve
0736c7e160 Uses general names for fields in parsed csvs 2021-11-10 11:10:09 -08:00
Mouse Reeve
717da918cf Use social media preview images 2021-11-10 10:59:21 -08:00
Mouse Reeve
d61595abb9 Clearer syntax 2021-11-10 10:50:05 -08:00
Mouse Reeve
cf477a03ae Corrects broadcast flow for objects 2021-11-10 10:39:51 -08:00
Mouse Reeve
7e784fa705 Removes used import 2021-11-10 10:35:37 -08:00
Mouse Reeve
9815e9e100 Python formatting 2021-11-10 10:30:18 -08:00
Mouse Reeve
4f5d23e785 Replace image_serialzier helper with built-in serializers 2021-11-10 10:28:43 -08:00
Mouse Reeve
d204e8dbb8
Merge pull request #1247 from joachimesque/image-absolute-url-getter
Add get_absolute_url to ImageField
2021-11-10 10:27:29 -08:00
Mouse Reeve
97a71f5e39 Cleans up software check syntax 2021-11-10 09:55:56 -08:00
Mouse Reeve
1b9d08414f Adds storygraph tests 2021-11-10 09:55:52 -08:00
Mouse Reeve
aeef472ee1 Fixes flow in checking software for broadcast 2021-11-10 09:33:00 -08:00
Mouse Reeve
20c6a3ea1c Creates generic importer test file
And removes some tests that duplicate the generic tests
2021-11-10 09:32:53 -08:00
Hugh Rundle
eb62474b97
fix broken book links in Discover 2021-11-10 22:04:19 +11:00
Hugh Rundle
3f6b0608b2
Show user and book names for reading actions in Discover
fixes #1596

This uses the same technique as #1572 to ensure read statuses from GeneratedNotes are translated.
2021-11-10 21:37:16 +11:00
Mouse Reeve
e19c4620ce Don't broadcast imported reviews outside bookwyrm 2021-11-08 12:00:08 -08:00
Hugh Rundle
dfe92a27c0
use shelf name if not default shelf
(instead of shelf.identifier)
2021-11-06 11:10:58 +11:00
Hugh Rundle
d8098357e6
match page title to active shelf
resolves #1586
2021-11-06 10:53:41 +11:00
Hugh Rundle
c3ba7ba547 pylint Y U like this? 2021-11-01 20:04:25 +11:00
Hugh Rundle
6556090524 Update existing authors when isni data available
When an existing author is selected as a new author when editing a book,
if they have an ISNI ID recorded we check the record and augment the local
database record from the ISNI data.

Also dedupes author aliases for this feature and when adding a completely
new author.
2021-11-01 19:50:49 +11:00
Hugh Rundle
c845b7a5d0 code cleanup 2021-11-01 16:00:34 +11:00
Hugh Rundle
775470a852 normalise isnis
Some isnis are imported with spaces and some not.
This normalises them for comparison and creating URLs
2021-11-01 15:48:52 +11:00
Hugh Rundle
55ac80cc16 ugh pylint 2021-11-01 12:01:57 +11:00
Hugh Rundle
1533b55a32 lint code 2021-11-01 11:58:08 +11:00
Hugh Rundle
b593b9c9d3 Display link to isni record on author page 2021-11-01 11:45:47 +11:00
Hugh Rundle
630f508ee4 code cleanup 2021-11-01 11:39:37 +11:00
Hugh Rundle
552980e208 select correct isni record when adding authors
The original implementation of this was so, so broken.
Now it's not.
2021-11-01 11:34:32 +11:00
Hugh Rundle
37148c5127 display isni bio with existing author name
If an existing author has an isni on record and it matches an author from the isni api call,
display the isni short description to aid with identifying the appropriate author.
2021-11-01 10:26:17 +11:00
Hugh Rundle
30a959dfce make pylint happy 2021-11-01 10:20:19 +11:00
Hugh Rundle
3cfd31f1fe hide isni authors if isni in local db
Check the authors suggested from the local DB for a matching ISNI when pulling authors from ISNI.
i.e. we do not want to suggest the same author twice when we *know* it is the same author.
2021-10-31 20:48:47 +11:00
Hugh Rundle
bce5f3f3b5 populate new authors with isni data
If a user selects an author pulled from the ISNI service when editing a book, use any relevant data from ISNI to populate the new author record.

This includes
- bio
- aliases
- isni
- wikipedia url
- viaf
2021-10-31 17:58:15 +11:00
Hugh Rundle
45158a1c03 improve isni search logic
- skip ISNIs that aren't persons
- don't look for text values in non-existent nameTitle elements
2021-10-30 09:24:42 +11:00
Hugh Rundle
87ed6f8380 code formatting 2021-10-29 21:14:32 +11:00
Hugh Rundle
d87e1b1567 fix encoding
The OCLC server claims that the xml payload is encoded as latin1 (ISO-8859-1).
This causes Requests to incorrectly encode things as latin1, when actually everything is (thank goodness) UTF-8.
We can fix it by just telling Requests that it is really UTF-8

With thanks to Tex Texin, creator of http://i18nqa.com/debug/utf8-debug.html
2021-10-29 21:00:35 +11:00
Hugh Rundle
f2e4865adf check isni sources when editing book authors 2021-10-29 16:13:05 +11:00
Hugh Rundle
625cfac76f isni author lookup utility 2021-10-29 16:12:31 +11:00
Mouse Reeve
d3e4c7e8d9 Removes change to boolean logic 2021-10-27 10:40:37 -07:00
Mouse Reeve
07446fa7d2 Adds more tests for the inventaire connector 2021-10-27 10:03:09 -07:00
Joachim
56fd147c88 Update test_status_model.py 2021-10-27 19:00:09 +02:00
Joachim
b956b79bd0 Add full URL generation to image_serializer 2021-10-27 18:56:37 +02:00
Joachim
35bd4a4071 Apply review suggestion 2021-10-27 18:13:47 +02:00
Mouse Reeve
8ba875af4a Improve federation compability with Hubzilla and Zap
Co-authored-by: hubzilla <redmatrix@users.noreply.github.com>
Fixes #1564
2021-10-26 14:41:06 -07:00
Mouse Reeve
6ba605cbd0
Merge pull request #1577 from hughrun/sort-recent
sort shelves by latest shelved date
2021-10-26 14:31:57 -07:00
Mouse Reeve
0e023fd9c9
Merge pull request #1572 from hughrun/trans-updates
translate all read statuses
2021-10-26 14:28:49 -07:00
Hugh Rundle
f4573996e6 black wants double quotes 2021-10-26 21:01:45 +11:00
Hugh Rundle
097da148be sort shelves by latest shelved date
Display the latest 2 books to be shelved in each shelf, when in the homepage feed view.
fixes #1576
2021-10-26 20:17:53 +11:00
Mouse Reeve
24bf3f408c Fixes duplicate books in author page when there are mulitple authors 2021-10-25 11:06:54 -07:00
Hugh Rundle
c5d530c0c4 translate all read statuses
This fixes #1566 - "Already translated strings sometimes show up untranslated in UI"

- add generatednote status header template
- include the relevant template (to-read/reading/read) based on the status.content
- remove GeneratedNote block from note status header template

This is probably not the most correct way of resolving the problem, but it's simple and it works.
2021-10-25 15:30:48 +11:00
Mouse Reeve
9a07c11b19 Fixes group quotes and button whitespace 2021-10-24 06:43:31 -07:00
Mouse Reeve
d80a28e128 Consistent quotes around group names in notifications 2021-10-23 08:00:45 -07:00
Mouse Reeve
1e6390a405 Fixes whitespace in translation strings 2021-10-23 06:59:06 -07:00
Mouse Reeve
ac749d94b2
Merge pull request #1562 from bookwyrm-social/suggested-users-tests
Adds a few more tests to the suggested users module
2021-10-22 10:39:11 -07:00
Mouse Reeve
f39ff96a64 Adds a few more tests to the suggested users module 2021-10-22 10:25:33 -07:00
Hugh Rundle
bdb6e4c911 fix template indenting
whoops
2021-10-22 21:15:48 +11:00
Hugh Rundle
1d791d950f add migration for updated notification types 2021-10-22 20:30:25 +11:00
Hugh Rundle
bcbff4f002 Merge branch 'main' into group-privacy 2021-10-22 20:28:31 +11:00
Hugh Rundle
6bc86f189f notify group members of group changes
Send a notification to all group members when group name, description, or privacy are changed.
2021-10-22 20:23:45 +11:00
Hugh Rundle
c9deda8fdd remove superfluous field 2021-10-22 20:21:55 +11:00
Hugh Rundle
80edc1e95e remove trailing spaces 2021-10-22 20:16:48 +11:00
Hugh Rundle
bd20c9ce2c remove followers group visibility test
Also updates description of group.followers_filter() override
2021-10-22 18:42:18 +11:00
Hugh Rundle
19c7e43f50 remove followers privacy option from group form 2021-10-22 18:40:55 +11:00
Mouse Reeve
278a9de673 Removes duplicate assertions in author view test 2021-10-20 18:29:00 -07:00
Mouse Reeve
72dc21e82a Adds tests and fixes unset ordering warnings 2021-10-20 18:27:19 -07:00
Mouse Reeve
d706b26ac9 Python formatting 2021-10-20 18:11:31 -07:00
Mouse Reeve
14682ed8c6 Prefect related data in author view 2021-10-20 18:04:29 -07:00
Mouse Reeve
de93beca84 Adds shelve buttons to books on author page 2021-10-20 17:51:42 -07:00
Mouse Reeve
3eb3225d2c Adds pagination to the template 2021-10-20 17:42:19 -07:00
Mouse Reeve
89a385da0a Paginate books on author page 2021-10-20 17:40:23 -07:00
Mouse Reeve
9d4e0851a0
Merge branch 'main' into image-absolute-url-getter 2021-10-20 15:12:06 -07:00
Mouse Reeve
f65a54eb4a Python formatting 2021-10-20 14:34:42 -07:00
Mouse Reeve
5c2d6e6510 Separate out test files and add more tests 2021-10-20 14:30:11 -07:00
Mouse Reeve
3d92afdf28 Moves shelf tests into subdirectory 2021-10-20 14:16:13 -07:00
Mouse Reeve
1bb23a8edf Adds more tests of shelf views 2021-10-20 14:15:05 -07:00
Mouse Reeve
b64a616ff9 Fixes mock in test 2021-10-20 13:56:55 -07:00
Mouse Reeve
87deac17f9 Make import link a link not a button 2021-10-20 13:31:18 -07:00
Mouse Reeve
d86ffc47a7 Fixes incorrect method comment 2021-10-20 13:16:38 -07:00
Mouse Reeve
6a2f962f8d Split shelf view into multiple files 2021-10-20 13:15:43 -07:00
Mouse Reeve
baba2e2057 Move shelf views into directory 2021-10-20 13:09:28 -07:00
Mouse Reeve
a27a55b40a
Merge pull request #1490 from hughrun/bookwyrm-groups
Bookwyrm groups
2021-10-17 07:54:59 -07:00
Hugh Rundle
ca47f836d1 adjust Group test mocks 2021-10-17 07:21:47 +11:00
Hugh Rundle
9116af1b3f add makemigrations merge file 2021-10-17 06:33:11 +11:00
Hugh Rundle
6e5c0cc4c3 Merge branch 'main' into bookwyrm-groups
There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.
2021-10-17 06:22:04 +11:00
Mouse Reeve
8bdedc9304 Catches some stray unvalidated html in landing tests 2021-10-16 12:07:16 -07:00
Mouse Reeve
c852405e42 Moves invite tests 2021-10-16 12:01:24 -07:00
Mouse Reeve
5b22cf8c46 Updates mocks for new view locations 2021-10-16 12:00:06 -07:00
Mouse Reeve
d735d03b59 Moves tests into subdirectory 2021-10-16 12:00:03 -07:00
Mouse Reeve
290039ac66 Moves landing views into directory 2021-10-16 11:45:55 -07:00
Mouse Reeve
86824ff1cb Fixes path to invite page in admin view 2021-10-16 11:32:51 -07:00
Mouse Reeve
63163ca0ff Python formatting 2021-10-16 11:23:45 -07:00
Mouse Reeve
851a8f6958 More registration tests 2021-10-16 11:15:57 -07:00
Mouse Reeve
ad26e65109 Fixes clashing identifier and attr with no quotes 2021-10-16 11:15:38 -07:00
Mouse Reeve
3118cdfbb6 Adds another register test 2021-10-16 10:56:22 -07:00
Mouse Reeve
7ec573bf50 Fixes duplicate form ids in login form 2021-10-16 10:55:51 -07:00
Mouse Reeve
5e9cc5eec5 Validate remaining templates 2021-10-16 10:46:05 -07:00
Mouse Reeve
ea268449fa Python formatting 2021-10-16 10:38:45 -07:00
Mouse Reeve
68cbea60a9 Updates registration tests with html validation 2021-10-16 10:34:41 -07:00
Mouse Reeve
dce0c85602 Fixes clashing input ids on reset password form 2021-10-16 10:28:38 -07:00
Mouse Reeve
bec56180f0 Fixes label on layout login form 2021-10-16 10:20:06 -07:00
Mouse Reeve
974c05dedb Adds more password view tests 2021-10-16 10:14:53 -07:00
Mouse Reeve
b56147d70c Use validate html in landing views tests 2021-10-16 10:09:25 -07:00
Mouse Reeve
8cb91acb93 Move logged out templates into a directory 2021-10-16 10:00:31 -07:00
Mouse Reeve
5558216917
Merge pull request #1542 from bookwyrm-social/cancel-button
A cancel button that leads nowhere
2021-10-16 07:21:39 -07:00
Mouse Reeve
17eebfb916
Merge pull request #1537 from bookwyrm-social/locale-improvements
Locale improvements
2021-10-16 07:13:56 -07:00
Mouse Reeve
94bce7fd83 Use javascript back button on create book page 2021-10-16 07:11:12 -07:00
Mouse Reeve
584e0a54af Adds test to catch invalid link 2021-10-16 07:06:49 -07:00
Hugh Rundle
8192d6ad10 code indenting fix 2021-10-16 18:00:55 +11:00
Hugh Rundle
0cd8ece474 code formatting 2021-10-16 17:45:39 +11:00
Hugh Rundle
a476b52f86 database migrations for groups 2021-10-16 17:45:21 +11:00
Hugh Rundle
2a31bf2f0c delete groups
Whoops, forgot to add this functionality earlier.

- allow owner to delete a group
- change all group lists to closed curation with group=False when group deleted
2021-10-16 17:35:36 +11:00
Hugh Rundle
85784f07d2 groups templates improvements
- require confirmation before removing a member
- require confirmation before removing self
- make button text less verbose
- use more standardised formatting for group editing form
- improve button colours
- add missing trans tags
- reload group page when removing member
2021-10-16 16:43:09 +11:00
Hugh Rundle
1736419538 (hopefully) fix group tests 2021-10-16 16:42:08 +11:00
Hugh Rundle
91534aff82 group view fixes
- fix form details not appearing in group member search view
- fix query term appearing in main search box when searching for new members
- direct request user back to the group rather than the user when adding a user to a group
2021-10-16 16:39:50 +11:00
Hugh Rundle
afd00cc67a improve group removal flow
Use .save() twice, but with broadcast=False on the second update. This is more efficient than doing a query and update() and avoids the duplicate AP broadcast.
2021-10-16 16:38:02 +11:00
Hugh Rundle
6f13c0d808 formatting fix 2021-10-16 16:09:03 +11:00
Mouse Reeve
fe00032da5 Merge branch 'main' into locale-improvements 2021-10-15 15:02:44 -07:00
Mouse Reeve
53e49baa20
Merge pull request #1538 from bookwyrm-social/author-page
Author page validation
2021-10-15 15:02:22 -07:00
Mouse Reeve
0e30d1f856 Show status header on edit page 2021-10-15 14:45:26 -07:00
Mouse Reeve
896885bffd Don't show progress field on status update comments
Also retitle the view
2021-10-15 14:43:02 -07:00
Mouse Reeve
a9daa4670e Retain reading status on comments 2021-10-15 14:41:14 -07:00
Mouse Reeve
1e7b56cdb0 Don't show last edited by link if it's not set 2021-10-15 14:26:16 -07:00
Mouse Reeve
931f78d7c2 Validate author page html 2021-10-15 14:26:07 -07:00
Hugh Rundle
e261bfdb6a fix local filter for suggested users 2021-10-16 08:20:12 +11:00
Hugh Rundle
864d8cea2b clean up templates 2021-10-16 08:18:55 +11:00
Hugh Rundle
97ea61dd7e efficiency improvement to remove_from_group 2021-10-16 08:17:42 +11:00
Mouse Reeve
4178d1f7f6 Adds context to translation strings on discover page 2021-10-15 14:10:34 -07:00
Mouse Reeve
3621224074 Properly localize book format 2021-10-15 13:59:07 -07:00
Mouse Reeve
dede101d17 Capitalize html and markdown 2021-10-15 13:58:59 -07:00
Mouse Reeve
032dedabb4 Goodreads capitalization standardization 2021-10-15 13:50:05 -07:00
Mouse Reeve
7f75cd329a Use instance name instead of the word "instance" where possible
trying to use less jargon
2021-10-15 13:42:32 -07:00
Mouse Reeve
eac1ed3484
Merge pull request #1534 from bookwyrm-social/followers-display
Fixes privacy filters for followers-only replies
2021-10-15 13:38:42 -07:00
Mouse Reeve
145a31045a Use "like" consistently (instead of mixing in "favorite") 2021-10-15 13:36:48 -07:00
Mouse Reeve
c6caa5a3f4 Fixes privacy display 2021-10-15 13:26:02 -07:00
Mouse Reeve
66a2b4c7c7 Tests for status raise_visible_to_user function 2021-10-15 13:25:47 -07:00
Hugh Rundle
2f38af4faa Revert "clean up List db queries"
This reverts commit 41f27a4a66.

I forgot that update() can only be done on a query result, not on an object, so we will need to go back to querying in order to update rather than saving.
2021-10-16 06:59:07 +11:00
Mouse Reeve
1072381b7d Fixes followers filter for non-status objs 2021-10-15 11:09:46 -07:00
Mouse Reeve
bd0e4abd56 Uses correct model field for raw values 2021-10-15 10:36:46 -07:00
Mouse Reeve
61a0b50b91 Test raw version is saved 2021-10-15 10:10:38 -07:00
Mouse Reeve
e8f5678867 More test names 2021-10-15 10:10:25 -07:00
Mouse Reeve
60b910172d Update migration 2021-10-15 10:09:34 -07:00
Mouse Reeve
b9e6824360 Imrpove test names 2021-10-15 10:07:29 -07:00
Mouse Reeve
117e6a08b2 Merge branch 'main' into markdown 2021-10-15 10:06:34 -07:00
Mouse Reeve
1e41458a44
Merge pull request #1535 from bookwyrm-social/edit-posts
Edit posts
2021-10-15 10:04:17 -07:00
Mouse Reeve
9ac5384d68 Fixes test and css linter 2021-10-15 09:54:14 -07:00
Mouse Reeve
b84152d84b tick version number 2021-10-15 09:42:21 -07:00
Mouse Reeve
2f40394c0a Updates edited display 2021-10-15 09:41:29 -07:00
Mouse Reeve
1b1e557800 Updates app to use date instead of boolean 2021-10-15 09:08:10 -07:00
Mouse Reeve
b11b810ec9 Use edit date to track is status has been updated 2021-10-15 08:56:07 -07:00
Mouse Reeve
20cca69f06 Test update status via inbox 2021-10-15 08:52:32 -07:00
Mouse Reeve
4002df04fc Send update activity on edit 2021-10-15 08:15:48 -07:00
Hugh Rundle
1634c8774e remove useless field in Notifications model 2021-10-15 17:59:39 +11:00
Hugh Rundle
41f27a4a66 clean up List db queries
- don't unnecessarily query DB in List views
- use more efficient query in remove_from_group List class method
2021-10-15 17:56:23 +11:00
Mouse Reeve
50db0bd012 Hide reply panel in no interact mode 2021-10-14 20:29:45 -07:00
Mouse Reeve
0dba071126 Fixes editing replies 2021-10-14 19:14:47 -07:00
Mouse Reeve
e43cade6cc Test edit view 2021-10-14 19:13:02 -07:00
Mouse Reeve
af567ba05e Edit posts in original markdown syntax 2021-10-14 18:34:26 -07:00
Mouse Reeve
01911d3b23 Update and indicate edit status 2021-10-14 17:33:45 -07:00
Mouse Reeve
175df2181c Adds edited field to status model 2021-10-14 17:33:04 -07:00
Mouse Reeve
2d1052766d Fixes undefined variable error 2021-10-14 17:32:38 -07:00
Mouse Reeve
f5e52d6a11 Save updated statuses 2021-10-14 17:23:54 -07:00
Mouse Reeve
066f14ca84 Save edited statuses 2021-10-14 17:13:54 -07:00
Mouse Reeve
8a08d789cb Removes delete and redraft tests 2021-10-14 17:13:15 -07:00
Mouse Reeve
92535a5481 Python formatting 2021-10-14 16:57:58 -07:00
Mouse Reeve
df27614937 Don't use localstorage cache for edits 2021-10-14 16:53:46 -07:00
Mouse Reeve
e149a14e73 Use href instead of POST form to edit status 2021-10-14 16:53:42 -07:00
Mouse Reeve
7488f8da96 Creates edit status endpoint 2021-10-14 16:30:27 -07:00
Mouse Reeve
cc650e235b Fixes privacy filters for followers-only replies 2021-10-14 16:26:28 -07:00
Mouse Reeve
b9251b4dc7 Fixes book identifiers not displaying 2021-10-14 16:11:33 -07:00
Mouse Reeve
1f6f543847 Use url templatetag to load posting urls 2021-10-14 15:56:34 -07:00
Mouse Reeve
d5b247b905 Merge branch 'main' into edit-posts 2021-10-14 15:49:08 -07:00
Mouse Reeve
c1287f800e
Merge pull request #1529 from scientia-ac-labore/add_sort_books
Add sorting to shelf. Use table-sort-header
2021-10-14 15:46:08 -07:00
Faiazov Dmitrii
1abbc67483 Make requested changes.
Signed-off-by: Faiazov Dmitrii <jjsolutions0110@gmail.com>
2021-10-14 13:39:15 +03:00
Mouse Reeve
803ad3c911 Removes delete and redraft view 2021-10-13 13:12:56 -07:00
Faiazov Dmitrii
ce16f36fe8 Add sorting to shelf. Use table-sort-header
existing template.

Signed-off-by: Faiazov Dmitrii <jjsolutions0110@gmail.com>
2021-10-13 21:25:40 +03:00
Mouse Reeve
4384098292 Updates Spanish locale 2021-10-11 12:17:39 -07:00
Mouse Reeve
58ba1ddf87 Typo fix 2021-10-11 10:07:02 -07:00
Mouse Reeve
48b84afbde Python formatting 2021-10-11 09:37:25 -07:00
Mouse Reeve
69110497ae Adds Brazilian Portuguese locale 2021-10-11 09:23:28 -07:00
Hugh Rundle
5d7f77021b dammit eslint 2021-10-10 14:02:55 +11:00
Hugh Rundle
3d74b10c5f eslinting 2021-10-10 13:55:18 +11:00
Hugh Rundle
726217577f linting 2021-10-10 13:18:16 +11:00
Hugh Rundle
14d3158871 add database migrations for Groups 2021-10-10 12:33:51 +11:00
Hugh Rundle
2a78c1221c style cleanup
Even tests must be formatted to please Black...
2021-10-10 12:33:11 +11:00
Hugh Rundle
8ae20928bb add tests for groups 2021-10-10 12:06:54 +11:00
Hugh Rundle
18735bdd42 use update() to remove orphaned groups on list edit
Using add() broadcasts the database change, which is unnecessary potentially broadcast AP messages twice.
2021-10-10 12:04:03 +11:00
Hugh Rundle
d6a5794ac3 do not load list edit form if viewer not authenticated 2021-10-10 12:02:27 +11:00
Hugh Rundle
83f46b6cda remove print() statement
Whoops accidentally left this behind from manual troubleshooting
2021-10-10 12:01:21 +11:00
Hugh Rundle
252ff0d689 emblacken files
Wouldn't it be great if I just remembered to run Black before every commit?
2021-10-09 22:15:24 +11:00
Hugh Rundle
b3cc9e5b75 remove user and their lists from group when group.user blocks them
Lists are changed to closed curation with no group.
2021-10-09 22:13:12 +11:00
Hugh Rundle
9940abfd81 refactor removing user from group
This is in preparation for removing a user and their lists when the group owner blocks them.
Remove the user via models.group
Remove the lists via models.list
2021-10-09 22:11:46 +11:00
Hugh Rundle
1bf5758e01 overide filters for groups and group lists
- use more sensible query for displaying groups on user page
- privacy_filter now allows group members to see followers_only and private lists and groups they would otherwise not see
2021-10-09 16:11:11 +11:00
Hugh Rundle
714a369246 only show list edit form to list.user 2021-10-09 16:10:00 +11:00
Hugh Rundle
056150d583 CASCADE group.user
Delete groups when group.user is deleted.
2021-10-08 21:21:19 +11:00
Hugh Rundle
39e002ee13 Merge remote-tracking branch 'origin/bookwyrm-groups' into bookwyrm-groups
Merge changes from main project into local branch
2021-10-08 18:53:59 +11:00
Hugh Rundle
5a4026cda3 group views tests 2021-10-08 18:47:03 +11:00
Hugh Rundle
05bde27944 remove commented out code 2021-10-08 18:46:30 +11:00
Hugh Rundle
48fc85c761 adjust commenting on js file 2021-10-08 18:45:28 +11:00
Mouse Reeve
cef46a1827 Adds migration 2021-10-07 17:30:42 -07:00
Mouse Reeve
4ba3234f6c
Merge branch 'main' into bookwyrm-groups 2021-10-07 17:27:11 -07:00
Mouse Reeve
37e03e8993 Merge branch 'main' into book-file-links 2021-10-07 15:27:16 -07:00
Hugh Rundle
3003b103e4 add group views tests
TODO: the POST test needs to test that the group was actually updated.
2021-10-08 08:38:00 +11:00
Mouse Reeve
674aa484fd Use target language in choice list 2021-10-06 16:58:27 -07:00
Mouse Reeve
982cd49c51 Fixes english grammar weirdness 2021-10-06 16:33:07 -07:00
Mouse Reeve
b23f6afa6c Adds context to curation type "open" 2021-10-06 16:24:23 -07:00
Mouse Reeve
26de524247 Update language on login and edit preference 2021-10-06 13:01:29 -07:00
Mouse Reeve
c0af69045c Adds language customization to preferences 2021-10-06 12:20:05 -07:00
Mouse Reeve
ba5ec878fa Adds language preference to database 2021-10-06 12:19:52 -07:00
Mouse Reeve
73a8f89bee
Merge branch 'main' into bookwyrm-groups 2021-10-06 11:37:38 -07:00
Mouse Reeve
8d00ef4318 Style cleanup 2021-10-06 11:23:36 -07:00
Mouse Reeve
53e5762563 Status-specific filters in status model 2021-10-06 11:19:13 -07:00
Mouse Reeve
34d6c88861 Move privacy levels filter to clearer location 2021-10-06 11:15:17 -07:00
Mouse Reeve
2307cb2227 Filter followers only in place
It's only used in one spot
2021-10-06 11:12:03 -07:00
Mouse Reeve
68b6b1fbae User override in child class instead of if/else for privacy_filter 2021-10-06 11:08:54 -07:00
Mouse Reeve
97cc129478 Updates calls to privacy_filter 2021-10-06 10:37:09 -07:00
Mouse Reeve
b2671e78ef Moves privacy filter to model class 2021-10-06 09:48:11 -07:00
Mouse Reeve
67c83b8d32
Merge pull request #1507 from bookwyrm-social/api-images
Fixes image paths in endpoints
2021-10-06 09:32:51 -07:00
Mouse Reeve
4c539bc7eb Fixes image paths in endpoints 2021-10-06 08:49:07 -07:00
Mouse Reeve
15105bda4f Remove follow suggestion on request 2021-10-06 06:48:44 -07:00
Levi Bard
094931d6d1 Display half-stars in generated statuses for federation.
Fixes #1505
2021-10-06 11:37:27 +02:00
Hugh Rundle
ec7d0db843 linting fixes 2021-10-05 21:48:59 +11:00
Hugh Rundle
f8e0de1ea9 run black for clean code
Godammit Hugh remember to do this before pushing new code.
2021-10-05 21:32:48 +11:00
Hugh Rundle
b3dc81dea0 update tests 2021-10-05 21:29:46 +11:00
Hugh Rundle
6fde19e9b1 lint fixes 2021-10-05 21:29:33 +11:00
Hugh Rundle
cdf7775e05 add test for Group views 2021-10-05 21:06:09 +11:00
Hugh Rundle
fe87e815e6 database migrations for Groups 2021-10-05 20:41:48 +11:00
Hugh Rundle
b1bb43d143 lint Group views file 2021-10-05 18:04:47 +11:00
Hugh Rundle
cc8db1c353 linting fixes
- remove unused imports
- add class docstrings
2021-10-05 09:05:20 +11:00
Hugh Rundle
484e9ed959 fix user Groups view pagination function 2021-10-05 08:14:52 +11:00
Hugh Rundle
90d92edd75 disable pylint on NotificationType now being "too long" 2021-10-05 08:10:23 +11:00
Hugh Rundle
78f5003407 lint raise_visible_to_user
Don't return True unnecessarily
2021-10-05 08:09:24 +11:00
Mouse Reeve
2a97458878
Merge pull request #1504 from bookwyrm-social/follow-request-recs
Remove follow suggestion on request
2021-10-04 13:14:32 -07:00
Mouse Reeve
f99a61b6bd Remove follow suggestion on request 2021-10-04 12:52:51 -07:00
Mouse Reeve
ebbc56b3d0
Merge pull request #1503 from bookwyrm-social/dashboard
More! Charts!
2021-10-04 11:59:46 -07:00
Mouse Reeve
636eca97cb Better mobile display 2021-10-04 11:22:14 -07:00
Mouse Reeve
2335945a50 Python formatting 2021-10-04 11:16:02 -07:00
Mouse Reeve
551b49b903 Adds works chart and updates colors 2021-10-04 11:14:50 -07:00
Mouse Reeve
37cd7e684c Updates chart markup 2021-10-04 10:53:22 -07:00
Mouse Reeve
fa241b08e7 Rename charts snippets and add register chart file 2021-10-04 10:42:02 -07:00
Mouse Reeve
2a88753e17 Chart class 2021-10-04 10:40:39 -07:00
Mouse Reeve
ac70a810af Boosts by remote users 2021-10-04 09:58:05 -07:00
Mouse Reeve
321949f2fa Lightly updates tests 2021-10-04 09:47:33 -07:00
Mouse Reeve
443750d6db f strings for activistreams tasks tests 2021-10-04 09:14:04 -07:00
Hugh Rundle
da53bad0f5 make Black happy 2021-10-04 22:22:00 +11:00
Hugh Rundle
3a90311129 update indenting for linter 2021-10-04 22:20:02 +11:00
Hugh Rundle
05969c5311 improve group creation hint
- use help class
- hopefully make the linter happy
2021-10-04 22:18:51 +11:00
Hugh Rundle
57b2c83c64 disable pylint suppression
I don't know what this does so I removed it - maybe I'll find out!
2021-10-04 21:34:54 +11:00
Hugh Rundle
dafda649f1 run Black on changed code 2021-10-04 21:31:28 +11:00
Hugh Rundle
782512b2ce replace get_group_suggestions
- adds **filters argument to get_suggestions()
- passes local=True arg to get_suggestions() for group member suggestions
- removes get_group_suggestions()

Thanks to Mouse for the suggestion to keep the codebase DRY!
2021-10-04 21:25:38 +11:00
Hugh Rundle
2b96b3365c Merge branch 'main' into bookwyrm-groups 2021-10-04 21:10:15 +11:00
Mouse Reeve
ea18252549 Fixes broken migration 2021-10-03 13:26:02 -07:00
Mouse Reeve
5cd8109820 Adds missing connector migration 2021-10-03 12:15:44 -07:00
Mouse Reeve
a3f0e23d23
Merge pull request #1496 from bookwyrm-social/fix-add-book
Fixes create book flow for search refactor
2021-10-03 12:12:10 -07:00
Mouse Reeve
d72d4eddfd
Merge pull request #1495 from bookwyrm-social/unblock-bug
Unblock bug
2021-10-03 12:02:18 -07:00
Mouse Reeve
889930aa69 Fixes create book flow for search refactor 2021-10-03 11:55:16 -07:00
Mouse Reeve
0798ba028f Fixes unblock signal 2021-10-03 11:51:17 -07:00
Mouse Reeve
668f71f96c Tests block and unblock activitystream signals 2021-10-03 11:45:19 -07:00
Mouse Reeve
15f6d2afc4
Merge pull request #1494 from bookwyrm-social/search-limits
Remove hard limit on search endpoints
2021-10-03 11:45:12 -07:00
Mouse Reeve
f4cb5933e4
Merge pull request #1493 from bookwyrm-social/auth-search
Logged out users can't search remote sources
2021-10-03 09:57:25 -07:00
Mouse Reeve
9059b78b57 Fixes testing if endpoint got results 2021-10-03 09:44:27 -07:00
Mouse Reeve
7d8cd99926 Remove hard limit on search endpoints 2021-10-03 09:38:41 -07:00
Mouse Reeve
ca7967a3a3 Adds test for remote search for anonymous user 2021-10-03 09:29:24 -07:00
Mouse Reeve
4787d854b8 require auth on resolve book endpoint 2021-10-03 09:19:19 -07:00
Mouse Reeve
9a5003f92a Don't let anonymous users search remote data 2021-10-03 09:18:17 -07:00
Hugh Rundle
c59194f808 Merge branch 'main' into new-shelf-fix 2021-10-03 19:47:15 +11:00
Hugh Rundle
9509c5e288 new shelves can be given names always
Previously new shelves created when a default shelf was selected did not provide the option to create a new unique name. Now they do.
fixes #1491
2021-10-03 19:41:38 +11:00
Mouse Reeve
cd5541ac30
Merge pull request #1487 from bookwyrm-social/thread
Fixes thread display
2021-10-02 20:15:46 -07:00
Hugh Rundle
0d5c20bcde remove_from_group button updates
- enable blocked users to be removed
- make "remove" button more subtle
2021-10-03 13:57:21 +11:00
Hugh Rundle
9d8e978686 sort group members in UserGroups view 2021-10-03 13:45:41 +11:00
Hugh Rundle
c04659984f fix raise_not_editable for group lists 2021-10-03 13:45:19 +11:00
Mouse Reeve
3c82230eed Load subclasses 2021-10-02 19:24:23 -07:00
Mouse Reeve
c821aaa18e Load status ancestors 2021-10-02 19:22:11 -07:00
Mouse Reeve
e1271dd079 Less costly migration 2021-10-02 19:04:01 -07:00
Hugh Rundle
603a9dc25c fix group members not being able to delete items on group lists 2021-10-03 12:22:03 +11:00
Hugh Rundle
7db2af89dd use group.local_path instead of harcoded url 2021-10-03 12:03:37 +11:00
Hugh Rundle
1ad8d87434 use raise_visible_to_user in group model
instead of if visible_to_user
2021-10-03 12:02:57 +11:00
Hugh Rundle
f13223b8ca add notifications for groups
Moved into new structure after merge.
2021-10-03 11:46:51 +11:00
Hugh Rundle
77ac8e0c04 add group membership to raise_not_deletable for lists 2021-10-03 11:45:53 +11:00
Mouse Reeve
14ac8bb1b5 Python formatting 2021-10-02 16:56:23 -07:00
Mouse Reeve
43f0440505 Improved privacy query 2021-10-02 16:55:15 -07:00
Mouse Reeve
cd57161489 Privacy filter for thread 2021-10-02 16:55:05 -07:00
Hugh Rundle
602664b8d7 Merge branch 'main' into groups-merge-test
Big merge of a couple of weeks' work from the main project back into this branch. :ohno:
2021-10-03 10:49:38 +11:00
Hugh Rundle
f39887cf7f groups should appear before lists on user pages 2021-10-03 10:07:47 +11:00
Mouse Reeve
7caaddbb22 Get thread children with depth first recusive search 2021-10-02 15:50:09 -07:00
Hugh Rundle
1c5789f283 remove group-curated lists when user leaves group 2021-10-03 09:16:19 +11:00
Hugh Rundle
a179de33bc fix incorrect wording on group selection
select a group, not a list!
2021-10-03 09:07:42 +11:00
Hugh Rundle
4ea99d1763 don't assign a group when creating non-group curated lists
same as updating a list but for if a user changes their mind about curation when initially creating a list.
2021-10-03 09:06:06 +11:00
Mouse Reeve
55a556863c Improves display on author page
Fixes #1482
2021-10-02 11:44:25 -07:00
Mouse Reeve
eaa77906b2
Merge pull request #1485 from bookwyrm-social/notifications
Refactors notifications templates
2021-10-02 11:41:18 -07:00
Mouse Reeve
446d286b12
Merge pull request #1483 from bookwyrm-social/threads
Threads
2021-10-02 11:41:10 -07:00
Mouse Reeve
db74538345 Update for js linter 2021-10-02 11:28:16 -07:00
Mouse Reeve
b9632039f9 Link notification block to its main path 2021-10-02 11:26:22 -07:00
Mouse Reeve
2a9f8f8122 Updates curated list notification link generation 2021-10-02 10:52:35 -07:00
Mouse Reeve
5adbf2d087 Move notification items into dir 2021-10-02 10:46:09 -07:00
Mouse Reeve
0320898f4e Expands notifications views test 2021-10-02 10:42:38 -07:00
Mouse Reeve
1d79bb58e1 Better mobile display for notifications 2021-10-02 10:28:49 -07:00
Mouse Reeve
085d3270a3 Load related objects in query
Reduces query load in template
2021-10-02 10:11:27 -07:00
Mouse Reeve
8f56ad9e99 Adds report templates 2021-10-02 09:50:48 -07:00
Mouse Reeve
df8f67895c Adds mention notification template 2021-10-02 08:09:57 -07:00
Mouse Reeve
29157d03fc Create snippet for notification items 2021-10-02 07:34:59 -07:00
Mouse Reeve
9d765751e8 Creates notification template directory 2021-10-02 07:32:00 -07:00
Hugh Rundle
680e547c8b add button for non-owner members to leave group 2021-10-02 21:24:26 +10:00
Hugh Rundle
eed9d44cfd fix visible_to_user for groups user is a member of 2021-10-02 20:52:19 +10:00
Hugh Rundle
72e00f75c9 send notification when other group members add books to group lists 2021-10-02 20:14:53 +10:00
Hugh Rundle
3a954ca6ae improve responsive layout for groups 2021-10-02 20:05:19 +10:00
Hugh Rundle
29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +10:00
Hugh Rundle
2c399fe1aa fix suggested members all appearing in a column 2021-10-02 19:35:08 +10:00
Hugh Rundle
8708d71f4b group members can see lists
- fix visible_to_user for group objects (like lists)
- temporarily disable privacy_filter on group lists
2021-10-02 18:31:56 +10:00
Hugh Rundle
8496f24032 fix filters for group members to see and edit group lists 2021-10-02 18:09:15 +10:00
Hugh Rundle
832a9b9890 fix group local_path
as per Lists, we need to override get_remote_id to remove the user from the URL
2021-10-02 16:54:44 +10:00
Hugh Rundle
52a083a907 revert name change for Group, GroupMember
these were named as BookwyrmGroup and BookwyrmGroupMember due to a misunderstanding about related_name and a dodgy development environment. This naming makes more sense.
2021-10-02 16:52:34 +10:00
Hugh Rundle
21e6ed7388 complete group notifications
- notify group members when a new member accepts an invitation
- notify all group members when a member leaves or is removed
- notify ex-member when they are removed
2021-10-02 15:48:55 +10:00
Hugh Rundle
f82af6382f make message about group members more generic 2021-10-02 15:48:34 +10:00
Hugh Rundle
70e0128052 non-owners can't add users to groups
- hide add-user pages from non-owners
- hide user searchbox from non-owners
- fix find-user searchbox being in wrong place where no results
2021-10-02 14:41:23 +10:00
Hugh Rundle
5237e88aba remove user button for groups 2021-10-02 13:48:53 +10:00
Hugh Rundle
0984972b05 group membership invitations
- fix display of group information on user and group pages
- send, receive, accept and reject invitations
2021-10-02 12:30:48 +10:00
Hugh Rundle
89dea44614 accepting membership fixes
- don't delete the invitation twice
- send membership information properly to notification
2021-10-02 12:29:01 +10:00
Hugh Rundle
9290655116 fix urls for group invitations 2021-10-02 12:13:34 +10:00
Hugh Rundle
80fb37b55c add has_groups tag for use on user page 2021-10-02 12:12:59 +10:00
Mouse Reeve
bd463ea6fe Lint fixes 2021-10-01 18:09:11 -07:00
Mouse Reeve
29ee99c03e Styles for the thread page 2021-10-01 18:05:48 -07:00
Hugh Rundle
0f3be40957 fix group references in templates
Let's do this the sensible way huh, by using backwards references to memberships etc

Also adds filters for is_member and is_invited so we don't have to do weird things in group Views
2021-10-02 10:47:42 +10:00
Hugh Rundle
2f42161dda disambiguate groups and prep for group invitations
- rename Group to BookwyrmGroup
- create group memberships and invitations
- adjust all model name references accordingly
2021-10-02 10:10:37 +10:00
Mouse Reeve
f901806574 Test to ensure incoming statuses have thread ids 2021-10-01 14:56:38 -07:00
Mouse Reeve
ca4b262e72 Link to status anchor 2021-10-01 14:50:42 -07:00
Mouse Reeve
0cd55147ee Set thread id on parent status 2021-10-01 14:41:30 -07:00
Mouse Reeve
7ff040470f Use more f strings in status models test file 2021-10-01 14:26:01 -07:00
Mouse Reeve
8461fe5ec3 Adds anchor id to status 2021-10-01 14:12:49 -07:00
Mouse Reeve
565c9dfa72 Removes block div from thread markup 2021-10-01 14:12:34 -07:00
Mouse Reeve
b8fd909fe3 Adds thread id to status model 2021-10-01 14:12:03 -07:00
Mouse Reeve
a24fe558fc
Merge pull request #1480 from bookwyrm-social/comment-formatting
Post-processes statuses composed in modals
2021-10-01 12:00:56 -07:00
Mouse Reeve
70bf7c522f Adds tests 2021-10-01 11:23:35 -07:00
Mouse Reeve
d2f80c2446 Adds test for reading status with comment 2021-10-01 10:57:56 -07:00
Mouse Reeve
7d03bfd2f6
Merge pull request #1477 from bookwyrm-social/add-edit-book
Updates for adding and editing books
2021-10-01 10:36:09 -07:00
Mouse Reeve
74d2cf646a Moves meta tags out of p tags
I guess that's not kosher
2021-10-01 10:25:23 -07:00
Mouse Reeve
428d87a351 Don't render empty html about books 2021-10-01 10:08:56 -07:00
Mouse Reeve
0928fd03a6 Update mocks in editions tests 2021-10-01 10:08:31 -07:00
Mouse Reeve
58fa3d9ad6 Fixes dl syntax 2021-10-01 09:24:26 -07:00
Mouse Reeve
a7614d8c35 Moves editions page tests into separate file 2021-10-01 09:24:10 -07:00
Mouse Reeve
34948d494c Python formatting 2021-09-30 22:23:29 -07:00
Mouse Reeve
6902ffc4c3 Adds missing view file 2021-09-30 22:22:32 -07:00
Mouse Reeve
bdb1d1998a Helper function for html validation 2021-09-30 22:22:20 -07:00
Mouse Reeve
9c78a9d95c test fixes 2021-09-30 22:02:07 -07:00
Mouse Reeve
6178925053 Unique form identifier for delete status button 2021-09-30 22:01:55 -07:00
Mouse Reeve
ccc52287c5 More error filtering 2021-09-30 20:01:57 -07:00
Mouse Reeve
3f44389c6b Adds new test file for search 2021-09-30 13:03:36 -07:00
Mouse Reeve
92f9319fe1 Updates tests that reference self_connector 2021-09-30 11:46:17 -07:00
Mouse Reeve
1033d3d045 Updates connector tests 2021-09-30 11:33:04 -07:00
Mouse Reeve
232e4bed79 Updates migrations 2021-09-30 11:06:12 -07:00
Mouse Reeve
38f82fe660 Remove/re-add connector in migration 2021-09-30 10:55:18 -07:00
Mouse Reeve
e6e44decf9 Updates migration 2021-09-30 10:47:53 -07:00
Mouse Reeve
5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve
75e69eb269 Post-processes statuses composed in modals 2021-09-30 10:00:05 -07:00
Mouse Reeve
9a96df1712 Unique id for privacy fields 2021-09-29 15:58:37 -07:00
Mouse Reeve
305dcc504b Unique names for fallback forms 2021-09-29 15:52:08 -07:00
Mouse Reeve
0dc6a18201 Skip unescaped chars warning in html validator
jankily
2021-09-29 15:47:30 -07:00
Mouse Reeve
5cdfd29f9e Unqiue id for progress fields 2021-09-29 15:46:54 -07:00
Mouse Reeve
6d17b83c8c Id uniqueness fixes 2021-09-29 15:35:08 -07:00
Mouse Reeve
69195e6cd0 Fixes form close placement on reading modals 2021-09-29 15:02:50 -07:00
Mouse Reeve
a8ed957e20 Fixes uuid reference in toggle button snippet 2021-09-29 15:01:56 -07:00
Mouse Reeve
47b08e7591 Moves tests into dirs and updates render checks 2021-09-29 14:21:57 -07:00
Mouse Reeve
33b3b518e8 Move views into subdirectory 2021-09-29 13:42:27 -07:00
Mouse Reeve
899e6b55a8 Updates references to book templates 2021-09-29 13:27:07 -07:00
Mouse Reeve
1e5a8dc3db Create subdirectories for book view templates 2021-09-29 13:21:11 -07:00
Mouse Reeve
f0e31f730a Moves form into snippet and adds boxes around sections 2021-09-29 13:18:27 -07:00
Mouse Reeve
2d13fd0a1c Merge branch 'main' into add-edit-book 2021-09-29 12:53:46 -07:00
Mouse Reeve
d36ef2bcf1 Pylint change 2021-09-29 12:42:28 -07:00
Mouse Reeve
32391dd64d Python formatting 2021-09-29 12:38:31 -07:00
Mouse Reeve
0aef011258 Don't use the format detail if it maps directly 2021-09-29 12:29:17 -07:00
Mouse Reeve
123b23728f Infer format in openlibrary import 2021-09-29 12:21:19 -07:00
Mouse Reeve
47706b5353 Use detail field on book paeg and meta 2021-09-29 11:59:09 -07:00
Mouse Reeve
54a8815f49 Updates migrations 2021-09-29 11:49:57 -07:00
Mouse Reeve
4747bb2156 Hide cover preview column if cover is unset 2021-09-29 11:36:35 -07:00
Mouse Reeve
2f93e6d723 Merge branch 'main' into book-format-choices 2021-09-29 11:33:06 -07:00
Mouse Reeve
e308ca2511
Merge pull request #1476 from bookwyrm-social/progress-modal
Progress modal
2021-09-29 11:23:29 -07:00
Mouse Reeve
cd54770aad Tick javascript cache buster 2021-09-29 11:12:26 -07:00
Mouse Reeve
52c6a90498 Don't redirect on http request to readthrough 2021-09-29 11:02:04 -07:00
Mouse Reeve
d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve
cd2dcbc758
Merge pull request #1471 from bookwyrm-social/goal-cleanup
Improves html consistency for goal page
2021-09-29 10:25:34 -07:00
Mouse Reeve
4dbb09be87 Merge branch 'main' into progress-modal 2021-09-29 09:53:02 -07:00
Mouse Reeve
a1eaae1d5e Fixes markup syntax errors 2021-09-29 09:48:17 -07:00
Mouse Reeve
6e05fb6dd0 Use inline form component for goal form on goal page 2021-09-29 09:39:23 -07:00
Mouse Reeve
5f3df11e56 Moves goal card to feed dir 2021-09-29 09:24:51 -07:00
Mouse Reeve
46168a292b Moves info text to goal form snippet 2021-09-29 09:23:52 -07:00
Mouse Reeve
002a9c4267
Merge pull request #1456 from Tak/add-cover-from-url-while-adding-book
Add cover from url while adding book
2021-09-29 08:56:05 -07:00
Mouse Reeve
701bf4828b Improves html consistency for goal page 2021-09-28 18:34:12 -07:00
Mouse Reeve
6dbd402345
Merge pull request #1469 from bookwyrm-social/user-shelf
Reorganize user/shelf/goal views code
2021-09-28 17:51:58 -07:00
Mouse Reeve
a1aa34a4a4 Limits additional user for test 2021-09-28 17:40:55 -07:00
Mouse Reeve
4dc504c058 Fixes id clashes in shelf forms 2021-09-28 17:36:50 -07:00
Mouse Reeve
746d4bdba4 Validate html in user view tests 2021-09-28 17:31:13 -07:00
Mouse Reeve
b5d49d3499 Updates follows null state text 2021-09-28 17:30:58 -07:00
Mouse Reeve
6ae8215f41 Adds comment 2021-09-28 17:21:35 -07:00
Mouse Reeve
242ffe5456 Show shelf description 2021-09-28 17:20:15 -07:00
Mouse Reeve
5ea40e23b7 Moves shelf delete button 2021-09-28 17:17:01 -07:00
Mouse Reeve
6d9bf349d1 Fixes delete shelf logic and adds tests 2021-09-28 17:02:18 -07:00
Mouse Reeve
24553e0e35 Updates edit/create shelf forms 2021-09-28 16:37:24 -07:00
Mouse Reeve
dba0aaff2c Adds description field to shelf 2021-09-28 16:36:47 -07:00
Mouse Reeve
183e76eb2a Adds test for shelf 2021-09-28 16:18:32 -07:00
Mouse Reeve
cc1ae270cc Label shelf privacy in edit shelf form 2021-09-28 16:12:34 -07:00
Mouse Reeve
d9945ac5e3 Updates references to templates 2021-09-28 16:04:08 -07:00
Mouse Reeve
9a4b71d585 Shuffles around user profile, shelf, and goal templates 2021-09-28 16:00:45 -07:00
Mouse Reeve
4402fc6c14 HTML validation in tests 2021-09-28 15:55:35 -07:00
Mouse Reeve
21fee19b42 Use recently active as the default sort order 2021-09-28 15:51:49 -07:00
Mouse Reeve
5b3ff8469d Html validation fix for user admin view 2021-09-28 15:20:10 -07:00
Mouse Reeve
ada3e1d4d6 Adds options to html validator and fixes dl/dts 2021-09-28 15:02:24 -07:00
Mouse Reeve
2befef7deb Brings federation page html in line with html validator 2021-09-28 14:39:23 -07:00
Mouse Reeve
65d7f50811 Updates federation tests 2021-09-28 14:15:06 -07:00
Mouse Reeve
29ef6df714 Fixes dashboard page for html validator complaints 2021-09-28 13:54:41 -07:00
Mouse Reeve
afcd296513 Test rendered html 2021-09-28 13:44:49 -07:00
Mouse Reeve
0fa0c1e2d9 Adds IP blocklist render test 2021-09-28 13:36:41 -07:00
Mouse Reeve
4a5efab2f8 Consistent syntax for back to list 2021-09-28 13:34:14 -07:00
Mouse Reeve
538ae015cd Fixes report template paths 2021-09-28 13:32:23 -07:00
Mouse Reeve
27e6cff0f3 Change field display order on edit instance page 2021-09-28 13:27:03 -07:00
Mouse Reeve
8e3f6657fc Fixes edit instance template name 2021-09-28 13:24:25 -07:00
Mouse Reeve
fa0e3cc112 Creates admin views test directory 2021-09-28 13:21:51 -07:00
Mouse Reeve
67a4b2713a Use in-table style for null states 2021-09-28 13:18:27 -07:00
Mouse Reeve
c5746bbce0 Adds federation null state 2021-09-28 13:11:22 -07:00
Mouse Reeve
5b97135155 Fixes reference to filters template 2021-09-28 13:07:57 -07:00
Mouse Reeve
de5daf8057 Adds email blocklist null state 2021-09-28 13:05:45 -07:00
Mouse Reeve
57044d1c20 Adds null state for ip blocklist 2021-09-28 13:04:36 -07:00
Mouse Reeve
b3fdd1ad51 Puts sections into boxes on site page 2021-09-28 13:02:09 -07:00
Mouse Reeve
6c73c94fce Move site settings sub-tabs to the site.html template 2021-09-28 12:53:17 -07:00
Mouse Reeve
9b091eaf75 Moves user admin templates into settings directory 2021-09-28 12:46:38 -07:00
Mouse Reeve
a1a1fd90a1 Moves reports into settings directory 2021-09-28 12:43:21 -07:00
Mouse Reeve
9c9adfc6f0 Updates references to templates 2021-09-28 12:39:52 -07:00
Mouse Reeve
1c262a1a64 Updates internal references 2021-09-28 12:26:55 -07:00
Mouse Reeve
7b985f3a41 Sorts admin templates into even more directories 2021-09-28 12:22:41 -07:00
Mouse Reeve
057f870997 Avatar display on mobile 2021-09-28 12:09:13 -07:00
Mouse Reeve
6266b58650 Updates static paths in tests 2021-09-28 12:02:09 -07:00
Mouse Reeve
c5d7c7dbff Updates block view path reference in test 2021-09-28 11:49:53 -07:00
Mouse Reeve
a9eb544bac Moves blocks views and tests into preferences dir 2021-09-28 11:44:53 -07:00
Mouse Reeve
461f834973 Move preferences test into their own directory 2021-09-28 11:41:40 -07:00
Mouse Reeve
4511bb2ccd Italics for null state text 2021-09-28 11:29:42 -07:00
Mouse Reeve
85f6b615bd Python formatting 2021-09-28 11:27:16 -07:00
Mouse Reeve
1b0a5232bc Move preferences views into directory 2021-09-28 11:23:47 -07:00
Mouse Reeve
e971638f14 Render test for change password view 2021-09-28 11:09:24 -07:00
Mouse Reeve
f281d9014a Creates sections in edit profile view 2021-09-28 11:00:16 -07:00
Mouse Reeve
585c71e72a Adds html linting to test 2021-09-28 10:59:51 -07:00
Mouse Reeve
9a06b7d493 Fixes incorrect label in edit user panel 2021-09-28 09:24:09 -07:00
Mouse Reeve
72cbc1cb1b Adds label 2021-09-28 09:23:50 -07:00
Mouse Reeve
273198d634 Merge branch 'main' into progress-modal 2021-09-28 08:00:45 -07:00
Hugh Rundle
66494e7788 fix reverse reference to user bookwyrm_groups 2021-09-28 18:53:11 +10:00
Levi Bard
9db75cc5b7 Add test for creating a book with a cover url 2021-09-28 10:01:31 +02:00
Mouse Reeve
0a37556941
Merge pull request #1401 from bookwyrm-social/opensearch
Adds opensearch xml file
2021-09-27 19:48:53 -07:00
Mouse Reeve
95cdaae4d4 Python formatting 2021-09-27 19:38:54 -07:00
Mouse Reeve
c32f975a67 Working in firefox 2021-09-27 19:28:50 -07:00
Mouse Reeve
99ef81be9b Linter fixes 2021-09-27 19:05:13 -07:00
Mouse Reeve
15fc31bf77 Merge branch 'main' into opensearch 2021-09-27 18:58:28 -07:00
Mouse Reeve
767d378170 Update status tests 2021-09-27 18:52:45 -07:00
Mouse Reeve
e0aa8a7fdf Fixes shelf view boolean logic 2021-09-27 17:58:21 -07:00
Mouse Reeve
f13f3d460c Fixing checking list perms 2021-09-27 17:52:27 -07:00
Mouse Reeve
99c1a670f4 Fixes checking goal perms 2021-09-27 17:52:20 -07:00
Mouse Reeve
56bf8d923f Updates goal and list tests 2021-09-27 17:52:10 -07:00
Mouse Reeve
6c0b1da83b Fixes feed tests 2021-09-27 17:32:54 -07:00
Mouse Reeve
c874a762dd Updates inbox view 2021-09-27 17:27:17 -07:00
Mouse Reeve
62ff9d6199 Python formatting 2021-09-27 16:08:52 -07:00
Mouse Reeve
af2f78095e Fixes assert syntax 2021-09-27 16:06:01 -07:00
Mouse Reeve
dfa8bafe18 Uses new visible/editable/deleteable functions 2021-09-27 16:04:40 -07:00
Mouse Reeve
e6ae500569 Fixes syntax problem on http raises 2021-09-27 16:00:50 -07:00
Mouse Reeve
84443c7f81 Custom perms function for shelf view 2021-09-27 15:55:55 -07:00
Mouse Reeve
3f10ae248a Changes visiblity function to raise 2021-09-27 15:54:58 -07:00
Mouse Reeve
3657f9e0df Check perms in status views 2021-09-27 14:03:17 -07:00
Mouse Reeve
556ae0726b Check perms in list views 2021-09-27 14:03:06 -07:00
Mouse Reeve
ab31798931 Adds model function to check perms 2021-09-27 14:02:34 -07:00
Mouse Reeve
0f57a43bfb Separate access controls for delete and re-order 2021-09-27 13:31:35 -07:00
Mouse Reeve
10098a402d Don't show list item controls to contributing viewers 2021-09-27 13:25:53 -07:00
Mouse Reeve
ab5521480d
Merge pull request #1462 from bookwyrm-social/fewer-active-shelf-queries
Fewer active shelf queries
2021-09-27 13:16:50 -07:00
Mouse Reeve
1efe62a70e Check for readthrough annotation 2021-09-27 13:08:11 -07:00
Mouse Reeve
d7a54b0b10 Removes stray print 2021-09-27 12:56:40 -07:00
Mouse Reeve
6d2403bbc7
Merge pull request #1459 from bookwyrm-social/password-reset
Prevent password reset for inactive users
2021-09-27 12:55:05 -07:00
Mouse Reeve
8b0a8e2611 Another user mock on request 2021-09-27 12:38:49 -07:00
Mouse Reeve
dd3850a3ba Updates books test 2021-09-27 12:26:56 -07:00
Mouse Reeve
36c00c49ab User viewer aware objects for feed suggested books 2021-09-27 11:37:50 -07:00
Mouse Reeve
ba4df5b38b Safely return if there are no current shelves 2021-09-27 11:29:53 -07:00
Mouse Reeve
8e8f46ee51 Only call .all once in shelf view 2021-09-27 11:27:46 -07:00
Mouse Reeve
cb089ed817 One query to get book for book view 2021-09-27 11:23:55 -07:00
Mouse Reeve
35131262ff CHeck for current shelves attr before querying for it 2021-09-27 11:17:53 -07:00
Mouse Reeve
995e2c47db User viewer aware objects for book page
Plus other refactors for that view
2021-09-27 11:17:42 -07:00
Mouse Reeve
6d06edc2c7 User viewer aware books for all books shelf view 2021-09-27 10:58:34 -07:00
Mouse Reeve
eb34bb2d93
Merge pull request #1461 from bookwyrm-social/views-init
Adds init file to admin views dir
2021-09-27 10:37:23 -07:00
Mouse Reeve
e75a49f799
Merge pull request #1455 from bookwyrm-social/refactor-readthroughs
Refactor read-throughs
2021-09-27 10:29:46 -07:00
Mouse Reeve
bc87856c2e Merge branch 'main' into book-format-choices 2021-09-27 10:29:12 -07:00
Mouse Reeve
1cb1b29f57 Adds request user to mock 2021-09-27 10:26:25 -07:00
Mouse Reeve
69b010a8d3 f string updates 2021-09-27 10:21:46 -07:00
Mouse Reeve
28d40e9914 Use url names in redirects 2021-09-27 10:17:16 -07:00
Mouse Reeve
92de48afd4 Adds init file to admin views dir
Is this why they're not pylinting?
2021-09-27 10:06:46 -07:00
Mouse Reeve
c399d6edfb Prevent password reset for inactive users 2021-09-27 09:31:51 -07:00
Hugh Rundle
fb823189a0 don't allow non-local users to join groups (yet)
Groups are not compatible with ActivityPub because I don't know what I'm doing.

NOTE: this is super hacky, fix ASAP
2021-09-27 21:48:40 +10:00
Hugh Rundle
e15eef16c5 improve new group member adding
The add-members page now looks almost identical to the group
page and is clearer.
2021-09-27 21:21:00 +10:00
Levi Bard
0e6895633c Allow adding a cover by url when adding a new book (#1443) 2021-09-27 13:00:16 +02:00
Hugh Rundle
1a02af1450 allow members to see groups and their lists
- add additional logic to visible_to_user, for groups and their objects
- cleans up some queries in Group view

NOTE: I can't work out how to make group lists only visible
to users who should be able to see them, on user group listings.
They still can't access the actual group, but can see it on
user pages. This is potentialy problematic.
2021-09-27 20:24:25 +10:00
Hugh Rundle
df5a5f94a1 fix local_path for groups 2021-09-27 19:27:39 +10:00
Hugh Rundle
c87712c995 allow group members to add items to group lists directly
NOTE: this will be the case regardless of privacy settings of the list
2021-09-27 18:41:29 +10:00
Hugh Rundle
81e5ff5b76 show groups on member pages if allowed
- display groups on user pages when not the logged in user
- restrict visibility of groups on user pages and group pages themselves according to privacy settings
2021-09-27 17:51:18 +10:00
Hugh Rundle
277c033fda show star if this user is the creator/manager of the group 2021-09-27 17:50:38 +10:00
Hugh Rundle
e5ca377cd3 clean up stray code mess 2021-09-27 16:50:51 +10:00
Hugh Rundle
e38d7b63f3 make groups actually editable 2021-09-27 16:49:56 +10:00
Hugh Rundle
493ed14f34 better group creation form logic and placement 2021-09-27 16:39:12 +10:00
Hugh Rundle
0ccd54b05a better urls and views for group creation and editing 2021-09-27 15:38:05 +10:00
Hugh Rundle
f3181690a2 change group owner from 'manager' to 'user'
This will allow privacy management to use existing code.
Some template updates also are for rationalising how
groups are created and edited.
2021-09-27 15:36:41 +10:00
Hugh Rundle
2874e52309 rationalise group creation and prep for group privacy 2021-09-27 15:34:14 +10:00
Hugh Rundle
762202c4b0 fix UI for group curated list editing
When creating or editing a list, the group selection dropdown will only appear if the user selects "group" as the curation option (or it is already selected).

- fix typo in bookwyrm.js comments
- add data-hides trigger for hiding elements after they have been unhidden, where simple toggles are not the right approach
2021-09-27 11:03:41 +10:00
Hugh Rundle
0e2095bc5e refer to group in group lists created_text 2021-09-26 20:52:44 +10:00
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
8bfc71db6e create group curated lists 2021-09-26 15:56:52 +10:00
Hugh Rundle
f3a3ba5f01 pass group value to list views and vice-versa 2021-09-26 15:56:02 +10:00
Hugh Rundle
b921d666cf add group field to ListForm 2021-09-26 15:55: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
ec0720514e don't allow non-manager to add and remove group members 2021-09-25 20:25:30 +10:00
Hugh Rundle
035fc5209d better logic for identifying group manager 2021-09-25 20:23:59 +10:00
Hugh Rundle
62a5ed7a9e identify group manager 2021-09-25 19:53:06 +10:00
Hugh Rundle
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
e800106be4 smaller cards for group members
- this will also enable members to be removed easily by managers in a future commit.
2021-09-25 11:37:08 +10:00
Hugh Rundle
8d17f888ea improve naming of templates and urls for groups 2021-09-25 11:36:35 +10:00
Hugh Rundle
7c0deabcb2 update urls and group view for searching users to add to group 2021-09-25 11:14:04 +10:00
Hugh Rundle
cbe172df3d find users for groups
- search for users to add to a group
- display suggested users on search results screen

TODO: actaully enable users to be added!
TODO: groups/suggested_users probably could be replaced with some logic in snippets/suggested_users.html
2021-09-25 11:11:58 +10:00
Hugh Rundle
8c326ec52f user groups listing template
- creates groups/user_groups template for listing a user's groups on their user page
2021-09-25 11:10:06 +10:00
Hugh Rundle
273ad9a466 add create_group to __init__.py
you probably want this otherwise nothing previously added for group creation will work :-)
2021-09-25 10:55:32 +10:00
Hugh Rundle
d4fcf88cf5 add list cards to groups page
- add list cards to groups page based on lists page
- add sort to members on group page
2021-09-24 21:57:01 +10:00
Hugh Rundle
86a60d58e5 add user cards to group pages 2021-09-24 21:24:06 +10:00
Hugh Rundle
264d9b2f3c add group page template 2021-09-24 20:35:51 +10:00
Hugh Rundle
9b6d2a9d88 add group page 2021-09-24 20:34:11 +10:00
Hugh Rundle
f32a2cc4d0 group creation form can now be submitted!
Whoops
2021-09-24 15:04:52 +10:00
Hugh Rundle
4e93b09067 create group form
adds a group creation form to user dashboard
2021-09-24 14:12:36 +10:00
Hugh Rundle
e07a25e288 add groups urls 2021-09-24 07:52:40 +10:00
Hugh Rundle
99b533510a add group templates 2021-09-24 07:51:51 +10:00
Hugh Rundle
71b1c6117c update templates for groups 2021-09-24 07:50:57 +10:00
Hugh Rundle
b74cd37096 add models for groups 2021-09-24 07:49:54 +10:00
Hugh Rundle
3e3c90ec03 add views for groups 2021-09-24 07:49:25 +10:00
Mouse Reeve
c465c70c22 Handles statuses with no readthrough updates 2021-09-22 17:06:06 -07:00
Mouse Reeve
d510d72b8d Fixes syntax in reading view 2021-09-22 16:41:43 -07:00
Mouse Reeve
a96d027cf3 Easier to read first-item-or-none list logic 2021-09-22 16:16:53 -07: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
f55803b409 Fixes updating readthroughs 2021-09-22 12:47:50 -07:00
Mouse Reeve
6bb0f3bc8f
Merge pull request #1453 from bookwyrm-social/status-whitespace
Preserve whitespace in statuses
2021-09-22 12:32:53 -07:00
Mouse Reeve
4a3bf1d92d Updates active readthrough templatetag 2021-09-22 12:27:57 -07:00
Mouse Reeve
3eb49f3f74 Preserve whitespace in statuses 2021-09-22 12:18:12 -07:00
Mouse Reeve
fa6e5605d1 Fixes goal url 2021-09-22 12:16:51 -07:00
Mouse Reeve
a05ef1a222 Adds active field to readthrough model 2021-09-22 11:23:56 -07:00
Mouse Reeve
d5dba9e66d
Merge pull request #1449 from bookwyrm-social/model-cleanup
Model cleanup
2021-09-22 11:20:39 -07:00
Mouse Reeve
50ca3eef31 Encompass all status models in notification signal 2021-09-22 11:10:37 -07:00
Mouse Reeve
b7c2fb600a String formatting for status view tests 2021-09-22 10:55:51 -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
41d34c6d4b Correctly use custom postgres ports 2021-09-22 08:13:31 -07:00
Mouse Reeve
5ad315faac
Merge pull request #1421 from bookwyrm-social/pylint-update
Pylint update
2021-09-20 18:16:43 -07:00
Mouse Reeve
673f49bf21 Tests fixes 2021-09-20 18:01:12 -07:00
Mouse Reeve
70f66f4cd4
Merge pull request #1439 from bookwyrm-social/search-placeholder
Updates search box placeholder for logged out users
2021-09-20 17:42:05 -07:00
Mouse Reeve
90c74f00c9 Fixes missing f format in preview image string
plus a unit test for it
2021-09-20 17:40:59 -07:00
Mouse Reeve
1be33c97a2 Fixes string formatting in site model 2021-09-20 17:19:26 -07:00
Mouse Reeve
a74141ece4 Adds site models tests 2021-09-20 17:19:20 -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
467c6ff266
Merge pull request #1441 from bookwyrm-social/query-efficiency
Query efficiency
2021-09-20 16:25:00 -07:00
Mouse Reeve
89fad59793 Query efficiency in user view 2021-09-20 15:25:29 -07:00
Mouse Reeve
aa0ffd86c0 Fetch related items when loading list page 2021-09-20 14:49:07 -07:00
Mouse Reeve
22ead6ba46 More efficient followers query 2021-09-20 14:29:01 -07:00
Mouse Reeve
a304333acf Don't show delete button in create list form 2021-09-20 14:25:11 -07:00
Mouse Reeve
1ed3d4dde1 Updates search box placeholder for logged out users 2021-09-20 12:28:08 -07:00
Mouse Reeve
7c23d687b1 Use icon for content warning
This creates consistency between the compose box and the status display
2021-09-19 09:30:06 -07:00
Mouse Reeve
f772210d05 Clips tiles on discover view 2021-09-19 09:21:13 -07:00
Mouse Reeve
bc693216c6
Merge pull request #1428 from bookwyrm-social/cw-style
Visually differentiates content warnings from statuses
2021-09-19 08:55:12 -07:00
Mouse Reeve
a119c69592 Use dash instead of vertical line to separate page name and site name 2021-09-18 17:09:18 -07:00
Mouse Reeve
e6c2ea1fbf Visually differentiates content warnings from statuses 2021-09-18 17:00:01 -07:00
Mouse Reeve
b1984aeaf7
Merge pull request #1427 from bookwyrm-social/reply-cws
Reply cws
2021-09-18 16:40:38 -07:00
Mouse Reeve
c8aa0e9330 Send dms through http post 2021-09-18 16:28:38 -07:00
Mouse Reeve
cdab2cbf2c Fixes content warnings on replies 2021-09-18 16:27:13 -07:00
Mouse Reeve
c664c0e9b5
Merge pull request #1426 from bookwyrm-social/register-view
Improvements to register view
2021-09-18 16:13:53 -07:00
Mouse Reeve
40040b39da Fixes incorrect close tag 2021-09-18 16:04:11 -07:00
Mouse Reeve
6f0b1d10bb Fixes line length 2021-09-18 16:00:21 -07:00
Mouse Reeve
d80feb7470 Renames landing layout template 2021-09-18 15:56:29 -07:00
Mouse Reeve
38c66b208c Adds customizable invite request copy 2021-09-18 15:45:04 -07:00
Mouse Reeve
1be4f31a9e Cleans up display of login page 2021-09-18 15:15:48 -07:00
Mouse Reeve
246ab992ae Consistent layout for invite registration page 2021-09-18 15:10:25 -07:00
Mouse Reeve
385da1ea43 Handle get request to /register path 2021-09-18 15:08:02 -07:00
Mouse Reeve
7901da3b74
Merge pull request #1425 from bookwyrm-social/delete-and-redraft
Fixes form submission from compose view
2021-09-18 15:07:09 -07:00
Mouse Reeve
7a6a4cd7c1
Merge pull request #1424 from bookwyrm-social/checkall
Fixes select all checkbox
2021-09-18 15:02:55 -07:00
Mouse Reeve
01ffb8d77b Fixes form submission from compose view 2021-09-18 14:56:20 -07:00
Mouse Reeve
dda36f22c2 Fixes select all checkbox 2021-09-18 14:48:03 -07:00
Mouse Reeve
293962326c Tick javascript hash 2021-09-18 14:32:30 -07:00
Mouse Reeve
19e36eb181 Fixes content warning fields in modals 2021-09-18 14:05:17 -07:00
Mouse Reeve
0fe5cb1000 Show label for content warning field 2021-09-18 11:56:32 -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
6022e7b232 Adds IP blocklist views 2021-09-17 13:04:10 -07:00
Mouse Reeve
8a5004d947 Adds migration 2021-09-17 12:00:00 -07:00
Mouse Reeve
2a2dddf5f4 Adds IP blocklist model 2021-09-17 11:58:59 -07:00
Mouse Reeve
16854a52bc Adds ip block middleware 2021-09-17 11:47:46 -07:00
Mouse Reeve
252fff8bfe Create middleware directory 2021-09-17 11:31:19 -07:00
Mouse Reeve
967e26ce48 Updates connector manager tests 2021-09-17 11:29:10 -07:00
Mouse Reeve
1465385452 Python formatting 2021-09-16 15:29:06 -07:00
Mouse Reeve
d9284ede9b updates search tests 2021-09-16 15:27:06 -07:00
Mouse Reeve
8c4cafed79 Fixes formatting isbn endpoint results 2021-09-16 12:53:27 -07:00
Mouse Reeve
22af7ece71 Fixes SearchResult imports in tests 2021-09-16 12:41:30 -07:00
Mouse Reeve
4cdf895d77 Removes references to local field in connector tests 2021-09-16 12:29:02 -07:00
Mouse Reeve
beb482f1db Linter fixes
Temporarily disables C0209 because it's out of scope to fix here
2021-09-16 11:47:44 -07:00