From a238112529cf7a99eac818c2a83f94c72ad01df5 Mon Sep 17 00:00:00 2001
From: Anthony Wang <a@exozy.me>
Date: Sat, 31 Dec 2022 18:32:22 +0000
Subject: [PATCH] Use GetIRI() instead of OriginalURL for fetching repo IRI

---
 services/activitypub/activities.go | 2 +-
 services/issue/comments.go         | 2 +-
 services/issue/issue.go            | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/activitypub/activities.go b/services/activitypub/activities.go
index 577c447946..d911e926f6 100644
--- a/services/activitypub/activities.go
+++ b/services/activitypub/activities.go
@@ -57,6 +57,6 @@ func Create(user *user_model.User, object ap.ObjectOrLink, to string) *ap.Create
 		Type:   ap.CreateType,
 		Actor:  ap.PersonNew(ap.IRI(user.GetIRI())),
 		Object: object,
-		To:     ap.ItemCollection{ap.Item(ap.IRI(to))},
+		To:     ap.ItemCollection{ap.Item(ap.IRI(to + "/inbox"))},
 	}
 }
diff --git a/services/issue/comments.go b/services/issue/comments.go
index 33c1bfd552..003c7d1386 100644
--- a/services/issue/comments.go
+++ b/services/issue/comments.go
@@ -86,7 +86,7 @@ func CreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_m
 		if err != nil {
 			return nil, err
 		}
-		create := activitypub.Create(doer, note, repo.OriginalURL+"/inbox")
+		create := activitypub.Create(doer, note, repo.GetIRI())
 		err = activitypub.Send(doer, create)
 		if err != nil {
 			return nil, err
diff --git a/services/issue/issue.go b/services/issue/issue.go
index b1b8db0f82..d097b60d68 100644
--- a/services/issue/issue.go
+++ b/services/issue/issue.go
@@ -33,8 +33,11 @@ func NewIssue(repo *repo_model.Repository, issue *issues_model.Issue, labelIDs [
 		if err != nil {
 			return err
 		}
-		issue.LoadPoster(db.DefaultContext)
-		create := activitypub.Create(issue.Poster, ticket, repo.OriginalURL+"/inbox")
+		err = issue.LoadPoster(db.DefaultContext)
+		if err != nil {
+			return err
+		}
+		create := activitypub.Create(issue.Poster, ticket, repo.GetIRI())
 		err = activitypub.Send(issue.Poster, create)
 		if err != nil {
 			return err