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

761 commits

Author SHA1 Message Date
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
Mouse Reeve
57ef1522b5 Merge branch 'main' into readthrough-dates 2021-08-29 11:18:35 -07:00
Mouse Reeve
082c2708a7 Fixes attribution field logic 2021-08-29 08:50:46 -07:00
Mouse Reeve
8c8b1168d4 Support attribution field on boosts 2021-08-29 08:22:14 -07:00
Mouse Reeve
0569bce610 Cleaner string formatting in user model 2021-08-29 07:37:21 -07:00
Mouse Reeve
9eea60b35c Fixes call to followers url in serialization 2021-08-29 07:36:59 -07:00
Mouse Reeve
a5dcc0e5e4 Support multiple possible fields that indicate user ownership 2021-08-28 12:11:15 -07:00
Mouse Reeve
9c4fd1e602 Set user default values 2021-08-28 12:06:03 -07:00
Mouse Reeve
2c26b04119 Uses correct object to determine author 2021-08-28 11:30:54 -07:00
Mouse Reeve
dc72df7339 Generate likely followers url for existing users 2021-08-28 11:15:17 -07:00
Mouse Reeve
53d9ff87d9 Look up followers url to determine post privacy 2021-08-28 10:40:52 -07:00
Mouse Reeve
e9d951e4cd Add user model field for followers url 2021-08-28 10:33:57 -07:00
Mouse Reeve
01d82cfa3a Merge branch 'main' into readthrough-dates 2021-08-27 10:25:41 -07:00
Mouse Reeve
eca0ff371c Adds saved lists many to many field 2021-08-23 11:19:15 -07:00
Mouse Reeve
0829696add
Merge pull request #1138 from joachimesque/images-django-imagekit 
Generate thumnails for books
 2021-08-18 19:53:12 -06:00
Mouse Reeve
c2763f0c18
Merge pull request #1304 from bookwyrm-social/prevent-import-overwrite 
Prevent overwriting data on import form outside data source
 2021-08-17 12:13:12 -06:00
Mouse Reeve
ad0fff7030 Prevent overwriting data on import form outside data source 2021-08-17 10:08:07 -07:00
Mouse Reeve
2d20fa4146 Adds reading status field to book statuses 2021-08-16 13:32:12 -07:00
Mouse Reeve
1e1bf83201 Create abstract parent class for book statuses 2021-08-16 13:14:29 -07:00
Mouse Reeve
45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -06:00
Mouse Reeve
1be125fc1d Adds database constraint for readthrough dates 2021-08-11 11:19:06 -07:00
Mouse Reeve
1b4db49035 Fixing bug preventing csv imports to match via title/author 2021-08-10 14:30:28 -07:00
Mouse Reeve
ef1896da18 Return confidence rating 2021-08-10 14:02:22 -07:00
Mouse Reeve
fa396d4bc8 Save best-guess search results on import 2021-08-10 13:54:52 -07:00
Mouse Reeve
6301656a0e Fixes setting book results from title/author search 2021-08-10 13:46:20 -07:00
Mouse Reeve
65e982e35b Uses more general requests exception 2021-08-08 18:13:02 -07:00
Mouse Reeve
5926224d7e Confirm email views 2021-08-06 16:26:46 -07:00
Mouse Reeve
247a7f7489 Email confirmation email 2021-08-06 15:38:37 -07:00
Mouse Reeve
3e2f1806e9 Adds email confirmation code field 2021-08-06 14:42:18 -07:00
Joachim
6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve
2e7dd9d4ef Fixes over-reporting user last active date 2021-08-05 19:52:15 -07:00
Mouse Reeve
fd0f9324d3 Merge branch 'main' into book-format-choices 2021-08-04 14:13:55 -07:00
Mouse Reeve
9bbdde1597 Python formatting 2021-08-04 10:58:23 -07:00
Mouse Reeve
63c8301eb9 Merge branch '253-user-post-privacy-v2' of https://github.com/ibrand/bookwyrm into ibrand-253-user-post-privacy-v2 2021-08-04 10:44:30 -07:00
Mouse Reeve
97b643ac72
Merge pull request #1243 from bookwyrm-social/fixes-set-remote-server 
Fixes remote server not getting set
 2021-08-04 11:35:49 -06:00
