From 5dce02570049cdd303c4d9367fe5dca120c64091 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Sun, 5 Aug 2018 13:49:49 +0200
Subject: [PATCH] Tasks cleanup

---
 activitypub.py |  5 -----
 app.py         | 11 -----------
 tasks.py       | 27 +++++++++++++++------------
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/activitypub.py b/activitypub.py
index ff75354..6aa3be5 100644
--- a/activitypub.py
+++ b/activitypub.py
@@ -116,11 +116,6 @@ class MicroblogPubBackend(Backend):
             }
         )
 
-        self.save_cb(box, activity.id)
-
-    def set_save_cb(self, cb):
-        self.save_cb = cb
-
     def followers(self) -> List[str]:
         q = {
             "box": Box.INBOX.value,
diff --git a/app.py b/app.py
index 9a31af0..81cc10b 100644
--- a/app.py
+++ b/app.py
@@ -79,17 +79,6 @@ from utils.lookup import lookup
 from utils.media import Kind
 
 back = activitypub.MicroblogPubBackend()
-
-
-def save_cb(box: Box, iri: str) -> None:
-    if box == Box.INBOX:
-        tasks.process_new_activity.delay(iri)
-    else:
-        tasks.cache_actor.delay(iri)
-
-
-back.set_save_cb(save_cb)
-
 ap.use_backend(back)
 
 MY_PERSON = ap.Person(**ME)
diff --git a/tasks.py b/tasks.py
index 944b464..0cf24e4 100644
--- a/tasks.py
+++ b/tasks.py
@@ -22,6 +22,7 @@ from config import ID
 from config import KEY
 from config import MEDIA_CACHE
 from config import USER_AGENT
+from config import BASE_URL
 from utils import opengraph
 from utils.media import Kind
 
@@ -36,16 +37,6 @@ back = activitypub.MicroblogPubBackend()
 ap.use_backend(back)
 
 
-def save_cb(box: Box, iri: str) -> None:
-    if box == Box.INBOX:
-        process_new_activity.delay(iri)
-    else:
-        cache_actor.delay(iri)
-
-
-back.set_save_cb(save_cb)
-
-
 MY_PERSON = ap.Person(**ME)
 
 
@@ -70,6 +61,9 @@ def process_new_activity(self, iri: str) -> None:
                 # Most likely on OStatus notice
                 tag_stream = False
                 should_delete = True
+            except (ActivityGoneError, ActivityNotFoundError):
+                # The announced activity is deleted/gone, drop it
+                should_delete = True
 
         elif activity.has_type(ap.ActivityType.CREATE):
             note = activity.get_object()
@@ -112,6 +106,12 @@ def process_new_activity(self, iri: str) -> None:
                 # If the activity was originally forwarded, forward the delete too
                 should_forward = True
 
+        elif activity.has_type(ap.ActivityType.LIKE):
+            if not activity.get_object_id.startswith(BASE_URL):
+                # We only want to keep a like if it's a like for a local activity
+                # (Pleroma relay the likes it received, we don't want to store them)
+                should_delete = True
+
         if should_forward:
             log.info(f"will forward {activity!r} to followers")
             forward_activity.delay(activity.id)
@@ -132,7 +132,7 @@ def process_new_activity(self, iri: str) -> None:
         )
 
         log.info(f"new activity {iri} processed")
-        if not should_delete:
+        if not should_delete and not activity.has_type(ap.ActivityType.DELETE):
             cache_actor.delay(iri)
     except (ActivityGoneError, ActivityNotFoundError):
         log.exception(f"dropping activity {iri}, skip processing")
@@ -245,7 +245,7 @@ def cache_actor(self, iri: str, also_cache_attachments: bool = True) -> None:
         )
 
         log.info(f"actor cached for {iri}")
-        if also_cache_attachments:
+        if also_cache_attachments and activity.has_type(ap.ActivityType.CREATE):
             cache_attachments.delay(iri)
 
     except (ActivityGoneError, ActivityNotFoundError):
@@ -309,6 +309,8 @@ def post_to_inbox(activity: ap.BaseActivity) -> None:
         log.info(f"received duplicate activity {activity!r}, dropping it")
 
     back.save(Box.INBOX, activity)
+    process_new_activity.delay(activity.id)
+
     log.info(f"spawning task for {activity!r}")
     finish_post_to_inbox.delay(activity.id)
 
@@ -356,6 +358,7 @@ def post_to_outbox(activity: ap.BaseActivity) -> str:
     activity.set_id(back.activity_url(obj_id), obj_id)
 
     back.save(Box.OUTBOX, activity)
+    cache_actor.delay(activity.id)
     finish_post_to_outbox.delay(activity.id)
     return activity.id