Commit graph

2817 commits

Author SHA1 Message Date
Mouse Reeve
a20c4d583c Merge branch 'main' into pylint 2021-06-18 14:48:31 -07:00
Mouse Reeve
ea556bd83b
Merge pull request #1142 from joachimesque/opengraph-image-generation
Generate OpenGraph images for books, users, and site.
2021-06-18 14:47:54 -07:00
Mouse Reeve
c7d14cb957 Fixes regex import in urls file 2021-06-18 14:40:28 -07:00
Mouse Reeve
9e5c7053e9 More pylint fixes 2021-06-18 14:29:24 -07:00
Mouse Reeve
381d160105 Fixes init file 2021-06-18 14:17:05 -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
7775d943d4 Fixes list link to user profile 2021-06-18 12:11:07 -07:00
Joachim
7e26a38403 Fix summary image format 2021-06-18 19:15:36 +02:00
Joachim
5d41781e6a Fix scheme 2021-06-18 19:15:24 +02:00
Joachim
e07672fff1 Fix tests 2021-06-18 18:28:24 +02:00
Mouse Reeve
22636041ba Use null instead of zero for unrated review 2021-06-17 17:47:46 -07:00
Mouse Reeve
973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Mouse Reeve
321554f17e
Merge pull request #1181 from bookwyrm-social/search-cleanup
Minor simplifications to search queries
2021-06-17 14:57:17 -07:00
Mouse Reeve
4141323783
Merge pull request #1148 from arkhi/frontend/subtitle
Update subtitle behaviour
2021-06-17 14:55:55 -07:00
Mouse Reeve
1f071d3c18
Merge pull request #1180 from bookwyrm-social/search-timeout
Adds timeouts to get requests
2021-06-17 14:51:05 -07:00
Mouse Reeve
59643c02a3 Python formatting 2021-06-17 14:48:19 -07:00
Mouse Reeve
5d3639e47f Minor simplications to search queries 2021-06-17 14:46:58 -07:00
Mouse Reeve
c16baea40d
Merge pull request #1175 from bookwyrm-social/dedplicate-boosts
Don't show duplicated statuses after boosts
2021-06-17 13:43:43 -07:00
Mouse Reeve
2a6339cf21 Fixes redis interaction mock 2021-06-17 13:10:01 -07:00
Mouse Reeve
8b657bbcb1 Updates model test 2021-06-17 12:58:37 -07:00
Mouse Reeve
cf3869ad32 Adds timeouts to get requests 2021-06-17 12:34:54 -07:00
Fabien Basmaison
cc03460e00 Avoid space within parenthesises for series when no number is provided. 2021-06-17 17:18:55 +02:00
Fabien Basmaison
7f01dcf3b9 Merge branch 'main' into frontend/subtitle 2021-06-17 17:12:23 +02:00
Mouse Reeve
75df210193 Python formatting 2021-06-14 17:01:53 -07:00
Mouse Reeve
8946332023 More fixes for more tests 2021-06-14 16:56:47 -07:00
Mouse Reeve
27a3d0ae96
Merge branch 'main' into 253-user-post-privacy-v2 2021-06-14 16:47:57 -07:00
Mouse Reeve
0d16d3c5a4
Merge pull request #1177 from bookwyrm-social/user-page-scroll
Small ui fixes
2021-06-14 16:41:32 -07:00
Mouse Reeve
c3a09a6331 More test fixes 2021-06-14 16:39:54 -07:00
Mouse Reeve
ef71da7ef0 Fixes interaction tests 2021-06-14 16:23:17 -07:00
Mouse Reeve
c4f7f34ad4 Fixes edit readthrough toggle display 2021-06-14 16:04:58 -07:00
Mouse Reeve
3600f6ca3c Handle overflow text in notifications 2021-06-14 16:00:17 -07:00
Mouse Reeve
a82bf99bd6 Icon-only link display on mobile for text links 2021-06-14 15:55:26 -07:00
Mouse Reeve
fe2309f0bc Fixes orientation of edition want to read menu 2021-06-14 15:45:39 -07:00
Mouse Reeve
f307edf732 Use elided page range for invites 2021-06-14 15:39:54 -07:00
Mouse Reeve
5a236e333f Fixes directory profile link 2021-06-14 15:33:03 -07:00
Mouse Reeve
cd014e43ad Python formatting 2021-06-14 15:29:07 -07:00
Mouse Reeve
2a606eec3e scroll horizontally on user page shelf preview 2021-06-14 15:27:37 -07:00
Mouse Reeve
290a99bf17 Fixes renaming images on save 2021-06-14 15:19:54 -07:00
Mouse Reeve
52adfbf5da Don't show duplicated statuses after boosts 2021-06-14 14:47:59 -07:00
Mouse Reeve
6d42f2bb1e
Merge pull request #1172 from bookwyrm-social/import-lookup
Don't try title/author search when isbn search fails
2021-06-14 12:49:54 -07:00
Mouse Reeve
f4a6e18759
Merge pull request #1173 from bookwyrm-social/series-space
Fixes trailing space in series text
2021-06-14 12:49:41 -07:00
Mouse Reeve
6e6354bcce Fixes trailing space in series text
Fixes #1145
2021-06-14 12:34:11 -07:00
Mouse Reeve
d4e2a06092
Merge pull request #1171 from bookwyrm-social/import-text
Clarifies wording on pending imports
2021-06-14 12:31:38 -07:00
Mouse Reeve
46be7292fd Don't try title/author search when isbn search fails 2021-06-14 12:30:43 -07:00
Mouse Reeve
9a67c61487 Clarifies wording on pending imports
Fixes #1118
2021-06-14 11:59:44 -07:00
Mouse Reeve
e98138e84f Show users as deleted in admin view 2021-06-14 11:38:54 -07:00
Mouse Reeve
607bfa9160 Python formatting 2021-06-14 11:16:41 -07:00
Mouse Reeve
557aa2005b Adds test for delete view 2021-06-14 11:15:00 -07:00
Mouse Reeve
8cd6712db3 Let users delete their accounts 2021-06-14 10:44:25 -07:00
Mouse Reeve
7ae64c2a68 Splits user view out and adds template 2021-06-14 10:01:21 -07:00
Fabien Basmaison
17635b47db Fix case where there is no subtitle.
Consequentially change back author to being a subtitle.
2021-06-11 09:41:55 +02:00
Fabien Basmaison
cf751a8efa Merge branch 'main' into frontend/subtitle 2021-06-11 08:49:46 +02:00
Mouse Reeve
a4afbccb3a Fixes straggling reading view test name 2021-06-09 11:36:17 -07:00
Mouse Reeve
ce4a57e5c9 Reading status view name 2021-06-09 11:16:52 -07:00
Mouse Reeve
4107f7ddf1 Updates readthrough tests 2021-06-09 11:07:15 -07:00
Mouse Reeve
3c7c8a1797 Fixes urls in fallback mode 2021-06-09 11:05:05 -07:00
Mouse Reeve
113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Fabien Basmaison
6be97a6102 Be consistent between variable name & logic. Equal is already too short. 2021-06-09 19:03:15 +02:00
Fabien Basmaison
c4072cbc04 Be nice to Black and follow styleguides. 2021-06-09 18:54:05 +02:00
Fabien Basmaison
0ecea5710b Use gettext to add subtitle to short titles (use variable for length). 2021-06-09 18:51:20 +02:00
Fabien Basmaison
f58c1d1138 Tweak styles for subtitle:
- Make it bold as the title while preserving consistency with other subtitles.
- Pull the author closer to the subtitle to preserve a descending visual and typographic scales.
2021-06-09 12:20:34 +02:00
Fabien Basmaison
5047b8bf94 Do not break document structure with ratings. 2021-06-09 11:12:38 +02:00
Fabien Basmaison
b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Mouse Reeve
625ab46059 Removes start reading with progress test
There's no way to do this from the ui???? I don't tihnk there ever
was???
2021-06-08 15:03:50 -07:00
Mouse Reeve
a00fdc6864 Updates tests for reading views 2021-06-08 14:42:55 -07:00
Mouse Reeve
e65bc09e7a Linter fixes 2021-06-08 12:42:45 -07:00
Mouse Reeve
eb12506985 No script fallback mode 2021-06-08 12:40:01 -07:00
Mouse Reeve
3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve
b5d0a9e0b4 Removes deplicate progress code form reading views 2021-06-08 11:43:30 -07:00
Mouse Reeve
1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Mouse Reeve
45146b4999 Convert start and finish reading into view classes 2021-06-08 11:10:39 -07:00
Joachim
689fefb096 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-08 18:20:57 +02:00
Mouse Reeve
948a5dea10 Cleans up .env and settings files
Some outdated stuff doesn't need to be in there
2021-06-07 12:53:57 -07:00
Joachim
f287a19f12 Update settings.py 2021-06-07 18:31:01 +02:00
Joachim
715cb46e1e Lint 2021-06-07 18:15:48 +02:00
Joachim
b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Joachim
cba34780d8 Use S3 as static and media storage
TODO

