Merge branch 'main' into load_remote_statuses

This commit is contained in:
Mouse Reeve
2020-11-06 15:48:17 -08:00
committed by GitHub
33 changed files with 249 additions and 244 deletions

View File

@ -1,6 +1,5 @@
''' Handle user activity '''
from datetime import datetime
from django.db import IntegrityError
from bookwyrm import activitypub, books_manager, models
from bookwyrm.books_manager import get_or_create_book
@ -65,17 +64,6 @@ def create_generated_note(user, content, mention_books=None, privacy='public'):
return status
def create_tag(user, possible_book, name):
''' add a tag to a book '''
book = get_or_create_book(possible_book)
try:
tag = models.Tag.objects.create(name=name, book=book, user=user)
except IntegrityError:
return models.Tag.objects.get(name=name, book=book, user=user)
return tag
def create_notification(user, notification_type, related_user=None, \
related_book=None, related_status=None, related_import=None):
''' let a user know when someone interacts with their content '''