Merge remote-tracking branch 'github/feature-activitypub' into feature-activitypub

Anthony Wang · Anthony Wang · commit 1da4849ad743 · 2022-06-14T21:33:31.000-05:00
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -443,6 +443,7 @@ size_error=长度必须为 %s。
 min_size_error=长度最小为 %s 个字符。
 max_size_error=长度最大为 %s 个字符。
 email_error=不是一个有效的邮箱地址。
+url_error=`'%s' 不是一个有效的 URL。`
 include_error=`必须包含子字符串 '%s'。`
 glob_pattern_error=`匹配模式无效：%s.`
 regex_pattern_error=`正则表达式无效：%s.`
diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go
@@ -59,9 +59,7 @@ func Person(ctx *context.APIContext) {
 		URL:       ap.IRI(ctx.ContextUser.AvatarLink()),
 	}
 
-	person.Inbox = nil
 	person.Inbox, _ = ap.Inbox.AddTo(person)
-	person.Outbox = nil
 	person.Outbox, _ = ap.Outbox.AddTo(person)
 
 	person.PublicKey.ID = ap.IRI(link + "#main-key")

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ func Person(ctx *context.APIContext) {`
`59`	`59`	`URL: ap.IRI(ctx.ContextUser.AvatarLink()),`
`60`	`60`	`}`
`61`	`61`
`62`		`- person.Inbox = nil`
`63`	`62`	`person.Inbox, _ = ap.Inbox.AddTo(person)`
`64`		`- person.Outbox = nil`
`65`	`63`	`person.Outbox, _ = ap.Outbox.AddTo(person)`
`66`	`64`
`67`	`65`	`person.PublicKey.ID = ap.IRI(link + "#main-key")`