vincent/gerbeur
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v4: an instance that takes no users of others still blocks instances its own users may not sign in to — with GERBEUR_FEDERATION_INCOMING=0, /manage hid its list of instances, though a blocked one still kept the instance's users from signing in there, and no admin could block another. The list now stays while federated sign-in goes either way: without incoming sign-ins it shows and adds only blocked instances, the trusted ones kept for when they're back, and says what blocking does there. Where both ways are on, its note now says that users here can't sign in to a blocked instance either.

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
khannurien
2026-10-09 16:33:08 +00:00
parent 83dc44050e
commit 52a23db504
6 changed files with 195 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
locales/en.po
View File

@@ -354,7 +354,7 @@ msgstr "Already dumped by {0} {1}"
msgid "Already have an account? <0>Log in</0>"
msgstr "Already have an account? <0>Log in</0>"
#: src/components/federation/PeerManager.tsx:149
#: src/components/federation/PeerManager.tsx:167
msgid "An instance's address, like music.example"
msgstr "An instance's address, like music.example"
@@ -395,11 +395,12 @@ msgstr "Back to login"
msgid "Back to the login page"
msgstr "Back to the login page"
#: src/components/federation/PeerManager.tsx:163
#: src/components/federation/PeerManager.tsx:184
#: src/components/federation/PeerManager.tsx:190
msgid "Block"
msgstr "Block"
#: src/components/federation/PeerManager.tsx:33
#: src/components/federation/PeerManager.tsx:39
msgid "Blocked"
msgstr "Blocked"
@@ -453,7 +454,7 @@ msgid "Cancel search"
msgstr "Cancel search"
#: src/components/category/CategorySelect.tsx:33
#: src/pages/Manage.tsx:38
#: src/pages/Manage.tsx:42
msgid "Categories"
msgstr "Categories"
@@ -502,7 +503,8 @@ msgstr "Chat ({unreadChatCount} unread)"
msgid "Checking invite…"
msgstr "Checking invite…"
#: src/components/federation/PeerManager.tsx:154
#: src/components/federation/PeerManager.tsx:175
#: src/components/federation/PeerManager.tsx:189
msgid "Checking…"
msgstr "Checking…"
@@ -590,7 +592,7 @@ msgstr "Could not rename"
msgid "Could not save"
msgstr "Could not save"
#: src/components/federation/PeerManager.tsx:146
#: src/components/federation/PeerManager.tsx:164
msgid "Couldn't add that instance"
msgstr "Couldn't add that instance"
@@ -885,7 +887,7 @@ msgid "Failed to post reply"
msgstr "Failed to post reply"
#: src/components/federation/GrantList.tsx:98
#: src/components/federation/PeerManager.tsx:143
#: src/components/federation/PeerManager.tsx:158
#: src/components/playlist/PlaylistEditForm.tsx:185
#: src/components/profile/DescriptionEditor.tsx:99
#: src/components/profile/EmailEditor.tsx:86
@@ -1029,7 +1031,7 @@ msgstr "In the chat"
msgid "Insert emoji"
msgstr "Insert emoji"
#: src/pages/Manage.tsx:45
#: src/pages/Manage.tsx:49
msgid "Instances"
msgstr "Instances"
@@ -1145,7 +1147,7 @@ msgstr "Loading profile…"
#: src/components/category/CategoryManager.tsx:60
#: src/components/chat/ChatModal.tsx:763
#: src/components/editor/EmojiPickerPopup.tsx:125
#: src/components/federation/PeerManager.tsx:108
#: src/components/federation/PeerManager.tsx:120
#: src/components/playlist/PlaylistMembershipPanel.tsx:45
#: src/components/shared/ListState.tsx:38
#: src/components/shared/LoadMoreButton.tsx:32
@@ -1194,8 +1196,8 @@ msgid "Lowercase letters, numbers and single hyphens only"
msgstr "Lowercase letters, numbers and single hyphens only"
#: src/components/layout/UserMenu.tsx:114
#: src/pages/Manage.tsx:29
#: src/pages/Manage.tsx:36
#: src/pages/Manage.tsx:32
#: src/pages/Manage.tsx:40
#: src/pages/UserPublicProfile.tsx:164
msgid "Manage"
msgstr "Manage"
@@ -1538,8 +1540,8 @@ msgid "Related"
msgstr "Related"
#. placeholder {0}: peer.host
#: src/components/federation/PeerManager.tsx:133
#: src/components/federation/PeerManager.tsx:134
#: src/components/federation/PeerManager.tsx:148
#: src/components/federation/PeerManager.tsx:149
msgid "Remove {0}"
msgstr "Remove {0}"
@@ -1893,11 +1895,11 @@ msgstr "Top this week"
msgid "Track {0}"
msgstr "Track {0}"
#: src/components/federation/PeerManager.tsx:155
#: src/components/federation/PeerManager.tsx:176
msgid "Trust"
msgstr "Trust"
#: src/components/federation/PeerManager.tsx:32
#: src/components/federation/PeerManager.tsx:38
msgid "Trusted"
msgstr "Trusted"
@@ -2032,7 +2034,15 @@ msgstr "Username"
msgid "Users"
msgstr "Users"
#: src/components/federation/PeerManager.tsx:169
#: src/components/federation/PeerManager.tsx:198
msgid "Users here can't sign in to a blocked instance."
msgstr "Users here can't sign in to a blocked instance."
#: src/components/federation/PeerManager.tsx:201
msgid "Users of a trusted instance sign in here with their account there. Those of a blocked one can't, and users here can't sign in to it. Users of any other instance need an invite."
msgstr "Users of a trusted instance sign in here with their account there. Those of a blocked one can't, and users here can't sign in to it. Users of any other instance need an invite."
#: src/components/federation/PeerManager.tsx:208
msgid "Users of a trusted instance sign in here with their account there. Those of a blocked one can't. Users of any other instance need an invite."
msgstr "Users of a trusted instance sign in here with their account there. Those of a blocked one can't. Users of any other instance need an invite."