CHANGELOG.md

@@ -52,6 +52,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Rich media will now hard-exit after 5 seconds, to prevent timeline hangs
 - HTTP Content Security Policy is now far more strict to prevent any potential XSS/CSS leakages
 - Follow requests are now paginated, matches mastodon API spec, so use the Link header to paginate.
+- `internal.fetch` and `relay` actors are now represented with the actor type `Application`
 
 ### Fixed 
 - /api/v1/accounts/lookup will now respect restrict\_unauthenticated

lib/pleroma/user.ex

@@ -2000,6 +2000,7 @@ defp create_service_actor(uri, nickname) do
     %User{
       invisible: true,
       local: true,
+      actor_type: "Application",
       ap_id: uri,
       nickname: nickname,
       follower_address: uri <> "/followers"

priv/gettext/zh_Hans/LC_MESSAGES/errors.po

@@ -3,16 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-20 13:18+0000\n"
-"PO-Revision-Date: 2023-02-26 08:57+0000\n"
+"PO-Revision-Date: 2020-12-14 06:00+0000\n"
-"Last-Translator: SevicheCC <sevicheee@outlook.com>\n"
+"Last-Translator: shironeko <shironeko@tesaguri.club>\n"
-"Language-Team: Chinese (Simplified) <http://translate.akkoma.dev/projects/"
+"Language-Team: Chinese (Simplified) <https://translate.pleroma.social/"
-"akkoma/akkoma-backend-errors/zh_Hans/>\n"
+"projects/pleroma/pleroma/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14\n"
+"X-Generator: Weblate 4.0.4\n"
 
 ## This file is a PO Template file.
 ##
@@ -146,7 +146,7 @@ msgid "Cannot post an empty status without attachments"
 msgstr "无法发送空白且不包含附件的状态"
 
 #: lib/pleroma/web/common_api/utils.ex:511
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Comment must be up to %{max_size} characters"
 msgstr "评论最多可使用 %{max_size} 字符"
 
@@ -250,7 +250,7 @@ msgstr "没有该对话"
 
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:388
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:414 lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:456
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "No such permission_group"
 msgstr "没有该权限组"
 
@@ -297,7 +297,7 @@ msgid "This resource requires authentication."
 msgstr "该资源需要认证。"
 
 #: lib/pleroma/plugs/rate_limiter/rate_limiter.ex:206
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Throttled"
 msgstr "节流了"
 
@@ -380,7 +380,7 @@ msgid "Failed"
 msgstr "失败"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:410
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Failed to authenticate: %{message}."
 msgstr "认证失败：%{message}。"
 
@@ -406,7 +406,7 @@ msgid "Invalid Username/Password"
 msgstr "无效的用户名/密码"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:118
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Invalid answer data"
 msgstr "无效的回答数据"
 
@@ -437,7 +437,7 @@ msgid "Unsupported OAuth provider: %{provider}."
 msgstr "不支持的 OAuth 提供者：%{provider}。"
 
 #: lib/pleroma/uploaders/uploader.ex:72
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Uploader callback timeout"
 msgstr "上传回复超时"
 
@@ -452,7 +452,7 @@ msgid "CAPTCHA Error"
 msgstr "验证码错误"
 
 #: lib/pleroma/web/common_api/common_api.ex:290
-#, elixir-format
+#, elixir-format, fuzzy
 msgid "Could not add reaction emoji"
 msgstr "无法添加表情反应"
 

priv/gettext/zh_Hans/LC_MESSAGES/posix_errors.po

@@ -1,163 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-23 12:40+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: zh_Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.7.2\n"
-
-## This file is a PO Template file.
-##
-## `msgid`s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run `mix gettext.extract` to bring this file up to
-## date. Leave `msgstr`s empty as changing them here as no
-## effect: edit them in PO (`.po`) files instead.
-msgid "eperm"
-msgstr ""
-
-msgid "eacces"
-msgstr ""
-
-msgid "eagain"
-msgstr ""
-
-msgid "ebadf"
-msgstr ""
-
-msgid "ebadmsg"
-msgstr ""
-
-msgid "ebusy"
-msgstr ""
-
-msgid "edeadlk"
-msgstr ""
-
-msgid "edeadlock"
-msgstr ""
-
-msgid "edquot"
-msgstr ""
-
-msgid "eexist"
-msgstr ""
-
-msgid "efault"
-msgstr ""
-
-msgid "efbig"
-msgstr ""
-
-msgid "eftype"
-msgstr ""
-
-msgid "eintr"
-msgstr ""
-
-msgid "einval"
-msgstr ""
-
-msgid "eio"
-msgstr ""
-
-msgid "eisdir"
-msgstr ""
-
-msgid "eloop"
-msgstr ""
-
-msgid "emfile"
-msgstr ""
-
-msgid "emlink"
-msgstr ""
-
-msgid "emultihop"
-msgstr ""
-
-msgid "enametoolong"
-msgstr ""
-
-msgid "enfile"
-msgstr ""
-
-msgid "enobufs"
-msgstr ""
-
-msgid "enodev"
-msgstr ""
-
-msgid "enolck"
-msgstr ""
-
-msgid "enolink"
-msgstr ""
-
-msgid "enoent"
-msgstr ""
-
-msgid "enomem"
-msgstr ""
-
-msgid "enospc"
-msgstr ""
-
-msgid "enosr"
-msgstr ""
-
-msgid "enostr"
-msgstr ""
-
-msgid "enosys"
-msgstr ""
-
-msgid "enotblk"
-msgstr ""
-
-msgid "enotdir"
-msgstr ""
-
-msgid "enotsup"
-msgstr ""
-
-msgid "enxio"
-msgstr ""
-
-msgid "eopnotsupp"
-msgstr ""
-
-msgid "eoverflow"
-msgstr ""
-
-msgid "epipe"
-msgstr ""
-
-msgid "erange"
-msgstr ""
-
-msgid "erofs"
-msgstr ""
-
-msgid "espipe"
-msgstr ""
-
-msgid "esrch"
-msgstr ""
-
-msgid "estale"
-msgstr ""
-
-msgid "etxtbsy"
-msgstr ""
-
-msgid "exdev"
-msgstr ""

priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po

@@ -1,601 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-23 12:41+0000\n"
-"PO-Revision-Date: 2023-02-24 13:57+0000\n"
-"Last-Translator: SevicheCC <sevicheee@outlook.com>\n"
-"Language-Team: Chinese (Simplified) <http://translate.akkoma.dev/projects/"
-"akkoma/akkoma-backend-static-pages/zh_Hans/>\n"
-"Language: zh_Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14\n"
-
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here as no
-## effect: edit them in PO (.po) files instead.
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button"
-msgid "Authorize"
-msgstr "批准"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error fetching user"
-msgstr "无法获取用户信息"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header"
-msgid "Remote follow"
-msgstr "跨站关注"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for auth code entry"
-msgid "Authentication code"
-msgstr "验证码"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:10
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for password entry"
-msgid "Password"
-msgstr "密码"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for username entry"
-msgid "Username"
-msgstr "用户名"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:13
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for login"
-msgid "Authorize"
-msgstr "授权"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for mfa"
-msgid "Authorize"
-msgstr "授权"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error following account"
-msgstr "无法关注账户"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header, need login"
-msgid "Log in to follow"
-msgstr "登录以关注"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow mfa header"
-msgid "Two-factor authentication"
-msgstr "双因素身份验证"
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow success"
-msgid "Account followed!"
-msgstr "已关注该账号！"
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:7
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for account id"
-msgid "Your account ID, e.g. lain@quitter.se"
-msgstr "你的账号ID，比如：lain@quitter.se"
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for following with a remote account"
-msgid "Follow"
-msgstr "关注"
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error: %{error}"
-msgstr "错误：%{error}"
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header"
-msgid "Remotely follow %{nickname}"
-msgstr "远程关注 %{nickname}"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "password reset button"
-msgid "Reset"
-msgstr "重制"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "password reset failed homepage link"
-msgid "Homepage"
-msgstr "主页"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset failed message"
-msgid "Password reset failed"
-msgstr "密码重置失败"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "password reset form confirm password prompt"
-msgid "Confirmation"
-msgstr "确认"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "password reset form password prompt"
-msgid "Password"
-msgstr "密码"
-
-#: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset invalid token message"
-msgid "Invalid Token"
-msgstr "无效 Token"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "password reset successful homepage link"
-msgid "Homepage"
-msgstr "主页"
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset successful message"
-msgid "Password changed!"
-msgstr "密码已修改！"
-
-#: lib/pleroma/web/templates/feed/feed/tag.atom.eex:15
-#: lib/pleroma/web/templates/feed/feed/tag.rss.eex:7
-#, elixir-autogen, elixir-format
-msgctxt "tag feed description"
-msgid "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse."
-msgstr "这些是带有 #%{tag} "
-"标签的公开帖文。如果你在联邦宇宙的任何地方有账户，你可以与它们进行交互。"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:3
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorization exists page title"
-msgid "Authorization exists"
-msgstr "已存在授权"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:37
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize approve button"
-msgid "Approve"
-msgstr "允许"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:35
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize cancel button"
-msgid "Cancel"
-msgstr "取消"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:26
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize message"
-msgid "Application <strong>%{client_name}</strong> is requesting access to your account."
-msgstr "应用程序 <strong>%{client_name}</strong> 正在请求访问您的帐户。"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:3
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorized page title"
-msgid "Successfully authorized"
-msgstr "授权成功"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "oauth external provider page title"
-msgid "Sign in with external provider"
-msgstr "使用外部服务进行登录"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:13
-#, elixir-autogen, elixir-format
-msgctxt "oauth external provider sign in button"
-msgid "Sign in with %{strategy}"
-msgstr "用 %{strategy} 登录"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:59
-#, elixir-autogen, elixir-format
-msgctxt "oauth login button"
-msgid "Log In"
-msgstr "登录"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:56
-#, elixir-autogen, elixir-format
-msgctxt "oauth login password prompt"
-msgid "Password"
-msgstr "密码"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:52
-#, elixir-autogen, elixir-format
-msgctxt "oauth login username prompt"
-msgid "Username"
-msgstr "用户名"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:44
-#, elixir-autogen, elixir-format
-msgctxt "oauth register nickname prompt"
-msgid "Pleroma Handle"
-msgstr "Pleroma账号"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:42
-#, elixir-autogen, elixir-format
-msgctxt "oauth register nickname unchangeable warning"
-msgid "Choose carefully! You won't be able to change this later. You will be able to change your display name, though."
-msgstr "选择时要慎重！您以后将无法更改此项。不过您可以更改您的显示名称。"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:18
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page email prompt"
-msgid "Email"
-msgstr "邮箱"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:10
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page fill form prompt"
-msgid "If you'd like to register a new account, please provide the details below."
-msgstr "如果您想注册一个新账户，请提供以下细节。"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:35
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login button"
-msgid "Proceed as existing user"
-msgstr "以现有用户身份进行"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:31
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login password prompt"
-msgid "Password"
-msgstr "密码"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:24
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login prompt"
-msgid "Alternatively, sign in to connect to existing account."
-msgstr "或者登录后连接到现有账户。"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:27
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login username prompt"
-msgid "Name or email"
-msgstr "名字或者邮箱"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:14
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page nickname prompt"
-msgid "Nickname"
-msgstr "昵称"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:22
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page register button"
-msgid "Proceed as new user"
-msgstr "以新用户身份进行"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page title"
-msgid "Registration Details"
-msgstr "注册细节"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "oauth scopes message"
-msgid "The following permissions will be granted"
-msgstr "将授予以下权限"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:6
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:6
-#, elixir-autogen, elixir-format
-msgctxt "oauth token code message"
-msgid "Token code is <br>%{token}"
-msgstr "Token 码是<br>%{token}"
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:14
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth code prompt"
-msgid "Authentication code"
-msgstr "授权码"
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:9
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth page title"
-msgid "Two-factor authentication"
-msgstr "双因素身份验证"
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:25
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth page use recovery code link"
-msgid "Enter a two-factor recovery code"
-msgstr "输入一个双因素恢复的恢复代码"
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:22
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth verify code button"
-msgid "Verify"
-msgstr "认证"
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:9
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover page title"
-msgid "Two-factor recovery"
-msgstr "双因素恢复"
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:14
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover recovery code prompt"
-msgid "Recovery code"
-msgstr "恢复码"
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:25
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover use 2fa code link"
-msgid "Enter a two-factor code"
-msgstr "输入一个双重因素验证码"
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:22
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover verify recovery code button"
-msgid "Verify"
-msgstr "验证"
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:42
-#, elixir-autogen, elixir-format
-msgctxt "static fe profile page remote follow button"
-msgid "Remote follow"
-msgstr "跨站关注"
-
-#: lib/pleroma/web/templates/email/digest.html.eex:163
-#, elixir-autogen, elixir-format
-msgctxt "digest email header line"
-msgid "Hey %{nickname}, here is what you've missed!"
-msgstr "嗨 %{nickname}，这是你错过的一些东西！"
-
-#: lib/pleroma/web/templates/email/digest.html.eex:544
-#, elixir-autogen, elixir-format
-msgctxt "digest email receiver address"
-msgid "The email address you are subscribed as is <a href='mailto:%{@user.email}' style='color: %{color};text-decoration: none;'>%{email}</a>. "
-msgstr ""
-"您订阅的电子邮件地址是 <a href='mailto:%{@user.email}' style='color: %{color"
-"};text-decoration: none;'>%{email}</a>。 "
-
-#: lib/pleroma/web/templates/email/digest.html.eex:538
-#, elixir-autogen, elixir-format
-msgctxt "digest email sending reason"
-msgid "You have received this email because you have signed up to receive digest emails from <b>%{instance}</b> Pleroma instance."
-msgstr "您之所以会收到来自<b>%{instance}</b> Pleroma "
-"实例的邮件摘要，是因为您已经注册了该服务实例。"
-
-#: lib/pleroma/web/templates/email/digest.html.eex:547
-#, elixir-autogen, elixir-format
-msgctxt "digest email unsubscribe action"
-msgid "To unsubscribe, please go %{here}."
-msgstr "取消订阅，请点击 %{here}."
-
-#: lib/pleroma/web/templates/email/digest.html.eex:547
-#, elixir-autogen, elixir-format
-msgctxt "digest email unsubscribe action link text"
-msgid "here"
-msgstr "这里"
-
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_failure.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "mailer unsubscribe failed message"
-msgid "UNSUBSCRIBE FAILURE"
-msgstr "取消订阅失败"
-
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_success.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "mailer unsubscribe successful message"
-msgid "UNSUBSCRIBE SUCCESSFUL"
-msgstr "成功取消订阅"
-
-#: lib/pleroma/web/templates/email/digest.html.eex:385
-#, elixir-format
-msgctxt "new followers count header"
-msgid "%{count} New Follower"
-msgid_plural "%{count} New Followers"
-msgstr[0] "%{count} 个新关注者"
-
-#: lib/pleroma/emails/user_email.ex:384
-#, elixir-autogen, elixir-format
-msgctxt "account archive email subject"
-msgid "Your account archive is ready"
-msgstr "您的账户档案已经准备好了"
-
-#: lib/pleroma/emails/user_email.ex:188
-#, elixir-autogen, elixir-format
-msgctxt "approval pending email body"
-msgid "<h3>Awaiting Approval</h3>\n<p>Your account at %{instance_name} is being reviewed by staff. You will receive another email once your account is approved.</p>\n"
-msgstr ""
-"<h3>正在等待批准</h3>\n"
-"<p> 您在%{instance_name}的账户正在被工作人员审查。一旦您的账户被批准通过，您"
-"将收到另一封电子邮件。</p>\n"
-
-#: lib/pleroma/emails/user_email.ex:202
-#, elixir-autogen, elixir-format
-msgctxt "approval pending email subject"
-msgid "Your account is awaiting approval"
-msgstr "您的账户正在等待审批"
-
-#: lib/pleroma/emails/user_email.ex:158
-#, elixir-autogen, elixir-format
-msgctxt "confirmation email body"
-msgid "<h3>Thank you for registering on %{instance_name}</h3>\n<p>Email confirmation is required to activate the account.</p>\n<p>Please click the following link to <a href=\"%{confirmation_url}\">activate your account</a>.</p>\n"
-msgstr ""
-"<h3>感谢注册%{instance_name}</h3>\n"
-"<p>需要电子邮件确认才能激活该账户</p>\n"
-"<p>请点击以下链接以 <a href=\"%{confirmation_url}\">确认您的账户</a></p>\n"
-
-#: lib/pleroma/emails/user_email.ex:174
-#, elixir-autogen, elixir-format
-msgctxt "confirmation email subject"
-msgid "%{instance_name} account confirmation"
-msgstr "%{instance_name} 账户确认"
-
-#: lib/pleroma/emails/user_email.ex:310
-#, elixir-autogen, elixir-format
-msgctxt "digest email subject"
-msgid "Your digest from %{instance_name}"
-msgstr "您来自 %{instance_name} 的摘要邮件"
-
-#: lib/pleroma/emails/user_email.ex:81
-#, elixir-autogen, elixir-format
-msgctxt "password reset email body"
-msgid "<h3>Reset your password at %{instance_name}</h3>\n<p>Someone has requested password change for your account at %{instance_name}.</p>\n<p>If it was you, visit the following link to proceed: <a href=\"%{password_reset_url}\">reset password</a>.</p>\n<p>If it was someone else, nothing to worry about: your data is secure and your password has not been changed.</p>\n"
-msgstr ""
-"<h3>在 %{instance_name} 重置您的密码</h3>\n"
-"<p>有人请求更改您在 %{instance_name} 的账户密码。</p>\n"
-"<p>如果这是您的操作，请点击以下链接继续重置密码：<a href=\""
-"%{password_reset_url}\">重置密码</a>。</p>\n"
-"<p>如果这不是您的操作，请不用担心：您的数据是安全的，您的密码未被更改。</p>\n"
-
-#: lib/pleroma/emails/user_email.ex:98
-#, elixir-autogen, elixir-format
-msgctxt "password reset email subject"
-msgid "Password reset"
-msgstr "重置密码"
-
-#: lib/pleroma/emails/user_email.ex:215
-#, elixir-autogen, elixir-format
-msgctxt "successful registration email body"
-msgid "<h3>Hello @%{nickname},</h3>\n<p>Your account at %{instance_name} has been registered successfully.</p>\n<p>No further action is required to activate your account.</p>\n"
-msgstr ""
-"<h3>你好，@%{nickname}，</h3>\n"
-"<p>你在 %{instance_name} 的账户已经成功注册。</p>\n"
-"<p>无需进行其他操作即可激活你的账户。</p>\n"
-
-#: lib/pleroma/emails/user_email.ex:231
-#, elixir-autogen, elixir-format
-msgctxt "successful registration email subject"
-msgid "Account registered on %{instance_name}"
-msgstr "账号注册在 %{instance_name}"
-
-#: lib/pleroma/emails/user_email.ex:136
-#, elixir-autogen, elixir-format
-msgctxt "user invitation email subject"
-msgid "Invitation to %{instance_name}"
-msgstr "邀请加入 %{instance_name}"
-
-#: lib/pleroma/emails/user_email.ex:53
-#, elixir-autogen, elixir-format
-msgctxt "welcome email html body"
-msgid "Welcome to %{instance_name}!"
-msgstr "欢迎来到%{instance_name}！"
-
-#: lib/pleroma/emails/user_email.ex:41
-#, elixir-autogen, elixir-format
-msgctxt "welcome email subject"
-msgid "Welcome to %{instance_name}!"
-msgstr "欢迎来到%{instance_name}！"
-
-#: lib/pleroma/emails/user_email.ex:65
-#, elixir-autogen, elixir-format
-msgctxt "welcome email text body"
-msgid "Welcome to %{instance_name}!"
-msgstr "欢迎来到 %{instance_name}！"
-
-#: lib/pleroma/emails/user_email.ex:368
-#, elixir-autogen, elixir-format
-msgctxt "account archive email body - admin requested"
-msgid "<p>Admin @%{admin_nickname} requested a full backup of your Akkoma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""
-"<p>管理员 @%{admin_nickname} 请求对你的 Akkoma "
-"账户进行完整备份，备份已准备好可供下载：</p>\n"
-"<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-
-#: lib/pleroma/emails/user_email.ex:356
-#, elixir-autogen, elixir-format
-msgctxt "account archive email body - self-requested"
-msgid "<p>You requested a full backup of your Akkoma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""
-"<p>您请求了 Akkoma 帐户的完整备份。备份已准备就绪，可以下载：</p>\n"
-"<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:41
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page title"
-msgid "This is your first visit! Please enter your Akkoma handle."
-msgstr "这是您的第一次访问！请填写您的Akkoma账号。"
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:123
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error message - unknown error"
-msgid "Something went wrong."
-msgstr "发生了一些错误。"
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:67
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error message - user not found"
-msgid "Could not find user"
-msgstr "无法找到相应用户"
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "status interact authorization button"
-msgid "Interact"
-msgstr "互动"
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "status interact error"
-msgid "Error: %{error}"
-msgstr "错误：%{error}"
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:95
-#, elixir-autogen, elixir-format
-msgctxt "status interact error message - status not found"
-msgid "Could not find status"
-msgstr "无法找到帖文"
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:144
-#, elixir-autogen, elixir-format
-msgctxt "status interact error message - unknown error"
-msgid "Something went wrong."
-msgstr "发生了一些错误。"
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "status interact header"
-msgid "Interacting with %{nickname}'s %{status_link}"
-msgstr "与 %{nickname} 的 %{status_link} 进行交互"
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "status interact header - status link text"
-msgid "status"
-msgstr "帖文"
-
-#: lib/pleroma/emails/user_email.ex:119
-#, elixir-autogen, elixir-format
-msgctxt "user invitation email body"
-msgid "<h3>You are invited to %{instance_name}</h3>\n<p>%{inviter_name} invites you to join %{instance_name}, an instance of Akkoma federated social networking platform.</p>\n<p>Click the following link to register: <a href=\"%{registration_url}\">accept invitation</a>.</p>\n"
-msgstr ""
-"<h3>您被邀请加入 %{instance_name}</h3>\n"
-"<p>%{inviter_name} 邀请您加入 %{instance_name}，这是一个使用 Akkoma "
-"联邦社交网络平台的实例。</p>\n"
-"<p>点击以下链接注册： <a href=\"%{registration_url}\">接受邀请</a>.</p>\n"

priv/repo/migrations/20230202154409_instance_actors_to_actor_type_application.exs

@@ -0,0 +1,21 @@
+defmodule Pleroma.Repo.Migrations.InstanceActorsToActorTypeApplication do
+  use Ecto.Migration
+
+  def up do
+    execute("""
+    update users
+    set actor_type = 'Application'
+    where local
+    and (ap_id like '%/relay' or ap_id like '%/internal/fetch')
+    """)
+  end
+
+  def down do
+    execute("""
+    update users
+    set actor_type = 'Person'
+    where local
+    and (ap_id like '%/relay' or ap_id like '%/internal/fetch')
+    """)
+  end
+end

test/pleroma/web/activity_pub/relay_test.exs

@@ -19,6 +19,12 @@ test "gets an actor for the relay" do
     assert user.ap_id == "#{Pleroma.Web.Endpoint.url()}/relay"
   end
 
+  test "relay actor is an application" do
+    # See <https://www.w3.org/TR/activitystreams-vocabulary/#dfn-application>
+    user = Relay.get_actor()
+    assert user.actor_type == "Application"
+  end
+
   test "relay actor is invisible" do
     user = Relay.get_actor()
     assert User.invisible?(user)