Make comments an option

config.dist.toml

@@ -64,3 +64,9 @@ tag_format = "camelCase"
 # A list of groups you want to send the message to, additionally to the followers.
 # This is required to get the messages discoverable by some social applications like Lemmy.
 groups = []
+
+# Set this to true to enable the comments feature.
+# When disabled (default behavior):
+# - the comments are silently rejected (social applications still receive an Accepted response to prevent them sending the responses again and again)
+# - the API and JS widget are not available
+accept_responses = false

f2ap/activitypub.py

@@ -156,7 +156,7 @@ def handle_inbox(
 
     check_message_signature(config, actor, headers, inbox)
 
-    return actor, handle_inbox_message(db, inbox, on_following_accepted)
+    return actor, handle_inbox_message(db, inbox, on_following_accepted, config.message.accept_responses)
 
 
 def get_actor_from_inbox(db: Database, inbox: dict) -> dict:
@@ -201,7 +201,7 @@ def check_message_signature(
 
 
 def handle_inbox_message(
-    db: Database, inbox: dict, on_following_accepted: Callable
+    db: Database, inbox: dict, on_following_accepted: Callable, accept_responses: bool
 ) -> Optional[dict]:
     if (
         inbox.get("type") == "Accept"
@@ -219,7 +219,7 @@ def handle_inbox_message(
         db.delete_follower(inbox.get("actor"))
         return
 
-    if inbox.get("type") == "Create" and inbox.get("object", {}).get("type") == "Note":
+    if accept_responses and inbox.get("type") == "Create" and inbox.get("object", {}).get("type") == "Note":
         # Save comments to a note
         note = inbox.get("object")
         in_reply_to = note.get("inReplyTo")
@@ -251,6 +251,7 @@ def handle_inbox_message(
             return
 
         # Tombstone might be a Note, try to delete it.
+        # Note: this is always done, even when accept_responses is False, just in case it has been disabled lately.
         db.delete_comment(o.get("id"))
 
         return

f2ap/config.py

@@ -133,7 +133,7 @@ def followers_link(self) -> str:
 
 class Message:
     def __init__(
-        self, format: str, tag_format: str = "camelCase", groups: [str] = None
+        self, format: str, tag_format: str = "camelCase", groups: [str] = None, accept_responses: bool = False
     ):
         valid_tag_formats = self.get_tags_formatters().keys()
 
@@ -147,6 +147,7 @@ def __init__(
 
         self.tag_format = tag_format
         self.groups = groups if groups is not None else []
+        self.accept_responses = accept_responses
 
     @staticmethod
     def get_tags_formatters() -> {str: Callable}:

pyproject.toml

@@ -39,6 +39,7 @@ black = "^22.10.0"
 pycln = "^2.1.2"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
+pytest-mock = "^3.10.0"
 coveralls = "^3.3.1"
 httpx = "^0.23.3"
 

tests/__init__.py

@@ -1,4 +1,5 @@
 from os import path, remove
+from uuid import uuid4
 
 from f2ap.config import Configuration
 from f2ap.data import Database
@@ -7,7 +8,10 @@
 PATH_DIRNAME = path.dirname(__file__)
 
 
-def get_fake_db(db_path: str, delete_first: bool = False) -> Database:
+def get_fake_db(db_path: str = None, delete_first: bool = False) -> Database:
+    if db_path is None:
+        db_path = f"/files/database.{uuid4().hex}.db"
+
     realpath = f"{PATH_DIRNAME}/{db_path}"
     if delete_first and path.exists(realpath):
         remove(realpath)

tests/activitypub.py

@@ -1,6 +1,11 @@
+from uuid import uuid4
+from pytest_mock import MockerFixture
+
+from . import get_fake_db
+
 from f2ap import activitypub
 from f2ap.enum import Visibility
-from f2ap.model import W3C_ACTIVITYSTREAMS_PUBLIC
+from f2ap.model import W3C_ACTIVITYSTREAMS_PUBLIC, Note
 
 
 def test_get_note_visibility_public_note():
@@ -58,3 +63,25 @@ def test_get_note_visibility_mentioned_only_note():
             "cc": ["https://example.net/users/anotherUser"],
         }
     )
+
+
+def test_inbox_can_handle_comments(mocker: MockerFixture):
+    db = get_fake_db()
+    comment_uuid = uuid4()
+    mocker.patch.object(db, "insert_comment", return_value=comment_uuid)
+
+    activitypub.handle_inbox()
+
+    replying_to = Note(
+        uuid=comment_uuid,
+        id=42,
+        name=
+    )
+    url = n
+    published_on = n
+    author_url = n
+    content = n
+    visibility = n
+    tags = []
+
+    db.insert_comment.assert_called_with(replying_to, url, published_on, author_url, content, visibility, tags)