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

829 commits

Author SHA1 Message Date
Mouse Reeve
e6a251fdad Updates mocks across tests 2021-11-12 10:07:38 -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
915c41f59f Merge branch 'main' into import-field-names 2021-11-11 14:08:16 -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
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
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
aeef472ee1 Fixes flow in checking software for broadcast 2021-11-10 09:33:00 -08:00
Mouse Reeve
e19c4620ce Don't broadcast imported reviews outside bookwyrm 2021-11-08 12:00:08 -08: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
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
bd20c9ce2c remove followers group visibility test 
Also updates description of group.followers_filter() override
 2021-10-22 18:42:18 +11:00
Mouse Reeve
9d4e0851a0
Merge branch 'main' into image-absolute-url-getter 2021-10-20 15:12:06 -07: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
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
6f13c0d808 formatting fix 2021-10-16 16:09:03 +11:00
Hugh Rundle
97ea61dd7e efficiency improvement to remove_from_group 2021-10-16 08:17:42 +11: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
c6caa5a3f4 Fixes privacy display 2021-10-15 13:26:02 -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
117e6a08b2 Merge branch 'main' into markdown 2021-10-15 10:06:34 -07:00
Mouse Reeve
b11b810ec9 Use edit date to track is status has been updated 2021-10-15 08:56:07 -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
af567ba05e Edit posts in original markdown syntax 2021-10-14 18:34:26 -07:00
Mouse Reeve
175df2181c Adds edited field to status model 2021-10-14 17:33:04 -07:00
Mouse Reeve
cc650e235b Fixes privacy filters for followers-only replies 2021-10-14 16:26:28 -07:00
Hugh Rundle
726217577f linting 2021-10-10 13:18:16 +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
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
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
05bde27944 remove commented out code 2021-10-08 18:46:30 +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
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
15105bda4f Remove follow suggestion on request 2021-10-06 06:48:44 -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
cc8db1c353 linting fixes 
- remove unused imports
- add class docstrings
 2021-10-05 09:05:20 +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
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
c04659984f fix raise_not_editable for group lists 2021-10-03 13:45:19 +11: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
77ac8e0c04 add group membership to raise_not_deletable for lists 2021-10-03 11:45:53 +11: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
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
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
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
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
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
0cd55147ee Set thread id on parent status 2021-10-01 14:41:30 -07:00
Mouse Reeve
b8fd909fe3 Adds thread id to status model 2021-10-01 14:12:03 -07:00
Mouse Reeve
5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve
2f93e6d723 Merge branch 'main' into book-format-choices 2021-09-29 11:33:06 -07:00
Mouse Reeve
6ae8215f41 Adds comment 2021-09-28 17:21:35 -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
dba0aaff2c Adds description field to shelf 2021-09-28 16:36:47 -07:00
Hugh Rundle
66494e7788 fix reverse reference to user bookwyrm_groups 2021-09-28 18:53:11 +10:00
Mouse Reeve
62ff9d6199 Python formatting 2021-09-27 16:08:52 -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
bc87856c2e Merge branch 'main' into book-format-choices 2021-09-27 10:29:12 -07: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
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
5fccb991a7 remove list from group when changing curation 
Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
 2021-09-26 18:28:16 +10:00
Hugh Rundle
686198472d update group and list models 
- remove GroupList model
- add a group foreign key value  to List model
- remove reference to lists in Group model
 2021-09-26 15:50:15 +10:00
