Add support for blocking actors

app/admin.py

@@ -563,11 +563,41 @@ async def admin_actions_follow(
     csrf_check: None = Depends(verify_csrf_token),
     db_session: AsyncSession = Depends(get_db_session),
 ) -> RedirectResponse:
-    print(f"Following {ap_actor_id}")
+    logger.info(f"Following {ap_actor_id}")
     await send_follow(db_session, ap_actor_id)
     return RedirectResponse(redirect_url, status_code=302)
 
 
+@router.post("/actions/block")
+async def admin_actions_block(
+    request: Request,
+    ap_actor_id: str = Form(),
+    redirect_url: str = Form(),
+    csrf_check: None = Depends(verify_csrf_token),
+    db_session: AsyncSession = Depends(get_db_session),
+) -> RedirectResponse:
+    logger.info(f"Blocking {ap_actor_id}")
+    actor = await fetch_actor(db_session, ap_actor_id)
+    actor.is_blocked = True
+    await db_session.commit()
+    return RedirectResponse(redirect_url, status_code=302)
+
+
+@router.post("/actions/unblock")
+async def admin_actions_unblock(
+    request: Request,
+    ap_actor_id: str = Form(),
+    redirect_url: str = Form(),
+    csrf_check: None = Depends(verify_csrf_token),
+    db_session: AsyncSession = Depends(get_db_session),
+) -> RedirectResponse:
+    logger.info(f"Unblocking {ap_actor_id}")
+    actor = await fetch_actor(db_session, ap_actor_id)
+    actor.is_blocked = False
+    await db_session.commit()
+    return RedirectResponse(redirect_url, status_code=302)
+
+
 @router.post("/actions/delete")
 async def admin_actions_delete(
     request: Request,

app/boxes.py

@@ -1271,6 +1271,10 @@ async def save_to_inbox(
         await _process_transient_object(db_session, raw_object, actor)
         return None
 
+    if actor.is_blocked:
+        logger.warning("Actor {actor.ap_id} is blocked, ignoring object")
+        return None
+
     raw_object_id = ap.get_id(raw_object)
     forwarded_by_actor = None
 

app/models.py

@@ -51,6 +51,8 @@ class Actor(Base, BaseActor):
 
     handle = Column(String, nullable=True, index=True)
 
+    is_blocked = Column(Boolean, nullable=False, default=False, server_default="0")
+
     @property
     def is_from_db(self) -> bool:
         return True

app/templates/utils.html

@@ -6,6 +6,24 @@
 <input type="hidden" name="redirect_url" value="{{ request.url }}{% if permalink_id %}#{{ permalink_id }}{% endif %}">
 {% endmacro %}
 
+{% macro admin_block_button(actor) %}
+<form action="{{ request.url_for("admin_actions_block") }}" method="POST">
+    {{ embed_csrf_token() }}
+    {{ embed_redirect_url() }}
+    <input type="hidden" name="ap_actor_id" value="{{ actor.ap_id }}">
+    <input type="submit" value="block">
+</form>
+{% endmacro %}
+
+{% macro admin_unblock_button(actor) %}
+<form action="{{ request.url_for("admin_actions_unblock") }}" method="POST">
+    {{ embed_csrf_token() }}
+    {{ embed_redirect_url() }}
+    <input type="hidden" name="ap_actor_id" value="{{ actor.ap_id }}">
+    <input type="submit" value="unblock">
+</form>
+{% endmacro %}
+
 {% macro admin_follow_button(actor) %}
 <form action="{{ request.url_for("admin_actions_follow") }}" method="POST">
     {{ embed_csrf_token() }}
@@ -217,6 +235,14 @@
                 {% endif %}
                 </li>
             {% endif %}
+            {% if actor.is_from_db %}
+                {% if actor.is_blocked %}
+                    <li>blocked</li>
+                    <li>{{ admin_unblock_button(actor) }}</li>
+                {% else %}
+                    <li>{{ admin_block_button(actor) }}</li>
+                {% endif %}
+            {% endif %}
         </ul>
     </nav>
 </div>
@@ -255,11 +281,11 @@
 <div class="activity-og-meta" style="display:flex;column-gap: 20px;margin:20px 0;">
     {% if og_meta.image %}
     <div>
-    <img src="{{ og_meta.image | media_proxy_url }}" style="max-width:200px;max-height:100px;">
+        <img src="{{ og_meta.image | media_proxy_url }}" style="max-width:200px;max-height:100px;">
     </div>
     <div>
-    <a href="{{ og_meta.url }}">{{ og_meta.title }}</a>
-    <small style="display:block;">{{ og_meta.site_name }}</small>
+        <a href="{{ og_meta.url }}">{{ og_meta.title }}</a>
+        <small style="display:block;">{{ og_meta.site_name }}</small>
     </div>
     {% endif %}
 </div>