- [ ] Write some documentation for non-AWS, S3-compatible services
- [ ] Make a management command to move existing media to the new S3 bucket
- [ ] See if Nginx can reverse-proxy the S3 bucket in order to keep the files accessible through the domain name
2021-06-07 18:12:48 +02:00
Mouse Reeve
5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language
Use "instance" consistently
2021-06-06 14:07:49 -07:00
Mouse Reeve
4ea672f2a1
Merge pull request #1157 from bcj/bcj/urlencode-redis-password
URL-Encode password in broker_url
2021-06-05 12:51:25 -07:00
Mouse Reeve
c8d2df1203
Merge pull request #1155 from joachimesque/front-modal-title-fit
Front: Modal title fit
2021-06-05 12:43:35 -07:00
Mouse Reeve
d1e33e14e2
Merge pull request #1154 from joachimesque/front-better-forms
Front-end: Better forms
2021-06-05 12:38:20 -07:00
Mouse Reeve
61e55628fa
Merge pull request #1131 from joachimesque/author-page-microformats
Author page microformats
2021-06-05 11:27:16 -07:00
Joachim
6f105fcdcc Front: Modal title fit 2021-06-02 18:56:24 +02:00
Joachim
49c057625a Smol fixes 2021-06-02 18:30:36 +02:00
Joachim
7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Mouse Reeve
2816d7cc88 Use "instance" consistently 2021-06-01 14:50:14 -07: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
cd7c0ccaea Enable env on GitHub Actions 2021-05-29 15:51:56 +02:00
Joachim
ba39dad06c Add save_and_cleanup test 2021-05-29 15:32:04 +02:00
Joachim
00b09cd07d Try with logging 2021-05-29 14:43:06 +02:00
Joachim
fbb262fe88 Try logging output 2021-05-29 13:44:43 +02:00
Joachim
cc0881b11c Try another way 2021-05-29 12:33:04 +02:00
Joachim
022182e114 See if the image is saved in DB in the Github Actions test environment 2021-05-29 11:33:37 +02:00
Joachim
b4e2d8c6e3 Better refresh object in test 2021-05-29 11:17:59 +02:00
Joachim
0f80456a08 Save as JPG 2021-05-28 23:42:04 +02:00
Joachim
872084d61a Update test_preview_images.py 2021-05-28 23:41:41 +02:00
Joachim
9cee119200 test 2021-05-28 23:29:28 +02:00
Joachim
0e28b79089 third time's the charm 2021-05-28 22:10:57 +02:00
Joachim
71bc35224b no, this will work 2021-05-28 22:00:26 +02:00
Joachim
8755b92c2e Fix GitHub FileNotFoundError 2021-05-28 21:40:20 +02:00
Joachim
2bf254bce7 Update test_preview_images.py 2021-05-28 21:26:13 +02:00
Joachim
ec159ebcb0 Test generating preview images 2021-05-28 21:24:45 +02:00
Joachim
08cebd7051 Lint 2021-05-28 17:26:43 +02:00
Joachim
61367c3f4f Protect generate_preview_images command
- add `--all` argument
- send computation intensive tasks to Celery
2021-05-28 17:25:20 +02:00
Joachim
f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02:00
Mouse Reeve
b29ca22227 A couple test mocks 2021-05-27 17:29:24 -07:00
Joachim
878cc5cb17 Lint 2021-05-27 23:21:47 +02:00
Joachim
f8df501239 Fix tests (for realz) 2021-05-27 23:19:17 +02:00
Joachim
d9d34d8220 Fix linting 2021-05-27 21:40:23 +02:00
Joachim
b7965ce2ae Fix tests 2021-05-27 21:37:27 +02:00
Joachim
b8bff8a882 Use field tracker to launch task on field change 2021-05-27 21:09:57 +02:00
Joachim
2ea1cd8319 Tests 2021-05-26 23:57:29 +02:00
Joachim
f848dcd756 Fix issue with protocol 2021-05-26 18:20:22 +02:00
Joachim
e214d8b879 Rationalize paths handling 2021-05-26 17:55:39 +02:00
Joachim
e362c82495 Expose static & media paths 2021-05-26 17:54:59 +02:00
Joachim
7ea3153026 Fix site_path tag 2021-05-26 16:57:28 +02:00
Joachim
3ea935e7ce Update OFL.txt 2021-05-26 15:49:08 +02:00
Joachim
f7b117e4fb Update preview_images.py 2021-05-26 15:46:40 +02:00
Joachim
a8ae3c9950 Modify inner image position 2021-05-26 15:37:09 +02:00
Joachim
22c13f639c Update layout.html 2021-05-26 15:18:35 +02:00
Joachim
5943e6d79a Black 2021-05-26 15:18:05 +02:00
Joachim
d4fc1b0fdf Fix line endings 2021-05-26 15:17:28 +02:00
Joachim
4db8aa85f0 Fix migration 2021-05-26 14:55:55 +02:00
Joachim
eb56cced8d Lint 2021-05-26 14:46:34 +02:00
Joachim
e5e549d125 Add opengraph image depending on context 2021-05-26 14:44:15 +02:00
Joachim
65de40a95a Add generate_preview_images command 2021-05-26 13:52:10 +02:00
Fabien Basmaison
c894f5ef35 Update subtitle behaviour:
- on Book
	- Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar).
	- Update view.
	- Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata.
	- The author is not a subtitle, just data.
