From 5825ad84de45277be45703ecc7232928ab8887e6 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Wed, 1 Jul 2026 20:36:26 +0100 Subject: [PATCH] clean up --- .../common/src/commonMain/resources/MR/base/strings.xml | 2 -- bots/api/TYPES.md | 2 +- packages/simplex-chat-client/types/typescript/src/types.ts | 2 +- packages/simplex-chat-python/src/simplex_chat/types/_types.py | 2 +- src/Simplex/Chat/Types.hs | 2 +- src/Simplex/Chat/View.hs | 4 ++-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml index 69f9638cfb..2f85d4a847 100644 --- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml @@ -951,8 +951,6 @@ Error saving name The SimpleX name %1$s is registered without channel link. Add channel link to the name via the registration page. The SimpleX name %1$s is registered without SimpleX address. Add your SimpleX address to the name via the registration page. - Set a SimpleX name so people can connect to you using @yourname instead of a link. The name must already be registered to your address. - Set a SimpleX name so people can find this channel as #name. The name must be registered to this channel\'s address. Let people connect to you via name registered with your SimpleX address. Let people join via name registered with this channel link. Or show this code diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md index 094390bd24..d5a23a33af 100644 --- a/bots/api/TYPES.md +++ b/bots/api/TYPES.md @@ -3214,7 +3214,7 @@ NO_SESSION: **Record type**: - groupWebPage: string? - simplexName: [SimplexNameClaim](#simplexnameclaim)? -- simplexNameWebPage: bool +- domainWebPage: bool - allowEmbedding: bool diff --git a/packages/simplex-chat-client/types/typescript/src/types.ts b/packages/simplex-chat-client/types/typescript/src/types.ts index 5a0f1147da..bde3c70822 100644 --- a/packages/simplex-chat-client/types/typescript/src/types.ts +++ b/packages/simplex-chat-client/types/typescript/src/types.ts @@ -3473,7 +3473,7 @@ export namespace ProxyError { export interface PublicGroupAccess { groupWebPage?: string simplexName?: SimplexNameClaim - simplexNameWebPage: boolean + domainWebPage: boolean allowEmbedding: boolean } diff --git a/packages/simplex-chat-python/src/simplex_chat/types/_types.py b/packages/simplex-chat-python/src/simplex_chat/types/_types.py index 8e1d9eb399..88f54211cc 100644 --- a/packages/simplex-chat-python/src/simplex_chat/types/_types.py +++ b/packages/simplex-chat-python/src/simplex_chat/types/_types.py @@ -2436,7 +2436,7 @@ ProxyError_Tag = Literal["PROTOCOL", "BROKER", "BASIC_AUTH", "NO_SESSION"] class PublicGroupAccess(TypedDict): groupWebPage: NotRequired[str] simplexName: NotRequired["SimplexNameClaim"] - simplexNameWebPage: bool + domainWebPage: bool allowEmbedding: bool class PublicGroupData(TypedDict): diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs index 2509b5f551..5f2b99ce42 100644 --- a/src/Simplex/Chat/Types.hs +++ b/src/Simplex/Chat/Types.hs @@ -52,7 +52,7 @@ import Data.Type.Equality (testEquality, (:~:) (Refl)) import Data.Typeable (Typeable) import Data.Word (Word16) import Simplex.Chat.Badges (BadgeInfo (..), BadgeProof (..), BadgeStatus (..), LocalBadge (..), localBadgeInfo, localBadgeStatus, mkBadgeStatus, verifyBadge) -import Simplex.Chat.Names (NameClaimProof (..), SimplexNameClaim, setClaimProof) +import Simplex.Chat.Names (SimplexNameClaim, setClaimProof) import Simplex.Messaging.Crypto.BBS (BBSPublicKey) import Simplex.Chat.Types.Preferences import Simplex.Chat.Types.Shared diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index f53e53b7ed..818f02fd6a 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -2049,10 +2049,10 @@ viewGroupUpdated access = pg >>= publicGroupAccess access' = pg' >>= publicGroupAccess viewAccess Nothing = " removed" - viewAccess (Just PublicGroupAccess {groupWebPage, simplexName, simplexNameWebPage, allowEmbedding}) = + viewAccess (Just PublicGroupAccess {groupWebPage, simplexName, domainWebPage, allowEmbedding}) = maybe "" (\u -> " web=" <> plain u) groupWebPage <> maybe "" (\ni -> " name=" <> plain (strEncode ni)) (claimName <$> simplexName) - <> (if simplexNameWebPage then " name_page=on" else "") + <> (if domainWebPage then " name_page=on" else "") <> (if allowEmbedding then " embed=on" else "") viewGroupProfile :: GroupInfo -> [StyledString]