rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity
5525 commits 16 branches 11 tags 32 MiB
Commit graph

3989 commits

Author SHA1 Message Date
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
4ba3234f6c
Merge branch 'main' into bookwyrm-groups 2021-10-07 17:27:11 -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
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