Merge pull request #3295 from manyfold3d/fix-actor-syntax

fix actor method calls within federails
manyfold3d · Dec 10, 2024 · 471c88f · 471c88f
2 parents f2322d6 + 9696a46
commit 471c88f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/activities/_create_actor.html.erb b/app/views/activities/_create_actor.html.erb
@@ -1,4 +1,4 @@
-<%- subject = activity&.federails_actor %>
+<%- subject = activity&.actor %>
 <%- object = activity&.entity %>
 <%- thing = object&.entity %>
 <% if thing && !thing.is_a?(User) && (thing.grants_permission_to?(["view", "edit", "own"], current_user) || thing.grants_permission_to?(["view", "edit", "own"], current_user&.roles)) %>

diff --git a/app/views/activities/_create_following.html.erb b/app/views/activities/_create_following.html.erb
@@ -4,10 +4,10 @@
   <div class="card-body py-2">
     <div class="row">
       <div class="col">
-        <% if follow.federails_actor.entity == current_user %>
+        <% if follow.actor.entity == current_user %>
           You
         <% else %>
-          <%= follow.federails_actor.name %>
+          <%= follow.actor.name %>
         <% end %>
         followed
         <%= link_to follow.target_actor.name, follow.target_actor.entity %>

diff --git a/app/views/activities/_update_actor.html.erb b/app/views/activities/_update_actor.html.erb
@@ -1,4 +1,4 @@
-<%- subject = activity&.federails_actor %>
+<%- subject = activity&.actor %>
 <%- object = activity&.entity %>
 <%- thing = object&.entity %>
 <% if thing && !thing.is_a?(User) && (thing.grants_permission_to?(["view", "edit", "own"], current_user) || thing.grants_permission_to?(["view", "edit", "own"], current_user&.roles)) %>