From 7cb651d20708e07c3279259b2c6a222f71be532c Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Tue, 29 Sep 2026 08:13:30 +0200 Subject: [PATCH] diff cosmetics --- apps/ios/Shared/Model/AppAPITypes.swift | 2 +- .../kotlin/chat/simplex/common/model/SimpleXAPI.kt | 4 ++-- bots/api/TYPES.md | 2 +- packages/simplex-chat-client/types/typescript/src/types.ts | 2 +- .../simplex-chat-python/src/simplex_chat/types/_types.py | 2 +- src/Simplex/Chat/Controller.hs | 7 ++++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/ios/Shared/Model/AppAPITypes.swift b/apps/ios/Shared/Model/AppAPITypes.swift index abca9a6cd6..d865ce1dcb 100644 --- a/apps/ios/Shared/Model/AppAPITypes.swift +++ b/apps/ios/Shared/Model/AppAPITypes.swift @@ -1452,9 +1452,9 @@ struct ConnectionPlanResult { // APIConnectPlan resolution scope; .never is local-store-only (no network), used for per-keystroke name search enum PlanResolveMode: String { + case all case unknown case never - case all } enum ConnectionPlan: Decodable, Hashable { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt index df6d0ee30c..feb1eeb8c4 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt @@ -7430,11 +7430,11 @@ data class ConnectionPlanResult( // APIConnectPlan resolution scope; PRMNever is local-store-only (no network), used for per-keystroke name search enum class PlanResolveMode { - PRMUnknown, PRMNever, PRMAll; + PRMAll, PRMUnknown, PRMNever; val cmdString: String get() = when (this) { + PRMAll -> "all" PRMUnknown -> "unknown" PRMNever -> "never" - PRMAll -> "all" } } diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md index a1449d22ad..f285b7f1ea 100644 --- a/bots/api/TYPES.md +++ b/bots/api/TYPES.md @@ -3277,9 +3277,9 @@ count= ## PlanResolveMode **Enum type**: +- "all" - "unknown" - "never" -- "all" --- diff --git a/packages/simplex-chat-client/types/typescript/src/types.ts b/packages/simplex-chat-client/types/typescript/src/types.ts index e30bd483eb..9102711b58 100644 --- a/packages/simplex-chat-client/types/typescript/src/types.ts +++ b/packages/simplex-chat-client/types/typescript/src/types.ts @@ -3587,9 +3587,9 @@ export interface PendingContactConnection { } export enum PlanResolveMode { + All = "all", Unknown = "unknown", Never = "never", - All = "all", } export interface PrefEnabled { 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 122cfcbe6c..963da7c158 100644 --- a/packages/simplex-chat-python/src/simplex_chat/types/_types.py +++ b/packages/simplex-chat-python/src/simplex_chat/types/_types.py @@ -2503,7 +2503,7 @@ class PendingContactConnection(TypedDict): createdAt: str # ISO-8601 timestamp updatedAt: str # ISO-8601 timestamp -PlanResolveMode = Literal["unknown", "never", "all"] +PlanResolveMode = Literal["all", "unknown", "never"] class PrefEnabled(TypedDict): forUser: bool diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs index b5e696eac6..72617ac752 100644 --- a/src/Simplex/Chat/Controller.hs +++ b/src/Simplex/Chat/Controller.hs @@ -709,18 +709,19 @@ data ChatCommand deriving (Show) data PlanResolveMode - = PRMUnknown -- only resolve if chat is unknown (default) + = PRMAll -- always resolve, also known chats + | PRMUnknown -- only resolve if chat is unknown (default) | PRMNever -- do not resolve links and names, only do local search - | PRMAll -- always resolve, also known chats deriving (Eq, Show) planResolveModeP :: A.Parser PlanResolveMode planResolveModeP = A.takeTill (== ' ') >>= \case + "all" -> pure PRMAll + "on" -> pure PRMAll "unknown" -> pure PRMUnknown "off" -> pure PRMUnknown "never" -> pure PRMNever - "all" -> pure PRMAll _ -> fail "bad PlanResolveMode" data CommandSource