mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-27 03:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Resolve second integrity error

Browse source
This commit is contained in:
Mouse Reeve 2022-03-26 10:27:49 -07:00
parent 4f24b05d60
commit 2d7902ff89
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bookwyrm/models/relationship.py
View file

@ -39,12 +39,12 @@ class UserRelationship(BookWyrmModel):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
"""clear the template cache""" """clear the template cache"""
clear_cache(self.user_subject, self.user_subject) clear_cache(self.user_subject, self.user_object)
super().save(*args, **kwargs) super().save(*args, **kwargs)
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
"""clear the template cache""" """clear the template cache"""
clear_cache(self.user_subject, self.user_subject) clear_cache(self.user_subject, self.user_object)
super().delete(*args, **kwargs) super().delete(*args, **kwargs)
class Meta: class Meta:
@ -89,7 +89,9 @@ class UserFollows(ActivityMixin, UserRelationship):
user_object=self.user_subject, user_object=self.user_subject,
) )
).exists(): ).exists():
raise IntegrityError() raise IntegrityError(
"Attempting to follow blocked user", self.user_subject, self.user_object
)
# don't broadcast this type of relationship -- accepts and requests # don't broadcast this type of relationship -- accepts and requests
# are handled by the UserFollowRequest model # are handled by the UserFollowRequest model
super().save(*args, broadcast=False, **kwargs) super().save(*args, broadcast=False, **kwargs)
@ -97,12 +99,12 @@ class UserFollows(ActivityMixin, UserRelationship):
@classmethod @classmethod
def from_request(cls, follow_request): def from_request(cls, follow_request):
"""converts a follow request into a follow relationship""" """converts a follow request into a follow relationship"""
print("from!!", cls) obj, _ = cls.objects.get_or_create(
return cls.objects.create(
user_subject=follow_request.user_subject, user_subject=follow_request.user_subject,
user_object=follow_request.user_object, user_object=follow_request.user_object,
remote_id=follow_request.remote_id, remote_id=follow_request.remote_id,
) )
return obj
class UserFollowRequest(ActivitypubMixin, UserRelationship): class UserFollowRequest(ActivitypubMixin, UserRelationship):
@ -115,7 +117,6 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
"""make sure the follow or block relationship doesn't already exist""" """make sure the follow or block relationship doesn't already exist"""
# if there's a request for a follow that already exists, accept it # if there's a request for a follow that already exists, accept it
# without changing the local database state # without changing the local database state
print("UHHH????")
if UserFollows.objects.filter( if UserFollows.objects.filter(
user_subject=self.user_subject, user_subject=self.user_subject,
user_object=self.user_object, user_object=self.user_object,
@ -137,7 +138,6 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
raise IntegrityError( raise IntegrityError(
"Attempting to follow blocked user", self.user_subject, self.user_object "Attempting to follow blocked user", self.user_subject, self.user_object
) )
print("super save!")
super().save(*args, **kwargs) super().save(*args, **kwargs)
if broadcast and self.user_subject.local and not self.user_object.local: if broadcast and self.user_subject.local and not self.user_object.local:
@ -146,12 +146,10 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
if self.user_object.local: if self.user_object.local:
manually_approves = self.user_object.manually_approves_followers manually_approves = self.user_object.manually_approves_followers
if not manually_approves: if not manually_approves:
print("accept")
self.accept() self.accept()
model = apps.get_model("bookwyrm.Notification", require_ready=True) model = apps.get_model("bookwyrm.Notification", require_ready=True)
notification_type = "FOLLOW_REQUEST" if manually_approves else "FOLLOW" notification_type = "FOLLOW_REQUEST" if manually_approves else "FOLLOW"
print("notification")
model.objects.create( model.objects.create(
user=self.user_object, user=self.user_object,
related_user=self.user_subject, related_user=self.user_subject,
@ -179,9 +177,9 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
return return
with transaction.atomic(): with transaction.atomic():
print("from request")
UserFollows.from_request(self) UserFollows.from_request(self)
self.delete() if self.id:
self.delete()
def reject(self): def reject(self):
"""generate a Reject for this follow request""" """generate a Reject for this follow request"""