From 39012c6b17073f6933a5ead8beed64df555f7348 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Fri, 6 May 2022 22:45:27 -0700
Subject: converting functions to activitypub object functions

---
 routes/admin.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'routes/admin.go')

diff --git a/routes/admin.go b/routes/admin.go
index 771cda2..ea27792 100644
--- a/routes/admin.go
+++ b/routes/admin.go
@@ -160,7 +160,7 @@ func AdminFollow(ctx *fiber.Ctx) error {
 		col.Items = append(col.Items, nObj)
 
 		for _, e := range col.Items {
-			if isFollowing, _ := activitypub.IsAlreadyFollowing(actorId, e.Id); !isFollowing && e.Id != config.Domain && e.Id != actorId {
+			if isFollowing, _ := actor.IsAlreadyFollowing(e.Id); !isFollowing && e.Id != config.Domain && e.Id != actorId {
 				followActivity, _ := db.MakeFollowActivity(actorId, e.Id)
 
 				if actor, _ := webfinger.FingerActor(e.Id); actor.Id != "" {
@@ -180,7 +180,7 @@ func AdminFollow(ctx *fiber.Ctx) error {
 		col.Items = append(col.Items, nObj)
 
 		for _, e := range col.Items {
-			if isFollowing, _ := activitypub.IsAlreadyFollowing(actorId, e.Id); !isFollowing && e.Id != config.Domain && e.Id != actorId {
+			if isFollowing, _ := actor.IsAlreadyFollowing(e.Id); !isFollowing && e.Id != config.Domain && e.Id != actorId {
 				followActivity, _ := db.MakeFollowActivity(actorId, e.Id)
 				if actor, _ := webfinger.FingerActor(e.Id); actor.Id != "" {
 					db.MakeActivityRequestOutbox(followActivity)
@@ -314,7 +314,7 @@ func AdminActorIndex(ctx *fiber.Ctx) error {
 
 	data.Board.Post.Actor = actor.Id
 
-	data.AutoSubscribe, _ = activitypub.GetActorAutoSubscribeDB(actor.Id)
+	data.AutoSubscribe, _ = actor.GetAutoSubscribe()
 
 	data.Themes = &config.Themes
 
-- 
cgit v1.2.3