dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-11 04:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chat-relays

Browse Source
This commit is contained in:
spaced4ndy
2025-10-24 15:32:17 +04:00
parent 75c2bf920e 35963f9c74
commit 79bdc03529
8 changed files with 258 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Options/SQLite.hs
+2 -2
View File
@@ -76,8 +76,8 @@ toDBOpts ChatDbOpts {dbFilePrefix, dbKey, trackQueries, vacuumOnMigration} dbSuf
{ dbFilePath = dbFilePrefix <> dbSuffix,
dbKey,
keepKey,
track = trackQueries,
vacuum = vacuumOnMigration
vacuum = vacuumOnMigration,
track = trackQueries
}
chatSuffix :: String
src/Simplex/Chat/View.hs
+16 -7
View File
@@ -1422,21 +1422,30 @@ viewUserPrivacy User {userId} User {userId = userId', localDisplayName = n', sho
]
viewConnDiffSync :: DatabaseDiff AgentUserId -> DatabaseDiff AgentConnId -> [StyledString]
viewConnDiffSync userDiff connDiff =
viewConnDiffSummary userDiff connDiff
<> ["removed extra users in agent" | not (null $ extraIds userDiff)]
<> ["removed extra connections in agent" | not (null $ extraIds connDiff)]
viewConnDiffSync userDiff connDiff
| noDiff userDiff && noDiff connDiff = []
| otherwise =
viewConnDiffSummary' userDiff connDiff
<> ["removed extra users in agent" | not (null $ extraIds userDiff)]
<> ["removed extra connections in agent" | not (null $ extraIds connDiff)]
where
noDiff DatabaseDiff {missingIds, extraIds} = null missingIds && null extraIds
viewConnDiffSummary :: DatabaseDiff AgentUserId -> DatabaseDiff AgentConnId -> [StyledString]
viewConnDiffSummary userDiff connDiff
| noDiff userDiff && noDiff connDiff =
["no difference between agent and chat connections"]
| otherwise =
["connections difference summary:"]
<> showDatabaseDiff "users" userDiff
<> showDatabaseDiff "connections" connDiff
viewConnDiffSummary' userDiff connDiff
where
noDiff DatabaseDiff {missingIds, extraIds} = null missingIds && null extraIds
viewConnDiffSummary' :: DatabaseDiff AgentUserId -> DatabaseDiff AgentConnId -> [StyledString]
viewConnDiffSummary' userDiff connDiff =
["connections difference summary:"]
<> showDatabaseDiff "users" userDiff
<> showDatabaseDiff "connections" connDiff
where
showDatabaseDiff name DatabaseDiff {missingIds, extraIds} =
["number of missing " <> name <> " in agent: " <> sShow (length missingIds) | not (null missingIds)]
<> ["number of extra " <> name <> " in agent: " <> sShow (length extraIds) | not (null extraIds)]