Joachim
c1673ef717 Update fields.py 2021-08-04 19:25:19 +02:00
Joachim
0db3512eb3 Revert previous commit 2021-08-04 19:21:56 +02:00
Joachim
ee39e8c036 Fix R0201: Method could be a function (no-self-use) 2021-08-04 19:16:24 +02:00
Joachim
c6f8236b07 Fix tests 2021-08-04 19:11:57 +02:00
Joachim
bc7710a4a7 Update Status Model Test 2021-08-04 18:18:18 +02:00
Mouse Reeve
89acfa4f3e Patches stray redis calls 2021-08-04 08:50:50 -07:00
Joachim
60e805ac2b Fix tests 2021-08-04 17:39:46 +02:00
Joachim
7a716db48a lint 2021-08-04 16:56:07 +02:00
Joachim
b8b491bbf2 Add get_absolute_url to ImageField 2021-08-04 16:55:12 +02:00
Joachim
843127efa8 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-08-04 10:00:20 +02:00
Mouse Reeve
ebc0680288 Fixes logic error in detecting changed fields when serializing 2021-08-03 12:21:11 -07:00
Mouse Reeve
cfbe1b29cd Pass update fields when ticking last active date 2021-08-03 09:12:22 -07:00
Mouse Reeve
a84a744e8d Track changed fields in activity to model code 2021-08-03 08:48:15 -07:00
Mouse Reeve
ee7bdc956a Streamline saves on user create 2021-08-03 07:43:03 -07:00
Mouse Reeve
851410006a Fixes remote server not getting set 
Omg this took so long for me to figure out
 2021-08-03 07:00:31 -07:00
Mouse Reeve
9093170660 Correct test structure 2021-08-02 20:16:17 -07:00
Mouse Reeve
39b2f37947 One (hopefully) last fix 2021-08-02 20:07:46 -07:00
Mouse Reeve
815dbc81e3 Remove static tempaletag from image_serializer 2021-08-02 19:50:33 -07:00
Mouse Reeve
68f9b67fd9 Updates test 2021-08-02 19:30:42 -07:00
Mouse Reeve
9e6f78c0f5 Fixes linting issue 2021-08-02 19:01:16 -07:00
Mouse Reeve
8ef1d0d3ac Fixes image federation 2021-08-02 18:55:08 -07:00
Mouse Reeve
af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Joel Bradshaw
a16d759766 Add shelved_date field and populate it on import 2021-07-13 21:04:11 -07:00
Mouse Reeve
88c23117ff Fixes outbox pagination 2021-07-07 10:56:19 -07:00
Mouse Reeve
7c15fbbb0b More efficient search index 
Co-authored-by: asmr-hex <0.0@asmr.software>
 2021-06-23 16:54:59 -07:00
Mouse Reeve
4a5e4e8ca2 Safer cover image naming 2021-06-20 09:38:01 -07:00
Joachim
0c83882a11 Fix lint 2021-06-19 19:44:14 +02:00
Joachim
e251b687dc Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-19 19:32:56 +02:00
Mouse Reeve
15555e61d0 Merge branch 'main' into book-format-choices 2021-06-19 07:43:34 -07:00
Mouse Reeve
60626eaca1 Catches straggler preview_image signal 2021-06-18 15:28:43 -07:00
Mouse Reeve
59938e2d46 Linter fixes for models 2021-06-18 15:24:10 -07:00
Mouse Reeve
a20c4d583c Merge branch 'main' into pylint 2021-06-18 14:48:31 -07:00
Mouse Reeve
9e5c7053e9 More pylint fixes 2021-06-18 14:29:24 -07:00
Mouse Reeve
4479864008 Updates code for linter 2021-06-18 14:12:56 -07:00