- Use parenthesis in the `get_title` filter instead of punctuation.
2021-05-26 13:21:06 +02:00
Joachim
b47edc5f0d Add dark mode 2021-05-26 13:07:33 +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
fd82567cbf Update 0076_book_preview_image.py 2021-05-26 09:16:15 +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
5b03934ec3 Update preview_images.py 2021-05-25 23:16:33 +02:00
Joachim
e305c5d73d Fix color 2021-05-25 23:12:54 +02:00
Joachim
dca0888d5d Thank you Black 2021-05-25 23:05:38 +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
Joachim
b72580daf6 Update author.html 2021-05-24 17:17:12 +02:00
Mouse Reeve
ea0f7ff925
Merge pull request #1137 from bookwyrm-social/title-header
Uses correct filter for book title
2021-05-24 07:21:12 -07:00
Mouse Reeve
f058aa8f1d Uses correct filter for book title 2021-05-24 06:54:43 -07:00
Joachim
25858ed3aa Added LibraryThing and Goodreads links 2021-05-24 12:51:41 +02:00
Joachim
594f7b3708 Style fixes 2021-05-24 12:51:18 +02:00
Joachim
58c07d1677 Apply review suggestions 2021-05-24 12:36:48 +02:00
bcj
31deb36c85 URL-Encode password in broker_url
Needed to prevent connection errors if the password contains non-urlsafe characters.

