1
1
mirror of https://github.com/go-gitea/gitea synced 2024-06-01 08:55:47 +00:00

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

This commit is contained in:
Anthony Wang 2022-06-14 21:33:31 -05:00
commit 1da4849ad7
No known key found for this signature in database
GPG Key ID: BC96B00AEC5F2D76
2 changed files with 1 additions and 2 deletions

View File

@ -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.`

View File

@ -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")