From ee85f7d957f07ce36625299411f3aa068de54832 Mon Sep 17 00:00:00 2001
From: Anthony Wang <ta180m@proton.me>
Date: Mon, 22 Aug 2022 12:09:26 -0500
Subject: [PATCH] Use the Repository AttributedTo to get owner IRI

---
 modules/activitypub/iri.go  | 14 --------------
 modules/activitypub/repo.go |  5 +----
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/activitypub/iri.go b/modules/activitypub/iri.go
index e0ccfd8b03..235545cd20 100644
--- a/modules/activitypub/iri.go
+++ b/modules/activitypub/iri.go
@@ -77,17 +77,3 @@ func repositoryIRIToRepository(ctx context.Context, repoIRI ap.IRI) (*repo_model
 	// TODO: create remote repo if not exists
 	return repo_model.GetRepositoryByOwnerAndName(username, reponame)
 }
-
-// Returns the IRI of the owner of a Repository actor IRI
-func repositoryIRIToOwnerIRI(repoIRI ap.IRI) (ap.IRI, error) {
-	r := repoIRI.String()
-	rSplit := strings.Split(r, "/")
-	if len(rSplit) < 5 {
-		return "", errors.New("not a Repository actor IRI")
-	}
-
-	username := rSplit[len(rSplit)-2]
-	reponame := rSplit[len(rSplit)-1]
-	ownerIRI := ap.IRI(strings.TrimSuffix(r, "repo/"+username+"/"+reponame) + "user/" + username)
-	return ownerIRI, nil
-}
diff --git a/modules/activitypub/repo.go b/modules/activitypub/repo.go
index b7e88742bf..7f7eeceb1f 100644
--- a/modules/activitypub/repo.go
+++ b/modules/activitypub/repo.go
@@ -14,10 +14,7 @@ import (
 
 // Create a new federated repo from a Repository object
 func FederatedRepoNew(ctx context.Context, repository *forgefed.Repository) error {
-	ownerIRI, err := repositoryIRIToOwnerIRI(repository.GetLink())
-	if err != nil {
-		return err
-	}
+	ownerIRI := repository.AttributedTo.GetLink()
 	user, err := personIRIToUser(ctx, ownerIRI)
 	if err != nil {
 		return err