remove unnecessary code change

jointakahe · Sep 13, 2023 · eac6158 · eac6158
1 parent a481536
commit eac6158
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/activities/models/post_interaction.py b/activities/models/post_interaction.py
@@ -10,7 +10,6 @@
 from core.snowflake import Snowflake
 from stator.models import State, StateField, StateGraph, StatorModel
 from users.models.identity import Identity
-from users.models.relay_actor import RelayActor
 
 
 class PostInteractionStates(StateGraph):
@@ -299,11 +298,6 @@ def to_ap(self) -> dict:
                 "object": self.post.object_uri,
                 "to": "as:Public",
             }
-            if self.identity.is_local_relay:
-                # if boost to relay, set "to" to remote relays instead of Public
-                value["to"] = list(
-                    RelayActor.get_relays().values_list("actor_uri", flat=True)
-                )
         elif self.type == self.Types.like:
             value = {
                 "type": "Like",
@@ -321,7 +315,7 @@ def to_ap(self) -> dict:
                 "inReplyTo": self.post.object_uri,
                 "attributedTo": self.identity.actor_uri,
             }
-        else:
+        elif self.type == self.Types.pin:
             raise ValueError("Cannot turn into AP")
         return value
 

diff --git a/templates/admin/identities.html b/templates/admin/identities.html
@@ -52,7 +52,6 @@
                         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>

diff --git a/users/models/follow.py b/users/models/follow.py
@@ -242,11 +242,7 @@ def create_local(cls, source, target, boosts=True):
                     uri="",
                     state=FollowStates.unrequested,
                 )
-                follow.uri = (
-                    source.actor_uri
-                    + ("/" if source.actor_uri[-1] != "/" else "")
-                    + f"follow/{follow.pk}/"
-                )
+                follow.uri = source.actor_uri + f"follow/{follow.pk}/"
                 follow.save()
         return follow
 

diff --git a/users/models/identity.py b/users/models/identity.py
@@ -32,7 +32,6 @@
 )
 from stator.models import State, StateField, StateGraph, StatorModel
 from users.models.domain import Domain
-from users.models.relay_actor import RelayActor
 from users.models.system_actor import SystemActor
 
 
@@ -338,10 +337,6 @@ def safe_metadata(self):
             for data in self.metadata
         ]
 
-    @property
-    def is_local_relay(self):
-        return self.local and self.actor_uri == RelayActor.actor_uri
-
     def ensure_uris(self):
         """
         Ensures that local identities have all the URIs populated on their fields