jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

More query before spawning task

Browse source
This commit is contained in:
Thomas Sileo 2019-08-11 14:16:57 +02:00
parent 2a726b7dfb
commit 6bb619d6ad
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blueprints/tasks.py
View file

@ -265,7 +265,9 @@ def task_cache_actor() -> _Response:
# Fetch the Open Grah metadata if it's a `Create` # Fetch the Open Grah metadata if it's a `Create`
if activity.has_type(ap.ActivityType.CREATE): if activity.has_type(ap.ActivityType.CREATE):
Tasks.fetch_og_meta(iri) links = opengraph.links_from_note(activity.get_object().to_dict())
if links:
Tasks.fetch_og_meta(iri)
if activity.has_type(ap.ActivityType.FOLLOW): if activity.has_type(ap.ActivityType.FOLLOW):
if actor.id == config.ID: if actor.id == config.ID:
@ -475,8 +477,6 @@ def task_process_new_activity() -> _Response:
DB.activities.update_one({"remote_id": activity.id}, {"$set": flags}) DB.activities.update_one({"remote_id": activity.id}, {"$set": flags})
app.logger.info(f"new activity {iri} processed") app.logger.info(f"new activity {iri} processed")
if not activity.has_type(ap.ActivityType.DELETE):
Tasks.cache_actor(iri)
except (ActivityGoneError, ActivityNotFoundError): except (ActivityGoneError, ActivityNotFoundError):
app.logger.exception(f"dropping activity {iri}, skip processing") app.logger.exception(f"dropping activity {iri}, skip processing")
return "" return ""

5
core/activitypub.py
View file

@ -174,9 +174,10 @@ def post_to_inbox(activity: ap.BaseActivity) -> None:
return return
save(Box.INBOX, activity) save(Box.INBOX, activity)
logger.info(f"spawning tasks for {activity!r}")
if not activity.has_type(ap.ActivityType.DELETE):
Tasks.cache_actor(activity.id)
Tasks.process_new_activity(activity.id) Tasks.process_new_activity(activity.id)
logger.info(f"spawning task for {activity!r}")
Tasks.finish_post_to_inbox(activity.id) Tasks.finish_post_to_inbox(activity.id)