Dockerfile change because all the services using it are mirroring ./ in /app now anyway.
Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function).
2021-05-23 23:49:12 -05:00
Jason Kelly
b362b72c57 Python linting 2021-05-24 09:35:21 +08:00
Joachim
55a3a28d49 Add microformats to author page 2021-05-23 21:17:14 +02:00
Joachim
6e9c9e839c Fix date of death display 2021-05-23 20:25:42 +02:00
Mouse Reeve
c9b337348e
Merge pull request #1126 from bookwyrm-social/deleted-ratings
Don't show deleted ratings in stars
2021-05-23 09:00:53 -07:00
Mouse Reeve
ca8067769c Don't show deleted ratings in stars 2021-05-23 08:48:00 -07:00
Mouse Reeve
4e9c7a7748
Merge pull request #1070 from bookwyrm-social/top-bar
Top bar
2021-05-23 08:42:14 -07:00
Joachim
354b511089 Fix flex styles 2021-05-23 17:18:16 +02:00
Joachim
1aa319d6ee Move description text below header 2021-05-23 17:17:46 +02:00
Joachim
cf7cbfdf8f Fix title styles 2021-05-23 17:17:30 +02:00
Joachim
9eb719106f Fix display bug 2021-05-23 17:17:02 +02:00
Joachim
251c8bbd08 Merge remote-tracking branch 'upstream/main' into list-style-fixes 2021-05-23 15:14:50 +02:00
Joachim
0708d64bf1 Update bookwyrm.css 2021-05-23 12:10:57 +02:00
Jason Kelly
7eb5f3b026 Making magic number more readable 2021-05-23 14:31:22 +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
Jason Kelly
c9617c4bd3 Added EMAIL_BACKEND to env settings to be able to use console backend in local dev. 2021-05-23 14:09:13 +08:00
Mouse Reeve
f987a352c6 Fixes username helper 2021-05-22 21:33:56 -07:00
Mouse Reeve
bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -07:00
Mouse Reeve
9285f483c2 Query tweaks for book page 2021-05-22 20:14:57 -07:00
Mouse Reeve
2d4cec4422 Improves shelf page query efficiency a little 2021-05-22 19:54:50 -07:00
Mouse Reeve
7a4c4248df Improves status template performance
Reduces queries about about 65
2021-05-22 19:01:40 -07:00
Mouse Reeve
e5ff4ac36d Python formatting 2021-05-22 18:02:14 -07:00
Mouse Reeve
3d3ab6433e Improves query efficiency for shelve buttons
About 50 fewer queries (yikes)
2021-05-22 17:58:08 -07:00
Mouse Reeve
368d2cd716 Reduces feed page queries for goals
9 fewer queries
2021-05-22 17:34:16 -07:00
Mouse Reeve
98e537280e Adds management command for populating suggestions 2021-05-22 16:10:11 -07:00
Mouse Reeve
5174260351 Python formatting 2021-05-22 15:57:08 -07:00
Mouse Reeve
edfc27a3cd Moves suggestion logic to celery 2021-05-22 15:53:07 -07:00
Mouse Reeve
644e5926db Remove suggested users on block 2021-05-22 14:05:59 -07:00
Mouse Reeve
9250b8b85d Handle follow/unfollow 2021-05-22 13:02:37 -07:00
Mouse Reeve
42699a8d25 Update your own suggestions on shelve 2021-05-22 12:20:23 -07:00
Mouse Reeve
f849d785a5 Functional un-discoverable setting 2021-05-22 12:10:14 -07:00
Mouse Reeve
29130d5f44 Detect new users and users with updated discoverability 2021-05-22 11:58:33 -07:00
Mouse Reeve
0044dc6587 Show suggested users when the feed is empty 2021-05-22 11:29:41 -07:00
Mouse Reeve
f98576bc25 Only create suggestions stores for local users 2021-05-22 11:01:35 -07:00
Mouse Reeve
2ff79c9953 Fixes python formatting 2021-05-22 09:55:38 -07:00
Mouse Reeve
d33b55e025 Hide delete button text on mobile 2021-05-21 09:52:40 -07:00
Mouse Reeve
00eba98e9f Fixes display of announcement show/hide button on mobile 2021-05-21 09:50:23 -07:00
Mouse Reeve
ea56d42906
Merge pull request #1116 from bookwyrm-social/import-async-error
Don't error when task for import no longer exists
2021-05-20 21:14:15 -07:00
Mouse Reeve
8772f26b91 Don't error when task for import no longer exists 2021-05-20 20:35:12 -07:00
Mouse Reeve
07fc4a2efc
Merge branch 'main' into suggestions-redis 2021-05-20 20:25:15 -07:00
Mouse Reeve
a70c713c29 Fixes default values in edit announcement form 2021-05-20 20:21:04 -07:00
Mouse Reeve
d39374f13c Fixes editions page 2021-05-20 18:41:36 -07:00
Mouse Reeve
9933b888f9
Merge pull request #1112 from bookwyrm-social/search-null-state
Fixes search null state view
2021-05-20 16:49:46 -07:00
Mouse Reeve
e74bb4e33c
Merge pull request #1111 from bookwyrm-social/rss-templates
Moves rss templates to base level directory
2021-05-20 16:40:41 -07:00
Mouse Reeve
6cadba78fe Python formatting 2021-05-20 16:38:12 -07:00
Mouse Reeve
a8a8398cf8 Fixes search null state view 2021-05-20 16:34:32 -07:00
Mouse Reeve
ab3fb4d555 Adds test for search with no query 2021-05-20 16:32:44 -07:00
Mouse Reeve
b6c17defd7
Merge pull request #1108 from bookwyrm-social/ol-redirects
Handle openlibrary redirects
2021-05-20 16:18:51 -07:00
Mouse Reeve
2a451e83c6
Merge pull request #1109 from bookwyrm-social/invalid-image-url
Handle all kinds of invalid image urls
2021-05-20 16:18:44 -07:00
Mouse Reeve
c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -07:00
Mouse Reeve
5401d73909 404 instead of error for invalid post link 2021-05-20 16:06:23 -07:00
Mouse Reeve
f1d4f092f2 Handle all kinds of invalid image urls 2021-05-20 16:03:14 -07:00
Mouse Reeve
1e9211018d Handle openlibrary redirects 2021-05-20 15:55:50 -07:00
Mouse Reeve
f6440aa173 Correctly handles openlibrary works with no editions 2021-05-20 15:37:26 -07:00