Hugh Rundle
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
b74cd37096 add models for groups 2021-09-24 07:49:54 +10:00
Mouse Reeve
c54609d7fd Refactors how readthroughs get updated 2021-09-22 16:08:25 -07:00
Mouse Reeve
8648bdc879 Merge branch 'main' into refactor-readthroughs 2021-09-22 15:08:58 -07:00
Mouse Reeve
2160a5c729 Newly created readthroughs are active by default 2021-09-22 13:00:38 -07:00
Mouse Reeve
a05ef1a222 Adds active field to readthrough model 2021-09-22 11:23:56 -07:00
Mouse Reeve
50ca3eef31 Encompass all status models in notification signal 2021-09-22 11:10:37 -07:00
Mouse Reeve
b1ff46a562 Remove unused import 2021-09-22 10:42:42 -07:00
Mouse Reeve
a4ac25bfae Move notifications to signals 2021-09-22 09:24:39 -07:00
Mouse Reeve
2419942770 Create model function to update user last active date 2021-09-22 08:35:20 -07:00
Mouse Reeve
673f49bf21 Tests fixes 2021-09-20 18:01:12 -07:00
Mouse Reeve
1be33c97a2 Fixes string formatting in site model 2021-09-20 17:19:26 -07:00
Mouse Reeve
ea303fb285 Updating string format synatx part 3 2021-09-20 16:45:26 -07:00
Mouse Reeve
cf3157a3b5 Merge branch 'main' into pylint-update 2021-09-20 16:31:27 -07:00
Mouse Reeve
6f0b1d10bb Fixes line length 2021-09-18 16:00:21 -07:00
Mouse Reeve
38c66b208c Adds customizable invite request copy 2021-09-18 15:45:04 -07:00
Mouse Reeve
08f6a97653 Python formatting 2021-09-18 11:33:43 -07:00
Mouse Reeve
acfb1bb376 Updating string format synatx part 2 2021-09-18 11:32:00 -07:00
Mouse Reeve
be86fbcf4d Merge branch 'main' into pylint-update 2021-09-18 07:46:12 -07:00
Mouse Reeve
377a4e1ef1 Updating string format syntax part 1 2021-09-17 21:39:18 -07:00
Mouse Reeve
2a2dddf5f4 Adds IP blocklist model 2021-09-17 11:58:59 -07:00
Mouse Reeve
1f06d1a1d8 Removes local connector 2021-09-14 15:26:36 -07:00
Mouse Reeve
717dc91d49 Merge branch 'main' into admin-tests 2021-09-11 17:43:45 -07:00
Mouse Reeve
d972ad2541 Merge branch 'main' into csv-import-failures 2021-09-11 14:42:59 -07:00
Mouse Reeve
992e478e95 Use readable/translatable strings for db choices 2021-09-11 14:23:47 -07:00
Mouse Reeve
3e7847e645 Set deactivation date 2021-09-11 09:00:52 -07:00
Mouse Reeve
430554444f Adds deactivation date to user model 
Also fixes django admin around saved lists
 2021-09-11 08:57:38 -07:00
Mouse Reeve
b36f7d7b69 Merge branch 'main' into csv-import-failures 2021-09-11 07:19:40 -07:00
Mouse Reeve
def4d89bf8 Adds short description to edit site form 2021-09-10 12:13:24 -07:00
Mouse Reeve
9413dacaf2 Updates instance info endpoint 2021-09-10 11:44:51 -07:00
Mouse Reeve
de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve
658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve
8717d8a675 Create new email domain block entries 2021-09-08 15:31:01 -07:00
Mouse Reeve
c705178c3b Adds create block form 2021-09-08 15:08:22 -07:00
Mouse Reeve
7a684a2f96 Adds model 2021-09-08 14:39:38 -07:00
Mouse Reeve
d9090e723d
Merge pull request #1384 from bookwyrm-social/generate-image-transaction 
Generate image task failing when transaction hasn't completed
 2021-09-08 12:17:58 -07:00
Mouse Reeve
88a65b0b88 Only re-rank on bookwyrm instances 2021-09-08 11:47:36 -07:00
Mouse Reeve
d3b3dd6d99 Update suggestions on domain block 2021-09-08 11:38:22 -07:00
Mouse Reeve
b826d29b0d Generate image task failing when transaction hasn't completed 2021-09-08 10:20:44 -07:00
Mouse Reeve
a5ef8aa6e9 Adds flag on user model to hide suggested users 2021-09-08 09:30:13 -07:00
Mouse Reeve
e0f5f13a5a Fixes guessing read dates from goodreads csv 2021-09-07 18:09:43 -07:00
Mouse Reeve
aa91361fe4 Fixes celery kwarg for queue 2021-09-07 17:09:44 -07:00
Mouse Reeve
de3f18655c Set priorities on tasks 2021-09-07 16:33:43 -07:00
Mouse Reeve
8a748fa675 Adds format fields to edit book view 2021-09-07 12:49:28 -07:00
Mouse Reeve
5a224b5aa4 Use atomic when creating new users 2021-09-07 10:09:28 -07:00
Mouse Reeve
22caf34d86 Merge branch 'main' into book-format-choices 2021-09-06 22:13:24 -07:00
Mouse Reeve
cb21099e0b Fixes serialization of delete activity 2021-09-06 12:00:10 -07:00
Mouse Reeve
ae81d6cf71 More tests 2021-09-06 11:55:04 -07:00
Mouse Reeve
5640ae4f7e Handle deletions of ordered collections 2021-09-06 11:24:08 -07:00
Mouse Reeve
b80de929fd Create and view quotation page numbers 2021-09-05 16:00:40 -07:00