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
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
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
Mouse Reeve
4ba3234f6c
Merge branch 'main' into bookwyrm-groups
2021-10-07 17:27:11 -07:00
Mouse Reeve
982cd49c51
Fixes english grammar weirdness
2021-10-06 16:33:07 -07:00
Mouse Reeve
26de524247
Update language on login and edit preference
2021-10-06 13:01:29 -07:00
Mouse Reeve
73a8f89bee
Merge branch 'main' into bookwyrm-groups
2021-10-06 11:37:38 -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
4c539bc7eb
Fixes image paths in endpoints
2021-10-06 08:49:07 -07: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
6fde19e9b1
lint fixes
2021-10-05 21:29:33 +11:00
Hugh Rundle
b1bb43d143
lint Group views file
2021-10-05 18:04:47 +11:00
Hugh Rundle
484e9ed959
fix user Groups view pagination function
2021-10-05 08:14:52 +11: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
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
Hugh Rundle
da53bad0f5
make Black happy
2021-10-04 22:22:00 +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
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
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
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
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
9d8e978686
sort group members in UserGroups view
2021-10-03 13:45:41 +11:00
Mouse Reeve
c821aaa18e
Load status ancestors
2021-10-02 19:22:11 -07: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
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
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
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
085d3270a3
Load related objects in query
...
Reduces query load in template
2021-10-02 10:11:27 -07:00
Mouse Reeve
df8f67895c
Adds mention notification template
2021-10-02 08:09:57 -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
29f18ee123
only suggest local users as potential group members
2021-10-02 19:35:57 +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
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
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
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
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
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
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
6902ffc4c3
Adds missing view file
2021-09-30 22:22:32 -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
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
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
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
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
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
183e76eb2a
Adds test for shelf
2021-09-28 16:18:32 -07:00
Mouse Reeve
d9945ac5e3
Updates references to templates
2021-09-28 16:04:08 -07:00
Mouse Reeve
21fee19b42
Use recently active as the default sort order
2021-09-28 15:51:49 -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
a9eb544bac
Moves blocks views and tests into preferences dir
2021-09-28 11:44:53 -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
Hugh Rundle
66494e7788
fix reverse reference to user bookwyrm_groups
2021-09-28 18:53:11 +10: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
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
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
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
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
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
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
36c00c49ab
User viewer aware objects for feed suggested books
2021-09-27 11:37:50 -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
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
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
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
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
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
2874e52309
rationalise group creation and prep for group privacy
2021-09-27 15:34:14 +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
f3a3ba5f01
pass group value to list views and vice-versa
2021-09-26 15:56:02 +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
b645d75303
add and remove users from groups
2021-09-25 17:34:44 +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
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
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
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
2419942770
Create model function to update user last active date
2021-09-22 08:35: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
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
38c66b208c
Adds customizable invite request copy
2021-09-18 15:45:04 -07:00
Mouse Reeve
385da1ea43
Handle get request to /register path
2021-09-18 15:08:02 -07:00
Mouse Reeve
acfb1bb376
Updating string format synatx part 2
2021-09-18 11:32:00 -07:00
Mouse Reeve
6022e7b232
Adds IP blocklist views
2021-09-17 13:04:10 -07:00
Mouse Reeve
8c4cafed79
Fixes formatting isbn endpoint results
2021-09-16 12:53:27 -07:00
Mouse Reeve
0d5e05a3c2
Updates other calls to the search endpoint
2021-09-16 10:55:23 -07:00
Mouse Reeve
98325818b2
Display search results in api mode and regular
2021-09-16 10:44:33 -07:00
Mouse Reeve
1f06d1a1d8
Removes local connector
2021-09-14 15:26:36 -07:00
Mouse Reeve
be7fae2053
Show recent servers first
2021-09-12 10:02:15 -07:00
Mouse Reeve
0f3e71978e
Federated and blocked tabs
2021-09-11 14:41:52 -07:00
Mouse Reeve
03a5ac9c3f
Use elided page range for federated peer list
2021-09-11 14:27:42 -07:00
