relay admin ui

takahe/urls.py

@@ -138,6 +138,11 @@
         "admin/domains/<domain>/delete/",
         admin.DomainDelete.as_view(),
     ),
+    path(
+        "admin/relays/",
+        admin.RelayRoot.as_view(),
+        name="admin_relays",
+    ),
     path(
         "admin/federation/",
         admin.FederationRoot.as_view(),

templates/admin/_menu.html

@@ -45,6 +45,10 @@ <h3>Administration</h3>
             <i class="fa-solid fa-diagram-project"></i>
             <span>Federation</span>
         </a>
+        <a href="{% url "admin_relays" %}" {% if section == "relays" %}class="selected"{% endif %} title="Relays">
+            <i class="fa-solid fa-tower-broadcast"></i>
+            <span>Relays</span>
+        </a>
         <a href="{% url "admin_users" %}" {% if section == "users" %}class="selected"{% endif %} title="Users">
             <i class="fa-solid fa-users"></i>
             <span>Users</span>

templates/admin/identities.html

@@ -52,6 +52,7 @@
                         Remote
                         <small>{{ identity.followers_count }} local follower{{ identity.followers_count|pluralize }}</small>
                     {% endif %}
+                    {{ identity.actor_type }}
                 </td>
                 <td class="actions">
                     <a href="{{ identity.urls.admin_edit }}" title="View"><i class="fa-solid fa-eye"></i></a>

templates/admin/relays.html

@@ -0,0 +1,69 @@
+{% extends "admin/base_main.html" %}
+{% load activity_tags %}
+
+{% block subtitle %}Relay{% endblock %}
+
+{% block settings_content %}
+    <form action="?subscribe" method="post" class="search">
+        <input type="url" name="actor_uri" value="" placeholder="relay actor URI, e.g. https://relay.server/actor">
+        {% csrf_token %}
+        <button>Subscribe</button>
+    </form>
+    <table class="items">
+        {% for identity in page_obj %}
+            <tr>
+                <td class="icon">
+
+                </td>
+                <td class="name">
+                    {{ identity.actor_uri }}
+                    <small>{{ identity.domain.nodeinfo.metadata.nodeName }}</small>
+                    {% if identity.domain.nodeinfo.software %}
+                        <small>{{ identity.domain.nodeinfo.software.name }} / {{ identity.domain.nodeinfo.software.version }}</small>
+                    {% endif %}
+                </td>
+                <td>
+                    {% if identity.restriction == 1 %}
+                        <span class="bad">Limited</span>
+                    {% elif identity.restriction == 2 %}
+                        <span class="bad">Blocked</span>
+                    {% endif %}
+                </td>
+                <td class="stat">
+                    {% if identity.follow_state == 'accepting' or identity.follow_state == 'accepted' %}
+                        ACTIVE
+                    {% elif identity.follow_state == 'unrequested' or identity.follow_state == 'pending_approval' %}
+                        ACTIVATING
+                    {% else %}
+                        DEACTIVATING
+                    {% endif %}
+                    <small>({{ identity.follow_state }})</small>
+                </td>
+                <td class="actions">
+                    <form action="?unsubscribe" method="post">
+                        <input type="hidden" name="actor_uri" value="{{ identity.actor_uri }}">
+                        {% csrf_token %}
+                        <button>Unsubscribe</button>
+                    </form>
+                </td>
+                <td class="actions">
+                    <form action="?remove" method="post">
+                        <input type="hidden" name="actor_uri" value="{{ identity.actor_uri }}">
+                        {% csrf_token %}
+                        <button onclick="return confirm('Sure to force remove?')" {%if identity.follow_state == 'accepting' or identity.follow_state == 'accepted'%}disabled{%endif%}>Remove</button>
+                    </form>
+                </td>
+            </tr>
+        {% empty %}
+            <tr class="empty">
+                <td>
+                    There are no relay yet.
+                </td>
+            </tr>
+        {% endfor %}
+    </table>
+    <div class="view-options">
+        <small><i class="fa-regular fa-lightbulb"></i>&nbsp; invalid actor uri will not show in this list; (un)subscribing may take a while; use remove only when it's stuck in (DE)ACTIVATING state for a long time.</small>
+    </div>
+    {% include "admin/_pagination.html" with nouns="relay,relays" %}
+{% endblock %}

users/models/relay_actor.py

@@ -61,6 +61,17 @@ def unsubscribe(cls, relay_uri):
             }
         )
 
+    @classmethod
+    def remove(cls, relay_uri):
+        from .follow import Follow
+
+        Follow.objects.filter(
+            source__actor_uri=cls.actor_uri, target__actor_uri=relay_uri
+        ).delete()
+        Follow.objects.filter(
+            target__actor_uri=cls.actor_uri, source__actor_uri=relay_uri
+        ).delete()
+
     @classmethod
     def handle_internal_unfollow(cls, payload):
         """

users/views/admin/__init__.py

@@ -31,6 +31,7 @@
 from users.views.admin.hashtags import HashtagEdit, HashtagEnable, Hashtags  # noqa
 from users.views.admin.identities import IdentitiesRoot, IdentityEdit  # noqa
 from users.views.admin.invites import InviteCreate, InvitesRoot, InviteView  # noqa
+from users.views.admin.relays import RelayRoot  # noqa
 from users.views.admin.reports import ReportsRoot, ReportView  # noqa
 from users.views.admin.settings import (  # noqa
     BasicSettings,

users/views/admin/relays.py

@@ -0,0 +1,37 @@
+from django.db import models
+from django.shortcuts import redirect
+from django.utils.decorators import method_decorator
+from django.views.generic import ListView
+
+from users.decorators import admin_required
+from users.models import Identity, RelayActor
+
+
+@method_decorator(admin_required, name="dispatch")
+class RelayRoot(ListView):
+    template_name = "admin/relays.html"
+    paginate_by = 30
+
+    def get(self, request, *args, **kwargs):
+        self.extra_context = {
+            "section": "relays",
+        }
+        return super().get(request, *args, **kwargs)
+
+    def get_queryset(self):
+        identities = (
+            Identity.objects.filter(inbound_follows__source=RelayActor.get_identity())
+            .annotate(follow_state=models.F("inbound_follows__state"))
+            .order_by("-created")
+        )
+        return identities
+
+    def post(self, request, *args, **kwargs):
+        actor_uri = request.POST.get("actor_uri")
+        if "subscribe" in request.GET:
+            RelayActor.subscribe(actor_uri)
+        elif "unsubscribe" in request.GET:
+            RelayActor.unsubscribe(actor_uri)
+        elif "remove" in request.GET:
+            RelayActor.remove(actor_uri)
+        return redirect(".")