android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-28 20:29:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

directory service: fix deleting group registration (#5856)

Browse source
This commit is contained in:
Evgeny 2025-04-27 15:55:49 +01:00 • committed by GitHub
parent 7cac164b84
commit ca49167ec6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/simplex-directory-service/src/Directory/Service.hs
View file

@ -699,11 +699,6 @@ directoryServiceEvent st opts@DirectoryOpts {adminUsers, superUsers, serviceName
DCListUserGroups -> DCListUserGroups ->
getUserGroupRegs st (contactId' ct) >>= \grs -> do getUserGroupRegs st (contactId' ct) >>= \grs -> do
sendReply $ tshow (length grs) <> " registered group(s)" sendReply $ tshow (length grs) <> " registered group(s)"
-- debug how it can be that user has 0 registered groups
when (length grs == 0) $ do
total <- length <$> readTVarIO (groupRegs st)
withSuperUsers $ \ctId -> sendMessage' cc ctId $
"0 registered groups for " <> localDisplayName' ct <> " (" <> tshow (contactId' ct) <> ") out of " <> tshow total <> " registrations"
void . forkIO $ forM_ (reverse grs) $ \gr@GroupReg {userGroupRegId} -> void . forkIO $ forM_ (reverse grs) $ \gr@GroupReg {userGroupRegId} ->
sendGroupInfo ct gr userGroupRegId Nothing sendGroupInfo ct gr userGroupRegId Nothing
DCDeleteGroup gId gName -> DCDeleteGroup gId gName ->

2
apps/simplex-directory-service/src/Directory/Store.hs
View file

@ -212,7 +212,7 @@ delGroupReg st GroupReg {dbGroupId = gId, groupRegStatus} = do
logGDelete st gId logGDelete st gId
atomically $ writeTVar groupRegStatus GRSRemoved atomically $ writeTVar groupRegStatus GRSRemoved
atomically $ unlistGroup st gId atomically $ unlistGroup st gId
atomically $ modifyTVar' (groupRegs st) $ filter ((gId ==) . dbGroupId) atomically $ modifyTVar' (groupRegs st) $ filter ((gId /=) . dbGroupId)
setGroupStatus :: DirectoryStore -> GroupReg -> GroupRegStatus -> IO () setGroupStatus :: DirectoryStore -> GroupReg -> GroupRegStatus -> IO ()
setGroupStatus st gr grStatus = do setGroupStatus st gr grStatus = do

6
tests/Bots/DirectoryTests.hs
View file

@ -299,10 +299,12 @@ testDeleteGroupAdmin ps =
superUser #> "@SimpleX-Directory /delete 2:security" superUser #> "@SimpleX-Directory /delete 2:security"
superUser <# "SimpleX-Directory> > /delete 2:security" superUser <# "SimpleX-Directory> > /delete 2:security"
superUser <## " The group security is deleted from the directory" superUser <## " The group security is deleted from the directory"
groupFound bob "privacy" groupFound cath "privacy"
listUserGroup bob "privacy" "Privacy"
groupNotFound bob "security" groupNotFound bob "security"
sendListCommand cath 0
-- another user can register the group with the same name -- another user can register the group with the same name
registerGroupId superUser bob "security" "Security" 4 1 registerGroupId superUser bob "security" "Security" 4 2
testSetRole :: HasCallStack => TestParams -> IO () testSetRole :: HasCallStack => TestParams -> IO ()
testSetRole ps = testSetRole ps =