dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-03 13:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert breaking field name change

Browse Source
This commit is contained in:
Evgeny Poberezkin
2026-07-01 17:35:51 +01:00
parent fbb171019f
commit c86bf5b3b4
8 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Library/Commands.hs
+2 -2
View File
@@ -5662,9 +5662,9 @@ chatCommandP =
publicGroupAccessP = do
groupWebPage <- optional (" web=" *> (safeDecodeUtf8 <$> A.takeTill A.isSpace))
simplexName <- optional (" name=" *> strP)
simplexNameWebPage <- (" name_page=" *> onOffP) <|> pure False
domainWebPage <- (" name_page=" *> onOffP) <|> pure False
allowEmbedding <- (" embed=" *> onOffP) <|> pure False
pure PublicGroupAccess {groupWebPage, simplexName = mkSimplexNameClaim simplexName Nothing, simplexNameWebPage, allowEmbedding}
pure PublicGroupAccess {groupWebPage, simplexName = mkSimplexNameClaim simplexName Nothing, domainWebPage, allowEmbedding}
profileNameDescr = (,) <$> displayNameP <*> shortDescrP
-- 'Help with bot':'link <ID>','Menu of commands':[...]
botCommandsP :: Parser [ChatBotCommand]
src/Simplex/Chat/Store/Shared.hs
+6 -6
View File
@@ -708,17 +708,17 @@ toPublicGroupProfile _ _ _ _ = Nothing
publicGroupAccessRow :: Maybe PublicGroupProfile -> PublicGroupAccessRow
publicGroupAccessRow pgp = case pgp >>= publicGroupAccess of
Just PublicGroupAccess {groupWebPage, simplexName, simplexNameWebPage, allowEmbedding} ->
(groupWebPage, claimName <$> simplexName, Just (BI simplexNameWebPage), Just (BI allowEmbedding), claimProof =<< simplexName)
Just PublicGroupAccess {groupWebPage, simplexName, domainWebPage, allowEmbedding} ->
(groupWebPage, claimName <$> simplexName, Just (BI domainWebPage), Just (BI allowEmbedding), claimProof =<< simplexName)
Nothing -> (Nothing, Nothing, Nothing, Nothing, Nothing)
toPublicGroupAccess :: PublicGroupAccessRow -> Maybe PublicGroupAccess
toPublicGroupAccess (groupWebPage, simplexName, simplexNameWebPage_, allowEmbedding_, simplexNameProof)
| isJust groupWebPage || isJust simplexName || simplexNameWebPage || allowEmbedding =
Just PublicGroupAccess {groupWebPage, simplexName = mkSimplexNameClaim simplexName simplexNameProof, simplexNameWebPage, allowEmbedding}
toPublicGroupAccess (groupWebPage, simplexName, domainWebPage_, allowEmbedding_, simplexNameProof)
| isJust groupWebPage || isJust simplexName || domainWebPage || allowEmbedding =
Just PublicGroupAccess {groupWebPage, simplexName = mkSimplexNameClaim simplexName simplexNameProof, domainWebPage, allowEmbedding}
| otherwise = Nothing
where
simplexNameWebPage = maybe False unBI simplexNameWebPage_
domainWebPage = maybe False unBI domainWebPage_
allowEmbedding = maybe False unBI allowEmbedding_
toGroupKeys :: Maybe B64UrlByteString -> GroupKeysRow -> Maybe GroupKeys
src/Simplex/Chat/Types.hs
+1 -1
View File
@@ -846,7 +846,7 @@ instance ToField GroupType where toField = toField . textEncode
data PublicGroupAccess = PublicGroupAccess
{ groupWebPage :: Maybe Text,
simplexName :: Maybe SimplexNameClaim,
simplexNameWebPage :: Bool,
domainWebPage :: Bool,
allowEmbedding :: Bool
}
deriving (Eq, Show)