mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-21 14:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Keep status as a single field

Browse source
This commit is contained in:
Mouse Reeve 2022-07-04 19:20:04 -07:00
parent 0cc2bc269e
commit a9a2da0957
2 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bookwyrm/migrations/0151_auto_20220705_0049.py
View file

@ -35,13 +35,6 @@ class Migration(migrations.Migration):
name="related_reports",
field=models.ManyToManyField(to="bookwyrm.Report"),
),
migrations.AddField(
model_name="notification",
name="related_statuses",
field=models.ManyToManyField(
related_name="notifications", to="bookwyrm.Status"
),
),
migrations.AddField(
model_name="notification",
name="related_users",
@ -81,11 +74,6 @@ class Migration(migrations.Migration):
),
migrations.RunSQL(
sql="""
INSERT INTO bookwyrm_notification_related_statuses (notification_id, status_id)
SELECT id, related_status_id
FROM bookwyrm_notification
WHERE bookwyrm_notification.related_status_id IS NOT NULL;
INSERT INTO bookwyrm_notification_related_users (notification_id, user_id)
SELECT id, related_user_id
FROM bookwyrm_notification
@ -121,10 +109,6 @@ class Migration(migrations.Migration):
model_name="notification",
name="related_report",
),
migrations.RemoveField(
model_name="notification",
name="related_status",
),
migrations.RemoveField(
model_name="notification",
name="related_user",

29
bookwyrm/models/notification.py
View file

@ -1,5 +1,5 @@
""" alert a user to activity """
from django.db import models
from django.db import models, transaction
from django.dispatch import receiver
from .base_model import BookWyrmModel
from . import Boost, Favorite, ImportJob, Report, Status, User
@ -26,9 +26,7 @@ class Notification(BookWyrmModel):
related_groups = models.ManyToManyField(
"Group", symmetrical=False, related_name="notifications"
)
related_statuses = models.ManyToManyField(
"Status", symmetrical=False, related_name="notifications"
)
related_status = models.ForeignKey("Status", on_delete=models.CASCADE, null=True)
related_import = models.ForeignKey("ImportJob", on_delete=models.CASCADE, null=True)
related_list_items = models.ManyToManyField(
"ListItem", symmetrical=False, related_name="notifications"
@ -47,17 +45,18 @@ class Notification(BookWyrmModel):
@receiver(models.signals.post_save, sender=Favorite)
@transaction.atomic()
# pylint: disable=unused-argument
def notify_on_fav(sender, instance, *args, **kwargs):
"""someone liked your content, you ARE loved"""
if not instance.status.user.local or instance.status.user == instance.user:
return
Notification.objects.create(
notification, _ = Notification.objects.get_or_create(
user=instance.status.user,
notification_type="FAVORITE",
related_user=instance.user,
related_status=instance.status,
)
notification.related_users.add(instance.user)
@receiver(models.signals.post_delete, sender=Favorite)
@ -66,12 +65,18 @@ def notify_on_unfav(sender, instance, *args, **kwargs):
"""oops, didn't like that after all"""
if not instance.status.user.local:
return
Notification.objects.filter(
user=instance.status.user,
related_user=instance.user,
related_status=instance.status,
notification_type="FAVORITE",
).delete()
try:
notification = Notification.objects.filter(
user=instance.status.user,
related_users=instance.user,
related_status=instance.status,
notification_type="FAVORITE",
).get()
except Notification.DoesNotExist:
return
notification.related_users.remove(instance.user)
if not notification.related_users.exists():
notification.delete()
@receiver(models.signals.post_save)