mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-06-01 19:33:29 +00:00
use broadcast task
This commit is contained in:
Mouse Reeve
parent
1970682c9c
commit
1caf19863e
|
|
@ -60,10 +60,15 @@ def get_recipients(user, post_privacy, direct_recipients=None, limit=False):
|
|||
return recipients
|
||||
|
||||
|
||||
@app.task
|
||||
def broadcast(sender, activity, recipients):
|
||||
''' send out an event '''
|
||||
sender = models.User.objects.get(id=sender)
|
||||
broadcast_task.delay(sender.id, activity, recipients)
|
||||
|
||||
|
||||
@app.task
|
||||
def broadcast_task(sender_id, activity, recipients):
|
||||
''' the celery task for broadcast '''
|
||||
sender = models.User.objects.get(id=sender_id)
|
||||
errors = []
|
||||
for recipient in recipients:
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -81,9 +81,7 @@ def handle_account_search(query):
|
|||
def handle_follow(user, to_follow):
|
||||
''' someone local wants to follow someone '''
|
||||
activity = activitypub.get_follow_request(user, to_follow)
|
||||
errors = broadcast.delay(user.id, activity, [to_follow.inbox])
|
||||
for error in errors:
|
||||
raise(error['error'])
|
||||
broadcast(user, activity, [to_follow.inbox])
|
||||
|
||||
|
||||
def handle_unfollow(user, to_unfollow):
|
||||
|
|
@ -93,10 +91,8 @@ def handle_unfollow(user, to_unfollow):
|
|||
user_object=to_unfollow
|
||||
)
|
||||
activity = activitypub.get_unfollow(relationship)
|
||||
errors = broadcast.delay(user.id, activity, [to_unfollow.inbox])
|
||||
broadcast(user, activity, [to_unfollow.inbox])
|
||||
to_unfollow.followers.remove(user)
|
||||
for error in errors:
|
||||
raise(error['error'])
|
||||
|
||||
|
||||
def handle_accept(user, to_follow, follow_request):
|
||||
|
|
@ -108,7 +104,7 @@ def handle_accept(user, to_follow, follow_request):
|
|||
|
||||
activity = activitypub.get_accept(to_follow, follow_request)
|
||||
recipient = get_recipients(to_follow, 'direct', direct_recipients=[user])
|
||||
broadcast.delay(to_follow.id, activity, recipient)
|
||||
broadcast(to_follow, activity, recipient)
|
||||
|
||||
|
||||
def handle_reject(user, to_follow, relationship):
|
||||
|
|
@ -117,7 +113,7 @@ def handle_reject(user, to_follow, relationship):
|
|||
|
||||
activity = activitypub.get_reject(to_follow, relationship)
|
||||
recipient = get_recipients(to_follow, 'direct', direct_recipients=[user])
|
||||
broadcast.delay(to_follow.id, activity, recipient)
|
||||
broadcast(to_follow, activity, recipient)
|
||||
|
||||
|
||||
def handle_shelve(user, book, shelf):
|
||||
|
|
@ -127,7 +123,7 @@ def handle_shelve(user, book, shelf):
|
|||
|
||||
activity = activitypub.get_add(user, book, shelf)
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, activity, recipients)
|
||||
broadcast(user, activity, recipients)
|
||||
|
||||
# tell the world about this cool thing that happened
|
||||
verb = {
|
||||
|
|
@ -143,7 +139,7 @@ def handle_shelve(user, book, shelf):
|
|||
activity = activitypub.get_status(status)
|
||||
create_activity = activitypub.get_create(user, activity)
|
||||
|
||||
broadcast.delay(user.id, create_activity, recipients)
|
||||
broadcast(user, create_activity, recipients)
|
||||
|
||||
|
||||
def handle_unshelve(user, book, shelf):
|
||||
|
|
@ -155,7 +151,7 @@ def handle_unshelve(user, book, shelf):
|
|||
activity = activitypub.get_remove(user, book, shelf)
|
||||
recipients = get_recipients(user, 'public')
|
||||
|
||||
broadcast.delay(user.id, activity, recipients)
|
||||
broadcast(user, activity, recipients)
|
||||
|
||||
|
||||
def handle_import_books(user, items):
|
||||
|
|
@ -173,7 +169,7 @@ def handle_import_books(user, items):
|
|||
new_books.append(item.book)
|
||||
activity = activitypub.get_add(user, item.book, desired_shelf)
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, activity, recipients)
|
||||
broadcast(user, activity, recipients)
|
||||
|
||||
if new_books:
|
||||
message = 'imported {} books'.format(len(new_books))
|
||||
|
|
@ -184,7 +180,7 @@ def handle_import_books(user, items):
|
|||
create_activity = activitypub.get_create(
|
||||
user, activitypub.get_status(status))
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, create_activity, recipients)
|
||||
broadcast(user, create_activity, recipients)
|
||||
|
||||
|
||||
def handle_review(user, book, name, content, rating):
|
||||
|
|
@ -195,14 +191,14 @@ def handle_review(user, book, name, content, rating):
|
|||
review_activity = activitypub.get_review(review)
|
||||
review_create_activity = activitypub.get_create(user, review_activity)
|
||||
fr_recipients = get_recipients(user, 'public', limit='fedireads')
|
||||
broadcast.delay(user.id, review_create_activity, fr_recipients)
|
||||
broadcast(user, review_create_activity, fr_recipients)
|
||||
|
||||
# re-format the activity for non-fedireads servers
|
||||
article_activity = activitypub.get_review_article(review)
|
||||
article_create_activity = activitypub.get_create(user, article_activity)
|
||||
|
||||
other_recipients = get_recipients(user, 'public', limit='other')
|
||||
broadcast.delay(user.id, article_create_activity, other_recipients)
|
||||
broadcast(user, article_create_activity, other_recipients)
|
||||
|
||||
|
||||
def handle_comment(user, book, name, content):
|
||||
|
|
@ -213,14 +209,14 @@ def handle_comment(user, book, name, content):
|
|||
comment_activity = activitypub.get_comment(comment)
|
||||
comment_create_activity = activitypub.get_create(user, comment_activity)
|
||||
fr_recipients = get_recipients(user, 'public', limit='fedireads')
|
||||
broadcast.delay(user.id, comment_create_activity, fr_recipients)
|
||||
broadcast(user, comment_create_activity, fr_recipients)
|
||||
|
||||
# re-format the activity for non-fedireads servers
|
||||
article_activity = activitypub.get_comment_article(comment)
|
||||
article_create_activity = activitypub.get_create(user, article_activity)
|
||||
|
||||
other_recipients = get_recipients(user, 'public', limit='other')
|
||||
broadcast.delay(user.id, article_create_activity, other_recipients)
|
||||
broadcast(user, article_create_activity, other_recipients)
|
||||
|
||||
|
||||
def handle_tag(user, book, name):
|
||||
|
|
@ -229,7 +225,7 @@ def handle_tag(user, book, name):
|
|||
tag_activity = activitypub.get_add_tag(tag)
|
||||
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, tag_activity, recipients)
|
||||
broadcast(user, tag_activity, recipients)
|
||||
|
||||
|
||||
def handle_untag(user, book, name):
|
||||
|
|
@ -240,7 +236,7 @@ def handle_untag(user, book, name):
|
|||
tag.delete()
|
||||
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, tag_activity, recipients)
|
||||
broadcast(user, tag_activity, recipients)
|
||||
|
||||
|
||||
def handle_reply(user, review, content):
|
||||
|
|
@ -258,7 +254,7 @@ def handle_reply(user, review, content):
|
|||
create_activity = activitypub.get_create(user, reply_activity)
|
||||
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, create_activity, recipients)
|
||||
broadcast(user, create_activity, recipients)
|
||||
|
||||
|
||||
def handle_favorite(user, status):
|
||||
|
|
@ -274,7 +270,7 @@ def handle_favorite(user, status):
|
|||
|
||||
fav_activity = activitypub.get_favorite(favorite)
|
||||
recipients = get_recipients(user, 'direct', [status.user])
|
||||
broadcast.delay(user.id, fav_activity, recipients)
|
||||
broadcast(user, fav_activity, recipients)
|
||||
|
||||
|
||||
def handle_unfavorite(user, status):
|
||||
|
|
@ -290,7 +286,7 @@ def handle_unfavorite(user, status):
|
|||
|
||||
fav_activity = activitypub.get_unfavorite(favorite)
|
||||
recipients = get_recipients(user, 'direct', [status.user])
|
||||
broadcast.delay(user.id, fav_activity, recipients)
|
||||
broadcast(user, fav_activity, recipients)
|
||||
|
||||
def handle_boost(user, status):
|
||||
''' a user wishes to boost a status '''
|
||||
|
|
@ -306,14 +302,14 @@ def handle_boost(user, status):
|
|||
|
||||
boost_activity = activitypub.get_boost(boost)
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, boost_activity, recipients)
|
||||
broadcast(user, boost_activity, recipients)
|
||||
|
||||
def handle_update_book(user, book):
|
||||
''' broadcast the news about our book '''
|
||||
book_activity = activitypub.get_book(book)
|
||||
update_activity = activitypub.get_update(user, book_activity)
|
||||
recipients = get_recipients(None, 'public')
|
||||
broadcast.delay(user.id, update_activity, recipients)
|
||||
broadcast(user, update_activity, recipients)
|
||||
|
||||
|
||||
def handle_update_user(user):
|
||||
|
|
@ -321,5 +317,5 @@ def handle_update_user(user):
|
|||
actor = activitypub.get_actor(user)
|
||||
update_activity = activitypub.get_update(user, actor)
|
||||
recipients = get_recipients(user, 'public')
|
||||
broadcast.delay(user.id, update_activity, recipients)
|
||||
broadcast(user, update_activity, recipients)
|
||||
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ def books_page(request):
|
|||
if request.user.is_authenticated:
|
||||
recent_books = models.Edition.objects.filter(
|
||||
~Q(shelfbook__shelf__user=request.user),
|
||||
id__in=[b.id for b in recent_books],
|
||||
id__in=[b.id for b in recent_books if b],
|
||||
)
|
||||
|
||||
data = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue