From f6e2dbaf1e079308b0739e9a74f165257ea6171d Mon Sep 17 00:00:00 2001 From: singuliere <35190819+singuliere@users.noreply.github.com> Date: Wed, 15 Jun 2022 00:10:14 +0000 Subject: [PATCH 1/2] [skip ci] Updated translations via Crowdin --- options/locale/locale_zh-CN.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index fdd2f0ba86..be46fda4a1 100644 --- 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.` From f8ad1a832f54ff12a2120fb2449cb2e85b3be4b2 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 15 Jun 2022 03:19:34 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: KN4CK3R --- routers/api/v1/activitypub/person.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index f5c24ce917..dca22c1a38 100644 --- 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")