Merge branch 'master' into users

This commit is contained in:
JRoberts
2023-01-16 16:10:43 +04:00
43 changed files with 8162 additions and 131 deletions
+4
View File
@@ -77,6 +77,7 @@ data ChatConfig = ChatConfig
subscriptionConcurrency :: Int,
subscriptionEvents :: Bool,
hostEvents :: Bool,
logLevel :: ChatLogLevel,
testView :: Bool
}
@@ -567,6 +568,9 @@ tmeToPref currentTTL tme = uncurry TimedMessagesPreference $ case tme of
TMEEnableKeepTTL -> (FAYes, currentTTL)
TMEDisableKeepTTL -> (FANo, currentTTL)
data ChatLogLevel = CLLDebug | CLLInfo | CLLWarning | CLLError | CLLImportant
deriving (Eq, Ord, Show)
data ChatError
= ChatError {errorType :: ChatErrorType}
| ChatErrorAgent {agentError :: AgentErrorType, connectionEntity_ :: Maybe ConnectionEntity}