From 76bfb8b11268f8ed48a022f04d15dc4e1fc2ee35 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Wed, 5 Nov 2025 10:37:17 +0000 Subject: [PATCH 01/32] website: add link to old home page to menu --- website/langs/en.json | 3 ++- website/src/_includes/navbar.html | 33 ++++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/website/langs/en.json b/website/langs/en.json index 02f370f2cc..fa88ff3d51 100644 --- a/website/langs/en.json +++ b/website/langs/en.json @@ -312,5 +312,6 @@ "messengers-comparison-section-list-point-3": "It appears that the usage of cryptographic signatures compromises repudiation (deniability), but it needs to be clarified.", "messengers-comparison-section-list-point-4": "Multi-device implementation compromises post-compromise security of Double Ratchet", "messengers-comparison-section-list-point-5": "2-factor key exchange is optional via security code verification.", - "messengers-comparison-section-list-point-6": "Post-quantum key agreement is \"sparse\" — it protects only some of the ratchet steps." + "messengers-comparison-section-list-point-6": "Post-quantum key agreement is \"sparse\" — it protects only some of the ratchet steps.", + "navbar-old-site": "Old site" } \ No newline at end of file diff --git a/website/src/_includes/navbar.html b/website/src/_includes/navbar.html index 97471ae7f5..662bde1593 100644 --- a/website/src/_includes/navbar.html +++ b/website/src/_includes/navbar.html @@ -97,6 +97,12 @@ target="_blank">SimpleXMQ +
+
  • + +

    {{ 'navbar-old-site' | i18n({}, lang) }}

    +     +
    • @@ -153,7 +159,7 @@ {% for language in languages.languages %} {% if language.label == supportedLang %}
  • - +

    {{ language.name }}
    • @@ -164,7 +170,7 @@ {% for language in languages.languages %} {% if language.enabled and (language.home or (page.url != '/' and page.url != '/' + lang + '/')) %}
  • - +

    {{ language.name }}
    • @@ -205,41 +211,40 @@ const userTheme = localStorage.getItem('theme'); const systemTheme = window.matchMedia('(prefers-color-scheme: dark)').matches; const prismThemeLink = document.getElementById('prism-theme') -const iconToggle = () => { +function iconToggle () { sunIcon.classList.toggle('hidden'); moonIcon.classList.toggle('hidden'); } -const themeCheck = () => { - if(userTheme === 'dark' || (!userTheme && systemTheme)){ +function themeCheck() { + if (userTheme === 'dark' || (!userTheme && systemTheme)) { document.documentElement.classList.add('dark'); moonIcon.classList.add('hidden'); - if(prismThemeLink){ + if (prismThemeLink) { prismThemeLink.setAttribute('href','/css/prism-dark.min.css') } } else{ sunIcon.classList.add('hidden'); - if(prismThemeLink){ + if (prismThemeLink) { prismThemeLink.setAttribute('href','/css/prism-light.min.css') } } } themeCheck(); -const themeSwitch = () => { - if(document.documentElement.classList.contains('dark')){ +function themeSwitch () { + if (document.documentElement.classList.contains('dark')) { document.documentElement.classList.remove('dark'); - localStorage.setItem('theme','light'); + localStorage.setItem('theme', 'light'); if(prismThemeLink){ prismThemeLink.setAttribute('href','/css/prism-light.min.css') } iconToggle(); - } - else{ + } else { document.documentElement.classList.add('dark'); - localStorage.setItem('theme','dark'); - if(prismThemeLink){ + localStorage.setItem('theme', 'dark'); + if (prismThemeLink) { prismThemeLink.setAttribute('href','/css/prism-dark.min.css') } iconToggle(); From 6ff87b8e834132a2db785cec4d9754f68fe34a70 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Mon, 10 Nov 2025 18:52:23 +0000 Subject: [PATCH 02/32] website: hide menu on doc pages --- website/src/_includes/layouts/doc.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/_includes/layouts/doc.html b/website/src/_includes/layouts/doc.html index f26d3296e0..017526d164 100644 --- a/website/src/_includes/layouts/doc.html +++ b/website/src/_includes/layouts/doc.html @@ -77,7 +77,7 @@ {% endif %} -
    +
    {{ content | safe }}
    From f67dfcce5f38c545dede8c41430d529d6f19b759 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Mon, 10 Nov 2025 19:31:00 +0000 Subject: [PATCH 03/32] website: update Community Vouchers page --- docs/DONATIONS.md | 32 +++++++++++++ website/langs/de.json | 2 +- website/langs/en.json | 2 +- website/langs/es.json | 2 +- website/langs/hu.json | 2 +- website/langs/it.json | 2 +- website/langs/ru.json | 2 +- website/src/_includes/layouts/article.html | 2 +- website/src/_includes/layouts/main.html | 2 +- website/src/_includes/layouts/privacy.html | 2 +- .../{group_link.html => redirect.html} | 6 +-- website/src/_includes/layouts/token.html | 2 +- website/src/_includes/navbar.html | 14 ++---- website/src/connect-team.html | 6 +-- website/src/img/share_simplex.jpg | Bin 0 -> 10943 bytes website/src/img/share_simplex.png | Bin 39408 -> 0 bytes website/src/index.html | 4 +- website/src/js/design3.js | 2 - website/src/livestream.html | 8 ---- website/src/messaging.html | 2 +- website/src/token.html | 8 ++++ website/src/token.md | 44 +++++++----------- 22 files changed, 80 insertions(+), 66 deletions(-) create mode 100644 docs/DONATIONS.md rename website/src/_includes/layouts/{group_link.html => redirect.html} (82%) create mode 100644 website/src/img/share_simplex.jpg delete mode 100644 website/src/img/share_simplex.png delete mode 100644 website/src/livestream.html create mode 100644 website/src/token.html diff --git a/docs/DONATIONS.md b/docs/DONATIONS.md new file mode 100644 index 0000000000..3fdf362021 --- /dev/null +++ b/docs/DONATIONS.md @@ -0,0 +1,32 @@ +--- +layout: layouts/privacy.html +permalink: /donate/index.html +--- + +# Please support us with donations + +Huge thank you to everybody who donated to SimpleX Chat! + +We are prioritizing users privacy and security - it would be impossible without your support. + +Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure. + +Your donations help us raise more funds - any amount, even the price of the cup of coffee, makes a big difference for us. + +Please donate via: + +- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission). +- BTC: [bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u](bitcoin:bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u) +- XMR: [8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt](monero:8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt) +- BCH: [qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg](bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg) +- ETH/USDT (Ethereum, Arbitrum One): [0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a) +- ZEC: [t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg](zcash:t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg) +- ZEC shielded: [u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq](zcash:u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq) +- DOGE: [D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf](dogecoin:D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf) +- SOL: [7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu](solana:7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu) + +Thank you, + +Evgeny + +SimpleX Chat founder diff --git a/website/langs/de.json b/website/langs/de.json index 4c5925a7b8..18f56b5066 100644 --- a/website/langs/de.json +++ b/website/langs/de.json @@ -283,7 +283,7 @@ "index-token-h2": "Communities, die Bestand haben", "index-token-p1": "Sie werden Ihre Lieblingsgruppen mit zukünftigen Community-Gutscheinen unterstützen.", "index-token-p2": "Server werden mit Gutscheinen bezahlt, damit Ihre Communities kostenlos und unabhängig bleiben können.", - "index-token-cta": "Erfahren Sie mehr und holen Sie sich Ihren kostenlosen NFT
    zum frühzeitigen ausprobieren.", + "index-token-cta": "Erfahren Sie mehr und holen Sie sich Ihren kostenlosen NFT zum frühzeitigen ausprobieren.", "index-roadmap-h2": "SimpleX - Roadmap zum freien Internet", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Skalierung auf große Communities", diff --git a/website/langs/en.json b/website/langs/en.json index fa88ff3d51..dc97d9ab66 100644 --- a/website/langs/en.json +++ b/website/langs/en.json @@ -284,7 +284,7 @@ "index-token-h2": "Communities That Last", "index-token-p1": "You will support your favorite groups with future Community Vouchers.", "index-token-p2": "Vouchers will pay for servers, to let your communities stay free and independent.", - "index-token-cta": "Learn more and get your free NFT
    for early testing.", + "index-token-cta": "Learn more and get a free access pass for early testing.", "index-roadmap-h2": "SimpleX Roadmap to Free Internet", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Scale to Large Communities", diff --git a/website/langs/es.json b/website/langs/es.json index 9ab62eade5..3489fb3b9b 100644 --- a/website/langs/es.json +++ b/website/langs/es.json @@ -283,7 +283,7 @@ "index-token-h2": "Comunidades Duraderas", "index-token-p1": "Podrás apoyar a tus grupos favoritos con los futuros Vales Comunitarios.", "index-token-p2": "Los vales costearán los servidores para que tus comunidades sigan siendo libres e independientes.", - "index-token-cta": "Descubre más y obtén tu NFT gratuito
    por participar en las pruebas.", + "index-token-cta": "Descubre más y obtén tu NFT gratuito por participar en las pruebas.", "index-roadmap-h2": "Ruta SimpleX hacía el Internet Libre", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Escalar a Comunidades Grandes", diff --git a/website/langs/hu.json b/website/langs/hu.json index 85876c8b92..77d3ce878b 100644 --- a/website/langs/hu.json +++ b/website/langs/hu.json @@ -283,7 +283,7 @@ "index-token-h2": "Időtálló közösségek", "index-token-p1": "A jövőben közösségi utalványokkal támogathatja a kedvenc csoportjait.", "index-token-p2": "Az utalványokkal fizetni tudja a kiszolgálókat, hogy a közösségek szabadok és függetlenek maradhassanak.", - "index-token-cta": "Tudjon meg többet, és szerezzen ingyenes NFT-t
    az előzetes tesztelésért.", + "index-token-cta": "Tudjon meg többet, és szerezzen ingyenes NFT-t az előzetes tesztelésért.", "index-roadmap-h2": "A SimpleX ütemterve a szabad internethez", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Skálázódás nagy közösségekre", diff --git a/website/langs/it.json b/website/langs/it.json index b4db5e2399..f6b35588f6 100644 --- a/website/langs/it.json +++ b/website/langs/it.json @@ -283,7 +283,7 @@ "index-token-h2": "Comunità fatte per restare", "index-token-p1": "Sosterrai i tuoi gruppi preferiti con futuri buoni comunitari.", "index-token-p2": "I buoni pagheranno i server, per consentire alle tue comunità di rimanere libere e indipendenti.", - "index-token-cta": "Scopri di più e ricevi un NFT gratuito
    per provarlo in anticipo.", + "index-token-cta": "Scopri di più e ricevi un NFT gratuito per provarlo in anticipo.", "index-roadmap-h2": "Tabella di marcia per un internet libero", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Scalabilità per comunità numerose", diff --git a/website/langs/ru.json b/website/langs/ru.json index 5c59c3e848..fbfa6d3539 100644 --- a/website/langs/ru.json +++ b/website/langs/ru.json @@ -283,7 +283,7 @@ "index-token-h2": "Стабильные Сообщества", "index-token-p1": "Вы сможете поддерживать Ваши любимые группы с помощью будущих Ваучеров Групп.", "index-token-p2": "Ваучеры будут использоваться для оплаты за серверы, чтобы группы оставались свободными и независимыми.", - "index-token-cta": "Узнайте больше и возьмите бесплатный NFT, чтобы участвовать в тестировании.", + "index-token-cta": "Узнайте больше и возьмите бесплатный пропуск, чтобы участвовать в тестировании.", "index-roadmap-h2": "Путь Сети SimpleX к Свободному Интернету", "index-roadmap-2025": "2025", "index-roadmap-2025-title": "Большие каналы и группы", diff --git a/website/src/_includes/layouts/article.html b/website/src/_includes/layouts/article.html index 628a1a4e05..72d9b10b78 100644 --- a/website/src/_includes/layouts/article.html +++ b/website/src/_includes/layouts/article.html @@ -19,7 +19,7 @@ {% if image %} {% else %} - + {% endif %} diff --git a/website/src/_includes/layouts/main.html b/website/src/_includes/layouts/main.html index 669347330c..999e3af901 100644 --- a/website/src/_includes/layouts/main.html +++ b/website/src/_includes/layouts/main.html @@ -22,7 +22,7 @@ - + diff --git a/website/src/_includes/layouts/privacy.html b/website/src/_includes/layouts/privacy.html index eca6bfc6c1..7b41c6e5bc 100644 --- a/website/src/_includes/layouts/privacy.html +++ b/website/src/_includes/layouts/privacy.html @@ -19,7 +19,7 @@ {% if image %} {% else %} - + {% endif %} diff --git a/website/src/_includes/layouts/group_link.html b/website/src/_includes/layouts/redirect.html similarity index 82% rename from website/src/_includes/layouts/group_link.html rename to website/src/_includes/layouts/redirect.html index 7a13ba7a49..b4b7ca8ba6 100644 --- a/website/src/_includes/layouts/group_link.html +++ b/website/src/_includes/layouts/redirect.html @@ -10,12 +10,12 @@ - + - + -

    {{ groupLinkText }}

    +

    {{ destinationText }}

    diff --git a/website/src/_includes/layouts/token.html b/website/src/_includes/layouts/token.html index 040b70b532..62e8e386b3 100644 --- a/website/src/_includes/layouts/token.html +++ b/website/src/_includes/layouts/token.html @@ -16,7 +16,7 @@ - + diff --git a/website/src/_includes/navbar.html b/website/src/_includes/navbar.html index 662bde1593..97faa42f45 100644 --- a/website/src/_includes/navbar.html +++ b/website/src/_includes/navbar.html @@ -97,12 +97,6 @@ target="_blank">SimpleXMQ -
    -
  • - -

    {{ 'navbar-old-site' | i18n({}, lang) }}

    -     -
    • @@ -117,9 +111,9 @@
    - {% if ('old' not in page.url) %} - - {{ 'navbar-token' | i18n({}, lang) }} + {% if ('donate' not in page.url) %} + + {{ 'donate' | i18n({}, lang) }} {% endif %} - {% if ('blog' not in page.url) and ('about' not in page.url) and ('privacy' not in page.url) and ('directory' not in page.url) and ('token' not in page.url) %} + {% if ('blog' not in page.url) and ('about' not in page.url) and ('donate' not in page.url) and ('privacy' not in page.url) and ('directory' not in page.url) and ('vouchers' not in page.url) %}
    {% for language in languages.languages %} diff --git a/website/src/connect-team.html b/website/src/connect-team.html index b420ba0aec..3856162c56 100644 --- a/website/src/connect-team.html +++ b/website/src/connect-team.html @@ -1,8 +1,8 @@ --- -layout: layouts/group_link.html +layout: layouts/redirect.html title: "SimpleX Chat - connect to the team" description: "Connect to the team via SimpleX Chat to ask any questions and send feedback" -groupLink: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion" -groupLinkText: Connect to the team +destinationURI: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion" +destinationText: Connect to the team templateEngineOverride: njk --- diff --git a/website/src/img/share_simplex.jpg b/website/src/img/share_simplex.jpg new file mode 100644 index 0000000000000000000000000000000000000000..033a8cfcc4a5ec1c6cff0600387e7ac9cb80c50f GIT binary patch literal 10943 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

    fuQ1bv$&@#fW7Ja;)PIL9#+`VrJ8((l7Bl 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 YkSY;kuA%5rCh)jyVSBO8>{jCc03<&wj{pDw diff --git a/website/src/index.html b/website/src/index.html index a9aee8235f..443b4a3302 100644 --- a/website/src/index.html +++ b/website/src/index.html @@ -31,7 +31,7 @@ active_home: true - + @@ -155,7 +155,7 @@ active_home: true

    {{ "index-token-h2" | i18n({}, lang) }}

    {{ "index-token-p1" | i18n({}, lang) }}

    {{ "index-token-p2" | i18n({}, lang) }}

    -     {{ "index-token-cta" | i18n({}, lang) | safe }} + {{ "index-token-cta" | i18n({}, lang) | safe }}
    diff --git a/website/src/js/design3.js b/website/src/js/design3.js index 97c1275b05..bc725ac7ce 100644 --- a/website/src/js/design3.js +++ b/website/src/js/design3.js @@ -115,8 +115,6 @@ async function showPromotedGroups() { \\__ \\| || |\\/| | _/ |__| _| / . \\| (__| __ |/ _ \\| | |___/___|_| |_|_| |____|___/_/ \\_\\\\___|_||_/_/ \\_\\_| -Mint SimpleX NFT for SMPX testnet access in 2026: https://simplex.chat/token - SimpleX directory: https://simplex.chat/directory Ask SimpleX team: https://smp6.simplex.im/a#lrdvu2d8A1GumSmoKb2krQmtKhWXq-tyGpHuM7aMwsw GitHub: https://github.com/simplex-chat/simplex-chat diff --git a/website/src/livestream.html b/website/src/livestream.html deleted file mode 100644 index ee7a96ab30..0000000000 --- a/website/src/livestream.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: layouts/group_link.html -title: "SimpleX Chat: Power to the People" -description: "Join the group for livestream Q&A" -groupLink: "https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2FSkIkI6EPd2D63F4xFKfHk7I1UGZVNn6k1QWZ5rcyr6w%3D%40smp9.simplex.im%2FoVQ-kg2rjMRituleO6t26DhQDPW6OjLL%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEATIRrsU4GwjpF6SeMWa6Li20Rkibgu4ozZMADZfdAZzE%253D%26srv%3Djssqzccmrcws6bhmn77vgmhfjmhwlyr3u7puw4erkyoosywgl67slqqd.onion" -groupLinkText: Open Livestream Q&A group link -templateEngineOverride: njk ---- \ No newline at end of file diff --git a/website/src/messaging.html b/website/src/messaging.html index 7b378e6a73..4ab6c1c2cd 100644 --- a/website/src/messaging.html +++ b/website/src/messaging.html @@ -1,6 +1,6 @@ --- layout: layouts/main.html -title: "SimpleX Chat: Learn more about SimpleX messaging" +title: "SimpleX Chat: The World's Most Secure Messaging" description: "SimpleX Chat - a private and encrypted messenger without any user IDs (not even random ones)! Make a private connection via link / QR code to send messages and make calls." templateEngineOverride: njk --- diff --git a/website/src/token.html b/website/src/token.html new file mode 100644 index 0000000000..120e5c277d --- /dev/null +++ b/website/src/token.html @@ -0,0 +1,8 @@ +--- +layout: layouts/redirect.html +title: "SimpleX Community Vouchers" +description: "" +destinationURI: "/vouchers/" +destinationText: Connect to the team +templateEngineOverride: njk +--- diff --git a/website/src/token.md b/website/src/token.md index d524180215..9a7fde2361 100644 --- a/website/src/token.md +++ b/website/src/token.md @@ -1,42 +1,32 @@ --- layout: layouts/token.html -title: "Community Vouchers: Your Freedom and Security" -permalink: "/token/index.html" +title: "SimpleX Community Vouchers" +permalink: "/vouchers/index.html" --- # SimpleX Community Vouchers -We're developing Community Vouchers as a way to enable secure payments to server operators, to make communities sustainable. +Since we started developing the SimpleX network, the app has been downloaded over 1.5 million times. -Group or channel owners can select network operators for better reliability and censorship resistance than with traditional online publishing methods. +We are not just building a messenger. Unlike today's web dominated by big tech platforms, SimpleX is a network where you fully control your online identity, contacts, groups, and content – without ads tracking you or companies mining your data. -These vouchers are blockchain utility tokens — to focus purely on server capacity usage, like prepaid telephone cards. +The SimpleX network is designed to be private, secure, decentralized (meaning no single company owns it), and truly owned by its users. That's why we develop it as fully open-source code (anyone can review it or build their own apps and servers). -**What these tokens are not**: Community Vouchers are not freely tradable tokens. They are also not a way to raise funds. +To make this vision sustainable, we're introducing Community Vouchers in 2026. Think of them as simple prepaid cards for phone calls, but for funding the servers that power your channels and groups. -**What they are**: A mechanism to pay for servers, privately. Our goal is to make it possible to buy Community Vouchers via usual credit card and in-app payments, so that everybody can use them, not only people who use cryptocurrencies. - -## SMPX: Community Voucher Token planned for 2026 +**How it will work in simple terms**: +- Community Vouchers can be purchased using the usual in-app payments (like via Apple or Google Play) or using cryptocurrency, such as Bitcoin or Monero. +- Community Vouchers are secure and private: their usage can't be linked to their purchase, however you paid for them, thanks to advanced cryptography (zero-knowledge proofs). -SMPX token is v1 of Community Vouchers. We are aiming to launch it in 2026. +Under the hood, Community Vouchers are utility tokens on a blockchain (a secure, shared ledger that no single company controls). But you won't have to use blockchain if you don't want to: we are making vouchers as easy to use as gift cards. -Mint a free SimpleX NFT on Ethereum network (mainnet) for SMPX testnet access and feedback. The NFT is limited to 1 per wallet, non-transferable. +Community Vouchers are not tradable, and there will be no "pre-mine" or public sale. -**Preliminary token overview** -- full name: **SimpleX Community Voucher**. -- symbol: SMPX. -- network: TBC. There are several viable L2 candidates: Arbitrum One, Optimism, Polygon, etc., and we are considering other networks as well. -- standard: ERC20, with contract-enforced supply and other limits on transactions and holdings (TBD based on modeling and testing, these will not be freely tradable ERC20 tokens). +If you have a cryptowallet, and want to test Community Vouchers early, before full release, you can get a free access pass to the test version — a free non-transferrable NFT on Ethereum mainnet, you only need to pay for gas. -**Potential utilities** -- Server messaging and file capacity for large channels and communities beyond free tier (see FAQ). -- Names in SimpleX Name System. - -We're working with blockchain and legal experts for feasibility and compliance, aiming to launch testnet in 2026. Details may change based on input. More in our upcoming whitepaper draft. - -To receive updates, sign up via email or connect to us [via SimpleX Chat](https://smp6.simplex.im/a#lrdvu2d8A1GumSmoKb2krQmtKhWXq-tyGpHuM7aMwsw). +To receive updates, connect to us [via SimpleX Chat](https://smp6.simplex.im/a#lrdvu2d8A1GumSmoKb2krQmtKhWXq-tyGpHuM7aMwsw). ## Community Vouchers FAQ — send your feedback @@ -56,7 +46,7 @@ These are early insights into how Community Vouchers can work — some of th - [Why Not Existing Crypto?](#why-not-existing-crypto) - [Why build on Ethereum blockchain?](#why-build-on-ethereum-blockchain) - [Have you considered other blockchains?](#have-you-considered-other-blockchains) -- [Why use ERC20 specification? Isn't it designed for freely tradable tokens?](#why-use-erc20-specification-isnt-it-designed-for-freely-tradable-tokens) +- [Which token specification do you plan to use?](#which-token-specification-do-you-plan-to-use) - [If you build on another blockchain, how the NFT will be used to provide access?](#if-you-build-on-another-blockchain-how-the-nft-will-be-used-to-provide-access) ### Why Community Vouchers? @@ -173,11 +163,11 @@ This was our assessment as well in the past. But the last three years changed it We are actively considering which blockchain to build on. Ethereum ecosystem is the most widely adopted, and has very mature systems and tools, and it appears sufficient, but it has its downsides, as does everything. So we are not yet committed to Ethereum. -### Why use ERC20 specification? Isn't it designed for freely tradable tokens? +### Which token specification do you plan to use? -[ERC20 token specification](https://eips.ethereum.org/EIPS/eip-20) has wider scope. It is very simple, one of the earliest, and the most adopted standard on EVM blockchain. It defines tokens, but they don't have to be freely tradeable — the specification allows any extensions and restrictions implemented on top of it. +Even though these are not freely tradable tokens, we will likely make them compatible with [ERC20 token specification](https://eips.ethereum.org/EIPS/eip-20). It is very simple, one of the earliest, and the most adopted standard on EVM blockchain. It defines tokens, but they don't have to be freely tradeable — the specification allows any extensions and restrictions implemented on top of it. -Because of its wide adoption, this specification is the right choice to build on, at least initially, as it will be compatible with all wallets and existing tools out of the box, making testing, development, and early adoption much easier. +Using this specification would make Community Vouchers partially compatible with wallets and chain explorers, making testing, development, and early adoption easier. ### If you build on another blockchain, how the NFT will be used to provide access? From 70e23a04cedb5b8a3e5373fabd6c8ba31422d048 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Fri, 14 Nov 2025 09:00:58 +0000 Subject: [PATCH 04/32] ui: allow to block removed member or member that left (#6440) --- apps/ios/SimpleXChat/ChatTypes.swift | 2 +- .../chat/simplex/common/model/ChatModel.kt | 2 +- tests/ChatTests/Groups.hs | 34 +++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index 1e9fbf15e6..469d01fbed 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -2647,7 +2647,7 @@ public struct GroupMember: Identifiable, Decodable, Hashable { public func canBlockForAll(groupInfo: GroupInfo) -> Bool { let userRole = groupInfo.membership.memberRole - return memberStatus != .memRemoved && memberStatus != .memLeft && memberRole < .moderator + return memberRole < .moderator && userRole >= .moderator && userRole >= memberRole && groupInfo.membership.memberActive && !memberPending } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt index debd0ec328..454dc90d12 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt @@ -2307,7 +2307,7 @@ data class GroupMember ( fun canBlockForAll(groupInfo: GroupInfo): Boolean { val userRole = groupInfo.membership.memberRole - return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft && memberRole < GroupMemberRole.Moderator + return memberRole < GroupMemberRole.Moderator && userRole >= GroupMemberRole.Moderator && userRole >= memberRole && groupInfo.membership.memberActive && !memberPending } diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index e9168ba469..da6d8789fb 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -198,6 +198,7 @@ chatGroupTests = do it "member was blocked before joining group" testBlockForAllBeforeJoining it "repeat block, unblock" testBlockForAllRepeat it "block multiple members" testBlockForAllMultipleMembers + it "block left/removed members" testBlockForAllLeftRemoved describe "group member inactivity" $ do it "mark member inactive on reaching quota" testGroupMemberInactive describe "group member reports" $ do @@ -6973,6 +6974,39 @@ testBlockForAllMultipleMembers = cath #> "#team 6" [alice, bob, dan] *<# "#team cath> 6" +testBlockForAllLeftRemoved :: HasCallStack => TestParams -> IO () +testBlockForAllLeftRemoved = + testChat4 aliceProfile bobProfile cathProfile danProfile $ + \alice bob cath dan -> do + createGroup4 "team" alice (bob, GRMember) (cath, GRMember) (dan, GRMember) + + cath ##> "/leave #team" + concurrentlyN_ + [ do + cath <## "#team: you left the group" + cath <## "use /d #team to delete the group", + alice <## "#team: cath left the group", + bob <## "#team: cath left the group", + dan <## "#team: cath left the group" + ] + + alice ##> "/rm team dan" + concurrentlyN_ + [ alice <## "#team: you removed dan from the group", + do + dan <## "#team: alice removed you from the group" + dan <## "use /d #team to delete the group", + bob <## "#team: alice removed dan from the group" + ] + + alice ##> "/block for all #team cath" + alice <## "#team: you blocked cath" + bob <## "#team: alice blocked cath" + + alice ##> "/block for all #team dan" + alice <## "#team: you blocked dan" + bob <## "#team: alice blocked dan" + testGroupMemberInactive :: HasCallStack => TestParams -> IO () testGroupMemberInactive ps = do withSmpServer' serverCfg' $ do From f853f84d033e29b59a13097e855f45ea3898cade Mon Sep 17 00:00:00 2001 From: BarbossHack Date: Mon, 17 Nov 2025 10:06:07 +0100 Subject: [PATCH 05/32] ci: free up disk space before executing reproducible script (#6441) * ci: free up disk space before executing reproducible script * ci: use cleanup script template instead Co-authored-by: sh <37271604+shumvgolove@users.noreply.github.com> --------- Co-authored-by: sh <37271604+shumvgolove@users.noreply.github.com> --- .github/workflows/reproduce-schedule.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/reproduce-schedule.yml b/.github/workflows/reproduce-schedule.yml index 7d28d6f70c..7364976467 100644 --- a/.github/workflows/reproduce-schedule.yml +++ b/.github/workflows/reproduce-schedule.yml @@ -23,6 +23,10 @@ jobs: grep -i "tag_name" | \ awk -F \" '{print "TAG="$4}' >> $GITHUB_ENV + # Otherwise we run out of disk space with Docker build + - name: Free disk space + shell: bash + run: ./scripts/ci/linux_util_free_space.sh - name: Execute reproduce script run: | ${GITHUB_WORKSPACE}/scripts/simplex-chat-reproduce-builds.sh "$TAG" || : From 9f3b3c69dd7a02d4dc3ac455dda8505a475fe776 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Mon, 17 Nov 2025 09:41:47 +0000 Subject: [PATCH 06/32] ui: allow to delete member's messages when/after removing member (#6443) * ui: allow to delete member messages * fix merge category, deleted view * fix remove items in model * don't create item repeatedly * kotlin * obsolete import * less delays --- apps/ios/Shared/Model/ChatModel.swift | 5 - apps/ios/Shared/Model/SimpleXAPI.swift | 2 +- .../ContextPendingMemberActionsView.swift | 2 +- .../Views/Chat/Group/GroupChatInfoView.swift | 47 ++-- .../Chat/Group/GroupMemberInfoView.swift | 58 ++--- apps/ios/SimpleXChat/ChatTypes.swift | 57 +++-- .../chat/simplex/common/model/ChatModel.kt | 55 ++--- .../chat/simplex/common/model/SimpleXAPI.kt | 2 +- .../ComposeContextPendingMemberActionsView.kt | 6 +- .../views/chat/group/GroupChatInfoView.kt | 76 +++++-- .../views/chat/group/GroupMemberInfoView.kt | 62 ++++- .../common/views/chat/item/ChatItemView.kt | 214 +++++++++--------- .../commonMain/resources/MR/base/strings.xml | 5 + src/Simplex/Chat/Library/Commands.hs | 20 +- src/Simplex/Chat/Library/Subscriber.hs | 7 +- tests/ChatTests/Groups.hs | 54 +++++ 16 files changed, 402 insertions(+), 270 deletions(-) diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift index 5ebab167fd..f1f4e686bd 100644 --- a/apps/ios/Shared/Model/ChatModel.swift +++ b/apps/ios/Shared/Model/ChatModel.swift @@ -766,11 +766,6 @@ final class ChatModel: ObservableObject { } func removeMemberItems(_ removedMember: GroupMember, byMember: GroupMember, _ groupInfo: GroupInfo) { - // this should not happen, only another member can "remove" user, user can only "leave" (another event). - if byMember.groupMemberId == groupInfo.membership.groupMemberId { - logger.debug("exiting removeMemberItems") - return - } if chatId == groupInfo.id { for i in 0.. (GroupInfo, [GroupMember]) { +func apiRemoveMembers(_ groupId: Int64, _ memberIds: [Int64], _ withMessages: Bool) async throws -> (GroupInfo, [GroupMember]) { let r: ChatResponse2 = try await chatSendCmd(.apiRemoveMembers(groupId: groupId, memberIds: memberIds, withMessages: withMessages), bgTask: false) if case let .userDeletedMembers(_, updatedGroupInfo, members, _withMessages) = r { return (updatedGroupInfo, members) } throw r.unexpected diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift index 143bf42ea4..e9913053ea 100644 --- a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift +++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextPendingMemberActionsView.swift @@ -48,7 +48,7 @@ func showRejectMemberAlert(_ groupInfo: GroupInfo, _ member: GroupMember, dismis showAlert( title: NSLocalizedString("Reject member?", comment: "alert title"), buttonTitle: "Reject", - buttonAction: { removeMember(groupInfo, member, dismiss: dismiss) }, + buttonAction: { removeMember(groupInfo, member, withMessages: false, dismiss: dismiss) }, cancelButton: true ) } diff --git a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift index d8929caa3e..96b5e2898a 100644 --- a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift +++ b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift @@ -46,7 +46,6 @@ struct GroupChatInfoView: View { case unblockMemberAlert(mem: GroupMember) case blockForAllAlert(mem: GroupMember) case unblockForAllAlert(mem: GroupMember) - case removeMemberAlert(mem: GroupMember) case error(title: LocalizedStringKey, error: LocalizedStringKey?) var id: String { @@ -60,7 +59,6 @@ struct GroupChatInfoView: View { case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)" case let .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)" case let .unblockForAllAlert(mem): return "unblockForAllAlert \(mem.groupMemberId)" - case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)" case let .error(title, _): return "error \(title)" } } @@ -212,7 +210,6 @@ struct GroupChatInfoView: View { case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem) case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem) case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem) - case let .removeMemberAlert(mem): return removeMemberAlert(mem) case let .error(title, error): return mkAlert(title: title, message: error) } } @@ -517,7 +514,7 @@ struct GroupChatInfoView: View { private func removeSwipe(_ member: GroupMember, _ v: V) -> some View { v.swipeActions(edge: .trailing) { Button(role: .destructive) { - alert = .removeMemberAlert(mem: member) + showRemoveMemberAlert(groupInfo, member) } label: { Label("Remove member", systemImage: "trash") .foregroundColor(Color.red) @@ -791,32 +788,38 @@ struct GroupChatInfoView: View { alert = .largeGroupReceiptsDisabled } } - - private func removeMemberAlert(_ mem: GroupMember) -> Alert { - let messageLabel: LocalizedStringKey = ( - groupInfo.businessChat == nil - ? "Member will be removed from group - this cannot be undone!" - : "Member will be removed from chat - this cannot be undone!" - ) - return Alert( - title: Text("Remove member?"), - message: Text(messageLabel), - primaryButton: .destructive(Text("Remove")) { - removeMember(groupInfo, mem) - }, - secondaryButton: .cancel() - ) - } } -func removeMember(_ groupInfo: GroupInfo, _ mem: GroupMember, dismiss: DismissAction? = nil) { +func showRemoveMemberAlert(_ groupInfo: GroupInfo, _ mem: GroupMember, dismiss: DismissAction? = nil) { + showAlert( + NSLocalizedString("Remove member?", comment: "alert title"), + message: + groupInfo.businessChat == nil + ? NSLocalizedString("Member will be removed from group - this cannot be undone!", comment: "alert message") + : NSLocalizedString("Member will be removed from chat - this cannot be undone!", comment: "alert message"), + actions: {[ + UIAlertAction(title: NSLocalizedString("Remove", comment: "alert action"), style: .destructive) { _ in + removeMember(groupInfo, mem, withMessages: false, dismiss: dismiss) + }, + UIAlertAction(title: NSLocalizedString("Remove and delete messages", comment: "alert action"), style: .destructive) { _ in + removeMember(groupInfo, mem, withMessages: true, dismiss: dismiss) + }, + cancelAlertAction + ]} + ) +} + +func removeMember(_ groupInfo: GroupInfo, _ mem: GroupMember, withMessages: Bool, dismiss: DismissAction?) { Task { do { - let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId]) + let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId], withMessages) await MainActor.run { ChatModel.shared.updateGroup(updatedGroupInfo) updatedMembers.forEach { updatedMember in _ = ChatModel.shared.upsertGroupMember(updatedGroupInfo, updatedMember) + if withMessages { + ChatModel.shared.removeMemberItems(updatedMember, byMember: groupInfo.membership, groupInfo) + } } dismiss?() } diff --git a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift index 01a3805910..207c2170a3 100644 --- a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift +++ b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift @@ -36,7 +36,6 @@ struct GroupMemberInfoView: View { case unblockMemberAlert(mem: GroupMember) case blockForAllAlert(mem: GroupMember) case unblockForAllAlert(mem: GroupMember) - case removeMemberAlert(mem: GroupMember) case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole) case switchAddressAlert case abortSwitchAddressAlert @@ -51,7 +50,6 @@ struct GroupMemberInfoView: View { case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)" case let .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)" case let .unblockForAllAlert(mem): return "unblockForAllAlert \(mem.groupMemberId)" - case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)" case let .changeMemberRoleAlert(mem, role): return "changeMemberRoleAlert \(mem.groupMemberId) \(role.rawValue)" case .switchAddressAlert: return "switchAddressAlert" case .abortSwitchAddressAlert: return "abortSwitchAddressAlert" @@ -273,7 +271,6 @@ struct GroupMemberInfoView: View { case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem) case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem) case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem) - case let .removeMemberAlert(mem): return removeMemberAlert(mem) case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem) case .switchAddressAlert: return switchAddressAlert(switchMemberAddress) case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress) @@ -579,7 +576,11 @@ struct GroupMemberInfoView: View { } } if canRemove { - removeMemberButton(mem) + if mem.memberStatus == .memRemoved || mem.memberStatus == .memLeft { + deleteMemberMessagesButton(mem) + } else { + removeMemberButton(mem) + } } } } @@ -634,41 +635,32 @@ struct GroupMemberInfoView: View { private func removeMemberButton(_ mem: GroupMember) -> some View { Button(role: .destructive) { - alert = .removeMemberAlert(mem: mem) + showRemoveMemberAlert(groupInfo, mem, dismiss: dismiss) } label: { Label("Remove member", systemImage: "trash") .foregroundColor(.red) } } - private func removeMemberAlert(_ mem: GroupMember) -> Alert { - let label: LocalizedStringKey = ( - groupInfo.businessChat == nil - ? "Member will be removed from group - this cannot be undone!" - : "Member will be removed from chat - this cannot be undone!" - ) - return Alert( - title: Text("Remove member?"), - message: Text(label), - primaryButton: .destructive(Text("Remove")) { - Task { - do { - let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId]) - await MainActor.run { - chatModel.updateGroup(updatedGroupInfo) - updatedMembers.forEach { updatedMember in - _ = chatModel.upsertGroupMember(updatedGroupInfo, updatedMember) - } - dismiss() - } - } catch let error { - logger.error("apiRemoveMembers error: \(responseError(error))") - let a = getErrorAlert(error, "Error removing member") - alert = .error(title: a.title, error: a.message) - } - } - }, - secondaryButton: .cancel() + private func deleteMemberMessagesButton(_ mem: GroupMember) -> some View { + Button(role: .destructive) { + showDeleteMemberMessagesAlert(mem) + } label: { + Label("Delete member messages", systemImage: "trash") + .foregroundColor(.red) + } + } + + func showDeleteMemberMessagesAlert(_ mem: GroupMember) { + showAlert( + NSLocalizedString("Delete member messages?", comment: "alert title"), + message: NSLocalizedString("Member messages will be deleted - this cannot be undone!", comment: "alert message"), + actions: {[ + UIAlertAction(title: NSLocalizedString("Delete messages", comment: "alert action"), style: .destructive) { _ in + removeMember(groupInfo, mem, withMessages: true, dismiss: dismiss) + }, + cancelAlertAction + ]} ) } diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index 469d01fbed..5d1d5b4302 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -2635,12 +2635,11 @@ public struct GroupMember: Identifiable, Decodable, Hashable { public func canBeRemoved(groupInfo: GroupInfo) -> Bool { let userRole = groupInfo.membership.memberRole - return memberStatus != .memRemoved && memberStatus != .memLeft - && userRole >= .admin && userRole >= memberRole && groupInfo.membership.memberActive + return userRole >= .admin && userRole >= memberRole && groupInfo.membership.memberActive } public func canChangeRoleTo(groupInfo: GroupInfo) -> [GroupMemberRole]? { - if !canBeRemoved(groupInfo: groupInfo) || memberPending { return nil } + if !canBeRemoved(groupInfo: groupInfo) || memberStatus == .memRemoved || memberStatus == .memLeft || memberPending { return nil } let userRole = groupInfo.membership.memberRole return GroupMemberRole.supportedRoles.filter { $0 <= userRole } } @@ -3071,33 +3070,33 @@ public struct ChatItem: Identifiable, Decodable, Hashable { } public var mergeCategory: CIMergeCategory? { - switch content { - case .rcvChatFeature: .chatFeature - case .sndChatFeature: .chatFeature - case .rcvGroupFeature: .chatFeature - case .sndGroupFeature: .chatFeature - case let.rcvGroupEvent(event): - switch event { - case .userRole: nil - case .userDeleted: nil - case .groupDeleted: nil - case .memberCreatedContact: nil - case .newMemberPendingReview: nil - default: .rcvGroupEvent - } - case let .sndGroupEvent(event): - switch event { - case .userRole: nil - case .userLeft: nil - case .memberAccepted: nil - case .userPendingReview: nil - default: .sndGroupEvent - } - default: - if meta.itemDeleted == nil { + if meta.itemDeleted != nil { + chatDir.sent ? .sndItemDeleted : .rcvItemDeleted + } else { + switch content { + case .rcvChatFeature: .chatFeature + case .sndChatFeature: .chatFeature + case .rcvGroupFeature: .chatFeature + case .sndGroupFeature: .chatFeature + case let.rcvGroupEvent(event): + switch event { + case .userRole: nil + case .userDeleted: nil + case .groupDeleted: nil + case .memberCreatedContact: nil + case .newMemberPendingReview: nil + default: .rcvGroupEvent + } + case let .sndGroupEvent(event): + switch event { + case .userRole: nil + case .userLeft: nil + case .memberAccepted: nil + case .userPendingReview: nil + default: .sndGroupEvent + } + default: nil - } else { - chatDir.sent ? .sndItemDeleted : .rcvItemDeleted } } } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt index 454dc90d12..8db2cc1a76 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt @@ -683,11 +683,6 @@ object ChatModel { return updatedItem } - // this should not happen, only another member can "remove" user, user can only "leave" (another event). - if (byMember.groupMemberId == groupInfo.membership.groupMemberId) { - Log.d(TAG, "exiting removeMemberItems") - return - } val cInfo = ChatInfo.Group(groupInfo, groupChatScope = null) // TODO [knocking] review if (chatId.value == groupInfo.id) { for (i in 0 until chatItems.value.size) { @@ -2295,12 +2290,11 @@ data class GroupMember ( fun canBeRemoved(groupInfo: GroupInfo): Boolean { val userRole = groupInfo.membership.memberRole - return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft - && userRole >= GroupMemberRole.Admin && userRole >= memberRole && groupInfo.membership.memberActive + return userRole >= GroupMemberRole.Admin && userRole >= memberRole && groupInfo.membership.memberActive } fun canChangeRoleTo(groupInfo: GroupInfo): List? = - if (!canBeRemoved(groupInfo) || memberPending) null + if (!canBeRemoved(groupInfo) || memberStatus == GroupMemberStatus.MemRemoved || memberStatus == GroupMemberStatus.MemLeft || memberPending) null else groupInfo.membership.memberRole.let { userRole -> GroupMemberRole.selectableRoles.filter { it <= userRole } } @@ -2796,30 +2790,29 @@ data class ChatItem ( } val mergeCategory: CIMergeCategory? - get() = when (content) { - is CIContent.RcvChatFeature, - is CIContent.SndChatFeature, - is CIContent.RcvGroupFeature, - is CIContent.SndGroupFeature -> CIMergeCategory.ChatFeature - is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) { - is RcvGroupEvent.UserRole, - is RcvGroupEvent.UserDeleted, - is RcvGroupEvent.GroupDeleted, - is RcvGroupEvent.MemberCreatedContact, - is RcvGroupEvent.NewMemberPendingReview -> - null - else -> CIMergeCategory.RcvGroupEvent - } - is CIContent.SndGroupEventContent -> when (content.sndGroupEvent) { - is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft, is SndGroupEvent.MemberAccepted, is SndGroupEvent.UserPendingReview -> null - else -> CIMergeCategory.SndGroupEvent - } - else -> { - if (meta.itemDeleted == null) { - null - } else { - if (chatDir.sent) CIMergeCategory.SndItemDeleted else CIMergeCategory.RcvItemDeleted + get() = if (meta.itemDeleted != null) { + if (chatDir.sent) CIMergeCategory.SndItemDeleted else CIMergeCategory.RcvItemDeleted + } else { + when (content) { + is CIContent.RcvChatFeature, + is CIContent.SndChatFeature, + is CIContent.RcvGroupFeature, + is CIContent.SndGroupFeature -> CIMergeCategory.ChatFeature + is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) { + is RcvGroupEvent.UserRole, + is RcvGroupEvent.UserDeleted, + is RcvGroupEvent.GroupDeleted, + is RcvGroupEvent.MemberCreatedContact, + is RcvGroupEvent.NewMemberPendingReview -> + null + else -> CIMergeCategory.RcvGroupEvent } + is CIContent.SndGroupEventContent -> when (content.sndGroupEvent) { + is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft, is SndGroupEvent.MemberAccepted, is SndGroupEvent.UserPendingReview -> null + else -> CIMergeCategory.SndGroupEvent + } + else -> + null } } 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 5ad334e4bc..22da2ce649 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 @@ -2118,7 +2118,7 @@ object ChatController { return null } - suspend fun apiRemoveMembers(rh: Long?, groupId: Long, memberIds: List, withMessages: Boolean = false): Pair>? { + suspend fun apiRemoveMembers(rh: Long?, groupId: Long, memberIds: List, withMessages: Boolean): Pair>? { val r = sendCmd(rh, CC.ApiRemoveMembers(groupId, memberIds, withMessages)) if (r is API.Result && r.res is CR.UserDeletedMembers) return r.res.groupInfo to r.res.members if (!(networkErrorAlert(r))) { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt index 3c3f99ad94..be82a5d2d3 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeContextPendingMemberActionsView.kt @@ -45,7 +45,7 @@ fun ComposeContextPendingMemberActionsView( .fillMaxHeight() .weight(1F) .clickable { - rejectMemberDialog(rhId, member, chatModel, close = { ModalManager.end.closeModal() }) + rejectMemberDialog(rhId, groupInfo, member, chatModel, close = { ModalManager.end.closeModal() }) }, verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally @@ -70,12 +70,12 @@ fun ComposeContextPendingMemberActionsView( } } -fun rejectMemberDialog(rhId: Long?, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) { +fun rejectMemberDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) { AlertManager.shared.showAlertDialog( title = generalGetString(MR.strings.reject_pending_member_alert_title), confirmText = generalGetString(MR.strings.reject_pending_member_button), onConfirm = { - removeMember(rhId, member, chatModel, close) + removeMember(rhId, groupInfo, member, withMessages = false, chatModel, close) }, destructive = true, ) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt index 46669ead70..3f80361249 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt @@ -233,15 +233,30 @@ private fun removeMemberAlert(rhId: Long?, groupInfo: GroupInfo, mem: GroupMembe MR.strings.member_will_be_removed_from_group_cannot_be_undone else MR.strings.member_will_be_removed_from_chat_cannot_be_undone - AlertManager.shared.showAlertDialog( - title = generalGetString(MR.strings.button_remove_member_question), - text = generalGetString(messageId), - confirmText = generalGetString(MR.strings.remove_member_confirmation), - onConfirm = { - removeMembers(rhId, groupInfo, listOf(mem.groupMemberId)) - }, - destructive = true, - ) + AlertManager.shared.showAlertDialogButtonsColumn( + generalGetString(MR.strings.button_remove_member_question), + generalGetString(messageId), + buttons = { + Column { + SectionItemView({ + AlertManager.shared.hideAlert() + removeMembers(rhId, groupInfo, listOf(mem.groupMemberId), withMessages = false) + }) { + Text(generalGetString(MR.strings.remove_member_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + removeMembers(rhId, groupInfo, listOf(mem.groupMemberId), withMessages = true) + }) { + Text(generalGetString(MR.strings.remove_member_delete_messages_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + }) { + Text(generalGetString(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary) + } + } + }) } private fun removeMembersAlert(rhId: Long?, groupInfo: GroupInfo, memberIds: List, onSuccess: () -> Unit = {}) { @@ -249,15 +264,30 @@ private fun removeMembersAlert(rhId: Long?, groupInfo: GroupInfo, memberIds: Lis MR.strings.members_will_be_removed_from_group_cannot_be_undone else MR.strings.members_will_be_removed_from_chat_cannot_be_undone - AlertManager.shared.showAlertDialog( - title = generalGetString(MR.strings.button_remove_members_question), - text = generalGetString(messageId), - confirmText = generalGetString(MR.strings.remove_member_confirmation), - onConfirm = { - removeMembers(rhId, groupInfo, memberIds, onSuccess) - }, - destructive = true, - ) + AlertManager.shared.showAlertDialogButtonsColumn( + generalGetString(MR.strings.button_remove_members_question), + generalGetString(messageId), + buttons = { + Column { + SectionItemView({ + AlertManager.shared.hideAlert() + removeMembers(rhId, groupInfo, memberIds, withMessages = false, onSuccess = onSuccess) + }) { + Text(generalGetString(MR.strings.remove_member_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + removeMembers(rhId, groupInfo, memberIds, withMessages = true, onSuccess = onSuccess) + }) { + Text(generalGetString(MR.strings.remove_member_delete_messages_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + }) { + Text(generalGetString(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary) + } + } + }) } @Composable @@ -1052,20 +1082,26 @@ private fun setGroupAlias(chat: Chat, localAlias: String, chatModel: ChatModel) } } -fun removeMembers(rhId: Long?, groupInfo: GroupInfo, memberIds: List, onSuccess: () -> Unit = {}) { +fun removeMembers(rhId: Long?, groupInfo: GroupInfo, memberIds: List, withMessages: Boolean, onSuccess: () -> Unit = {}) { withBGApi { - val r = chatModel.controller.apiRemoveMembers(rhId, groupInfo.groupId, memberIds) + val r = chatModel.controller.apiRemoveMembers(rhId, groupInfo.groupId, memberIds, withMessages = withMessages) if (r != null) { val (updatedGroupInfo, updatedMembers) = r withContext(Dispatchers.Main) { chatModel.chatsContext.updateGroup(rhId, updatedGroupInfo) updatedMembers.forEach { updatedMember -> chatModel.chatsContext.upsertGroupMember(rhId, updatedGroupInfo, updatedMember) + if (withMessages) { + chatModel.chatsContext.removeMemberItems(rhId, updatedMember, byMember = groupInfo.membership, groupInfo) + } } } withContext(Dispatchers.Main) { updatedMembers.forEach { updatedMember -> chatModel.secondaryChatsContext.value?.upsertGroupMember(rhId, updatedGroupInfo, updatedMember) + if (withMessages) { + chatModel.chatsContext.removeMemberItems(rhId, updatedMember, byMember = groupInfo.membership, groupInfo) + } } } onSuccess() diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt index d7e052e502..f09d2f44bb 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt @@ -136,6 +136,7 @@ fun GroupMemberInfoView( blockForAll = { blockForAllAlert(rhId, groupInfo, member) }, unblockForAll = { unblockForAllAlert(rhId, groupInfo, member) }, removeMember = { removeMemberDialog(rhId, groupInfo, member, chatModel, close) }, + deleteMemberMessages = { deleteMemberMessagesDialog(rhId, groupInfo, member, chatModel, close) }, onRoleSelected = { if (it == newRole.value) return@GroupMemberInfoLayout val prevValue = newRole.value @@ -243,26 +244,56 @@ fun removeMemberDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, c MR.strings.member_will_be_removed_from_group_cannot_be_undone else MR.strings.member_will_be_removed_from_chat_cannot_be_undone + AlertManager.shared.showAlertDialogButtonsColumn( + generalGetString(MR.strings.button_remove_member_question), + generalGetString(messageId), + buttons = { + Column { + SectionItemView({ + AlertManager.shared.hideAlert() + removeMember(rhId, groupInfo, member, withMessages = false, chatModel, close) + }) { + Text(generalGetString(MR.strings.remove_member_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + removeMember(rhId, groupInfo, member, withMessages = true, chatModel, close) + }) { + Text(generalGetString(MR.strings.remove_member_delete_messages_confirmation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = Color.Red) + } + SectionItemView({ + AlertManager.shared.hideAlert() + }) { + Text(generalGetString(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary) + } + } + }) +} + +fun deleteMemberMessagesDialog(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) { AlertManager.shared.showAlertDialog( - title = generalGetString(MR.strings.button_remove_member), - text = generalGetString(messageId), - confirmText = generalGetString(MR.strings.remove_member_confirmation), + title = generalGetString(MR.strings.button_delete_member_messages_question), + text = generalGetString(MR.strings.member_messages_will_be_deleted_cannot_be_undone), + confirmText = generalGetString(MR.strings.delete_member_messages_confirmation), onConfirm = { - removeMember(rhId, member, chatModel, close) + removeMember(rhId, groupInfo, member, withMessages = true, chatModel, close) }, destructive = true, ) } -fun removeMember(rhId: Long?, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) { +fun removeMember(rhId: Long?, groupInfo: GroupInfo, member: GroupMember, withMessages: Boolean, chatModel: ChatModel, close: (() -> Unit)? = null) { withBGApi { - val r = chatModel.controller.apiRemoveMembers(rhId, member.groupId, listOf(member.groupMemberId)) + val r = chatModel.controller.apiRemoveMembers(rhId, member.groupId, listOf(member.groupMemberId), withMessages = withMessages) if (r != null) { val (updatedGroupInfo, removedMembers) = r withContext(Dispatchers.Main) { chatModel.chatsContext.updateGroup(rhId, updatedGroupInfo) removedMembers.forEach { removedMember -> chatModel.chatsContext.upsertGroupMember(rhId, updatedGroupInfo, removedMember) + if (withMessages) { + chat.simplex.common.platform.chatModel.chatsContext.removeMemberItems(rhId, removedMember, byMember = groupInfo.membership, groupInfo) + } } } } @@ -289,6 +320,7 @@ fun GroupMemberInfoLayout( blockForAll: () -> Unit, unblockForAll: () -> Unit, removeMember: () -> Unit, + deleteMemberMessages: () -> Unit, onRoleSelected: (GroupMemberRole) -> Unit, switchMemberAddress: () -> Unit, abortSwitchMemberAddress: () -> Unit, @@ -345,7 +377,11 @@ fun GroupMemberInfoLayout( } } if (canRemove) { - RemoveMemberButton(removeMember) + if (member.memberStatus == GroupMemberStatus.MemRemoved || member.memberStatus == GroupMemberStatus.MemLeft) { + DeleteMemberMessagesButton(deleteMemberMessages) + } else { + RemoveMemberButton(removeMember) + } } } } @@ -669,6 +705,17 @@ fun RemoveMemberButton(onClick: () -> Unit) { ) } +@Composable +fun DeleteMemberMessagesButton(onClick: () -> Unit) { + SettingsActionItem( + painterResource(MR.images.ic_delete), + stringResource(MR.strings.button_delete_member_messages), + click = onClick, + textColor = Color.Red, + iconColor = Color.Red, + ) +} + @Composable fun OpenChatButton( modifier: Modifier, @@ -937,6 +984,7 @@ fun PreviewGroupMemberInfoLayout() { blockForAll = {}, unblockForAll = {}, removeMember = {}, + deleteMemberMessages = {}, onRoleSelected = {}, switchMemberAddress = {}, abortSwitchMemberAddress = {}, diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt index 6f873035f1..758980059d 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt @@ -563,23 +563,18 @@ fun ChatItemView( @Composable fun ContentItem() { val mc = cItem.content.msgContent - if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) { - MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp) - MarkedDeletedItemDropdownMenu() - } else { - if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) { - if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) { - EmojiItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) - } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) { - CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile) - } else { - framedItemView() - } + if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) { + if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) { + EmojiItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp) + } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) { + CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile) } else { framedItemView() } - MsgContentItemDropdownMenu() + } else { + framedItemView() } + MsgContentItemDropdownMenu() } @Composable fun LegacyDeletedItem() { @@ -696,102 +691,107 @@ fun ChatItemView( } } - when (val c = cItem.content) { - is CIContent.SndMsgContent -> ContentItem() - is CIContent.RcvMsgContent -> ContentItem() - is CIContent.SndDeleted -> LegacyDeletedItem() - is CIContent.RcvDeleted -> LegacyDeletedItem() - is CIContent.SndCall -> CallItem(c.status, c.duration) - is CIContent.RcvCall -> CallItem(c.status, c.duration) - is CIContent.RcvIntegrityError -> if (developerTools) { - IntegrityErrorItemView(c.msgError, cItem, showTimestamp, cInfo.timedMessagesTTL) - DeleteItemMenu() - } else { - Box(Modifier.size(0.dp)) {} - } - is CIContent.RcvDecryptionError -> { - CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember) - DeleteItemMenu() - } - is CIContent.RcvGroupInvitation -> { - CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL) - DeleteItemMenu() - } - is CIContent.SndGroupInvitation -> { - CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL) - DeleteItemMenu() - } - is CIContent.RcvDirectEventContent -> { - EventItemView() - MsgContentItemDropdownMenu() - } - is CIContent.RcvGroupEventContent -> { - when (c.rcvGroupEvent) { - is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat) - is RcvGroupEvent.NewMemberPendingReview -> PendingReviewEventItemView() - else -> EventItemView() + if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) { + MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp) + MarkedDeletedItemDropdownMenu() + } else { + when (val c = cItem.content) { + is CIContent.SndMsgContent -> ContentItem() + is CIContent.RcvMsgContent -> ContentItem() + is CIContent.SndDeleted -> LegacyDeletedItem() + is CIContent.RcvDeleted -> LegacyDeletedItem() + is CIContent.SndCall -> CallItem(c.status, c.duration) + is CIContent.RcvCall -> CallItem(c.status, c.duration) + is CIContent.RcvIntegrityError -> if (developerTools) { + IntegrityErrorItemView(c.msgError, cItem, showTimestamp, cInfo.timedMessagesTTL) + DeleteItemMenu() + } else { + Box(Modifier.size(0.dp)) {} } - MsgContentItemDropdownMenu() - } - is CIContent.SndGroupEventContent -> { - when (c.sndGroupEvent) { - is SndGroupEvent.UserPendingReview -> PendingReviewEventItemView() - else -> EventItemView() + is CIContent.RcvDecryptionError -> { + CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember) + DeleteItemMenu() + } + is CIContent.RcvGroupInvitation -> { + CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL) + DeleteItemMenu() + } + is CIContent.SndGroupInvitation -> { + CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito, showTimestamp = showTimestamp, timedMessagesTTL = cInfo.timedMessagesTTL) + DeleteItemMenu() + } + is CIContent.RcvDirectEventContent -> { + EventItemView() + MsgContentItemDropdownMenu() + } + is CIContent.RcvGroupEventContent -> { + when (c.rcvGroupEvent) { + is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat) + is RcvGroupEvent.NewMemberPendingReview -> PendingReviewEventItemView() + else -> EventItemView() + } + MsgContentItemDropdownMenu() + } + is CIContent.SndGroupEventContent -> { + when (c.sndGroupEvent) { + is SndGroupEvent.UserPendingReview -> PendingReviewEventItemView() + else -> EventItemView() + } + MsgContentItemDropdownMenu() + } + is CIContent.RcvConnEventContent -> { + EventItemView() + MsgContentItemDropdownMenu() + } + is CIContent.SndConnEventContent -> { + EventItemView() + MsgContentItemDropdownMenu() + } + is CIContent.RcvChatFeature -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.SndChatFeature -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.RcvChatPreference -> { + val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null + CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature) + DeleteItemMenu() + } + is CIContent.SndChatPreference -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon, revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.RcvGroupFeature -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.SndGroupFeature -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.RcvChatFeatureRejected -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, Color.Red, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.RcvGroupFeatureRejected -> { + CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, Color.Red, revealed = revealed, showMenu = showMenu) + MsgContentItemDropdownMenu() + } + is CIContent.SndModerated -> DeletedItem() + is CIContent.RcvModerated -> DeletedItem() + is CIContent.RcvBlocked -> DeletedItem() + is CIContent.SndDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo) + is CIContent.RcvDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo) + is CIContent.SndGroupE2EEInfo -> E2EEInfoNoPQText() + is CIContent.RcvGroupE2EEInfo -> E2EEInfoNoPQText() + is CIContent.ChatBanner -> Spacer(modifier = Modifier.size(0.dp)) + is CIContent.InvalidJSON -> { + CIInvalidJSONView(c.json) + DeleteItemMenu() } - MsgContentItemDropdownMenu() - } - is CIContent.RcvConnEventContent -> { - EventItemView() - MsgContentItemDropdownMenu() - } - is CIContent.SndConnEventContent -> { - EventItemView() - MsgContentItemDropdownMenu() - } - is CIContent.RcvChatFeature -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.SndChatFeature -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, c.enabled.iconColor, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.RcvChatPreference -> { - val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null - CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature) - DeleteItemMenu() - } - is CIContent.SndChatPreference -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon, revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.RcvGroupFeature -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.SndGroupFeature -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, c.preference.enabled(c.memberRole_, (cInfo as? ChatInfo.Group)?.groupInfo?.membership).iconColor, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.RcvChatFeatureRejected -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.feature, Color.Red, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.RcvGroupFeatureRejected -> { - CIChatFeatureView(chatsCtx, cInfo, cItem, c.groupFeature, Color.Red, revealed = revealed, showMenu = showMenu) - MsgContentItemDropdownMenu() - } - is CIContent.SndModerated -> DeletedItem() - is CIContent.RcvModerated -> DeletedItem() - is CIContent.RcvBlocked -> DeletedItem() - is CIContent.SndDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo) - is CIContent.RcvDirectE2EEInfo -> DirectE2EEInfoText(c.e2eeInfo) - is CIContent.SndGroupE2EEInfo -> E2EEInfoNoPQText() - is CIContent.RcvGroupE2EEInfo -> E2EEInfoNoPQText() - is CIContent.ChatBanner -> Spacer(modifier = Modifier.size(0.dp)) - is CIContent.InvalidJSON -> { - CIInvalidJSONView(c.json) - DeleteItemMenu() } } } diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml index 8c8493358e..371f0e076f 100644 --- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml @@ -1861,14 +1861,19 @@ Remove member? Remove members? + Delete member messages? Remove member + Delete member messages Chat with member Send direct message Member will be removed from group - this cannot be undone! Members will be removed from group - this cannot be undone! Member will be removed from chat - this cannot be undone! Members will be removed from chat - this cannot be undone! + Member messages will be deleted - this cannot be undone! Remove + Remove and delete messages + Delete messages Remove member Block member? Block member diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index 763027d5b1..630cad4e70 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -2522,19 +2522,25 @@ processChatCommand vr nm = \case let chatScope = toChatScope <$> chatScopeInfo events = L.map (\GroupMember {memberId} -> XGrpMemDel memberId withMessages) memsToDelete' (msgs_, _gsr) <- sendGroupMessages user gInfo chatScope recipients events - let itemsData = zipWith (fmap . sndItemData) memsToDelete (L.toList msgs_) + let itemsData_ = zipWith (fmap . sndItemData) memsToDelete (L.toList msgs_) + skipUnwantedItem = \case + Right Nothing -> Nothing + Right (Just a) -> Just $ Right a + Left e -> Just $ Left e + itemsData = mapMaybe skipUnwantedItem itemsData_ cis_ <- saveSndChatItems user (CDGroupSnd gInfo chatScopeInfo) itemsData Nothing False - when (length cis_ /= length memsToDelete) $ logError "deleteCurrentMems: memsToDelete and cis_ length mismatch" deleteMembersConnections' user memsToDelete True (errs, deleted) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (delMember db) memsToDelete) let acis = map (AChatItem SCTGroup SMDSnd (GroupChat gInfo chatScopeInfo)) $ rights cis_ pure (errs, deleted, acis) where - sndItemData :: GroupMember -> SndMessage -> NewSndChatItemData c - sndItemData GroupMember {groupMemberId, memberProfile} msg = - let content = CISndGroupEvent $ SGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) - ts = ciContentTexts content - in NewSndChatItemData msg content ts M.empty Nothing Nothing Nothing + sndItemData :: GroupMember -> SndMessage -> Maybe (NewSndChatItemData c) + sndItemData GroupMember {groupMemberId, memberProfile, memberStatus} msg + | memberStatus == GSMemRemoved || memberStatus == GSMemLeft = Nothing + | otherwise = + let content = CISndGroupEvent $ SGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) + ts = ciContentTexts content + in Just $ NewSndChatItemData msg content ts M.empty Nothing Nothing Nothing delMember db m = do -- We're in a function used in batch member deletion, and since we're passing same gInfo for each member, -- voided result (updated group info) may have incorrect state of membersRequireAttention. diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 75eb208962..5073da9c77 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -2774,7 +2774,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = Left _ -> do messageError "x.grp.mem.del with unknown member ID" pure $ Just DJSGroup {jobSpec = DJDeliveryJob {includePending = True}} - Right deletedMember@GroupMember {groupMemberId, memberProfile} -> + Right deletedMember@GroupMember {groupMemberId, memberProfile, memberStatus} -> checkRole deletedMember $ do -- ? prohibit deleting member if it's the sender - sender should use x.grp.leave if isUserGrpFwdRelay gInfo && not forwarded @@ -2786,9 +2786,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = else deleteMemberConnection deletedMember -- undeleted "member connected" chat item will prevent deletion of member record gInfo' <- deleteOrUpdateMemberRecord user gInfo deletedMember - let deletedMember' = deletedMember {memberStatus = GSMemRemoved} + let wasDeleted = memberStatus == GSMemRemoved || memberStatus == GSMemLeft + deletedMember' = deletedMember {memberStatus = GSMemRemoved} when withMessages $ deleteMessages gInfo' deletedMember' SMDRcv - deleteMemberItem $ RGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) + unless wasDeleted $ deleteMemberItem $ RGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) toView $ CEvtDeletedMember user gInfo' m deletedMember' withMessages pure $ memberEventDeliveryScope deletedMember where diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index da6d8789fb..52a015c31f 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -87,6 +87,7 @@ chatGroupTests = do it "moderate message that arrives after the event of moderation (full delete)" testGroupDelayedModerationFullDelete it "remove member with messages (full deletion is enabled)" testDeleteMemberWithMessages it "remove member with messages mark deleted" testDeleteMemberMarkMessagesDeleted + it "remove member - delete messages of left/removed members" testDeleteMemberMessagesLeftRemoved describe "batch send messages" $ do it "send multiple messages api" testSendMulti it "send multiple timed messages" testSendMultiTimed @@ -1911,6 +1912,59 @@ testDeleteMemberMarkMessagesDeleted = bob #$> ("/_get chat #1 count=2", chat, [(1, "hello [marked deleted by alice]"), (0, "removed you")]) cath #$> ("/_get chat #1 count=2", chat, [(0, "hello [marked deleted by alice]"), (0, "removed bob")]) +testDeleteMemberMessagesLeftRemoved :: HasCallStack => TestParams -> IO () +testDeleteMemberMessagesLeftRemoved = + testChat4 aliceProfile bobProfile cathProfile danProfile $ + \alice bob cath dan -> do + createGroup4 "team" alice (bob, GRMember) (cath, GRMember) (dan, GRMember) + + threadDelay 1000000 + cath #> "#team 1" + [alice, bob, dan] *<# "#team cath> 1" + + threadDelay 1000000 + dan #> "#team 2" + [alice, bob, cath] *<# "#team dan> 2" + + alice #$> ("/_get chat #1 count=2", chat, [(0, "1"), (0, "2")]) + bob #$> ("/_get chat #1 count=2", chat, [(0, "1"), (0, "2")]) + cath #$> ("/_get chat #1 count=2", chat, [(1, "1"), (0, "2")]) + dan #$> ("/_get chat #1 count=2", chat, [(0, "1"), (1, "2")]) + + threadDelay 1000000 + cath ##> "/leave #team" + concurrentlyN_ + [ do + cath <## "#team: you left the group" + cath <## "use /d #team to delete the group", + alice <## "#team: cath left the group", + bob <## "#team: cath left the group", + dan <## "#team: cath left the group" + ] + + threadDelay 1000000 + alice ##> "/rm team dan" + concurrentlyN_ + [ alice <## "#team: you removed dan from the group", + do + dan <## "#team: alice removed you from the group" + dan <## "use /d #team to delete the group", + bob <## "#team: alice removed dan from the group" + ] + + alice ##> "/rm #team cath messages=on" + alice <## "#team: you removed cath from the group with all messages" + bob <## "#team: alice removed cath from the group with all messages" + + alice ##> "/rm #team dan messages=on" + alice <## "#team: you removed dan from the group with all messages" + bob <## "#team: alice removed dan from the group with all messages" + + alice #$> ("/_get chat #1 count=4", chat, [(0, "1 [marked deleted by you]"), (0, "2 [marked deleted by you]"), (0, "left [marked deleted by you]"), (1, "removed dan")]) + bob #$> ("/_get chat #1 count=4", chat, [(0, "1 [marked deleted by alice]"), (0, "2 [marked deleted by alice]"), (0, "left [marked deleted by alice]"), (0, "removed dan")]) + cath #$> ("/_get chat #1 count=3", chat, [(1, "1"), (0, "2"), (1, "left")]) + dan #$> ("/_get chat #1 count=4", chat, [(0, "1"), (1, "2"), (0, "left"), (0, "removed you")]) + testSendMulti :: HasCallStack => TestParams -> IO () testSendMulti = testChat3 aliceProfile bobProfile cathProfile $ From 1101588c8bdc95825c8c3abdf6678a5382267417 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Tue, 18 Nov 2025 07:26:25 +0000 Subject: [PATCH 07/32] docs: acknowledgements for async command responses rfc (#6444) --- docs/rfcs/2025-11-17-async-commands-acks.md | 74 +++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docs/rfcs/2025-11-17-async-commands-acks.md diff --git a/docs/rfcs/2025-11-17-async-commands-acks.md b/docs/rfcs/2025-11-17-async-commands-acks.md new file mode 100644 index 0000000000..bb95c09717 --- /dev/null +++ b/docs/rfcs/2025-11-17-async-commands-acks.md @@ -0,0 +1,74 @@ +# Acknowledgments for async command responses + +## Problem + +Continuations for asynchronous commands can be forever lost if their execution fails, e.g. due to a crash. This can result in failures in establishing connections, sending post-connection auto-reply, etc. depending on other applications of asynchronous commands. + +## Solution + +An idea is to persist events in agent until chat acknowledges their processing, and replay them on next start of command processing. + +### Agent persistence + +Save response on command before notifying chat (event received by chat via subQ). + +```sql +ALTER TABLE commands ADD COLUMN event BLOB; +``` + +Type is `AEvent`, requires encoding for To and FromField instances. + +Application of chat continuations is very limited, so not all events need to be saved. In fact currently we only need 2 types of events to be recorded - see below. This breaks separation between chat and agent (agent knows which events to record), however that abstraction has long been violated. This can be a contract between agent and chat - which events to keep and acknowledge. + +TBC separate type for storing only necessary events: + +```haskell +data AEventDB where + ... -- only necessary constructors + +-- AEventDB encoding, instances + +toDBEvent :: AEvent -> AEventDB + +fromDBEvent :: AEventBD -> AEvent +``` + +Alternatively, we can save all events and require chat to acknowledge all events. This seems like an overkill and unnecessary work and generalization. + +### Agent event processing + +Currently agent deletes command records after processing. Instead it will: +- keep records until receiving acknowledgement on event; +- delete command record when receiving acknowledgment on event from chat; +- when retrieving next command to process filter out already processed commands (that have event saved); +- replay to chat unacknowledged events on starting async command processing (`resumeAllCommands`?). + +Same correlation id that is used for command can be used for acknowledging event. + +Agent API: + +```haskell +ackCommandEvent :: AgentClient -> UserId -> ACorrId -> AE () +``` + +### Command continuations + +Chat uses command continuations on following events: +- INV in group connection - XGrpMemIntro continuation (send XGrpMemInv with created connection link); +- JOINED in both direct and group (business chat) connections - send auto-reply. + +So it is enough for agent to record only INV and JOINED events, and for chat to acknowledge processing only for these events. However, as agent doesn't discriminate which INVs to save, chat should acknowledge all INVs. Another alternative is for chat to inform agent whether event should be kept when making command, e.g.: + +```haskell +createConnectionAsync :: AgentClient -> ... -> Bool -> ... + +-- Bool is flag whether to keep INV event for this command until acknowledged +``` + +Group relay protocol may add new continuations, for example for owner on adding relay link to group link (new async version of setConnShortLink api). + +Chat continuations should be idempotent. +- More important for INV event, to not repeatedly send XGrpMemIntro. +- For JOINED in worst case auto-reply would be re-sent which is not ideal but not very damaging. +- Chat can track additional state to help identify which part of event processing to replay. +- E.g. for group INV continuation chat can track that XGrpMemIntro was sent on group record. TBC per continuation. From a5c6ea8e5d45d8ce2299328a05b2af70e6939d40 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:25:09 +0000 Subject: [PATCH 08/32] core: member relations vector migration; set index in group for members; rework logic for avoiding duplicate introductions (#6445) --- bots/api/TYPES.md | 1 + .../types/typescript/src/types.ts | 1 + simplex-chat.cabal | 2 + src/Simplex/Chat/Library/Internal.hs | 4 +- src/Simplex/Chat/Store/Connections.hs | 4 +- src/Simplex/Chat/Store/Groups.hs | 338 ++++++++++-------- src/Simplex/Chat/Store/Messages.hs | 8 +- src/Simplex/Chat/Store/Postgres/Migrations.hs | 4 +- .../M20251117_member_relations_vector.hs | 62 ++++ .../Store/Postgres/Migrations/chat_schema.sql | 11 +- src/Simplex/Chat/Store/SQLite/Migrations.hs | 4 +- .../M20251117_member_relations_vector.hs | 106 ++++++ .../SQLite/Migrations/chat_query_plans.txt | 256 +++++++------ .../Store/SQLite/Migrations/chat_schema.sql | 9 +- src/Simplex/Chat/Store/Shared.hs | 8 +- src/Simplex/Chat/Types.hs | 1 + tests/ChatTests/Groups.hs | 2 +- 17 files changed, 534 insertions(+), 287 deletions(-) create mode 100644 src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs create mode 100644 src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md index 923fab14c2..9140f3b164 100644 --- a/bots/api/TYPES.md +++ b/bots/api/TYPES.md @@ -2198,6 +2198,7 @@ Known: **Record type**: - groupMemberId: int64 - groupId: int64 +- indexInGroup: int64 - memberId: string - memberRole: [GroupMemberRole](#groupmemberrole) - memberCategory: [GroupMemberCategory](#groupmembercategory) diff --git a/packages/simplex-chat-client/types/typescript/src/types.ts b/packages/simplex-chat-client/types/typescript/src/types.ts index b8095affdf..e67eae39a0 100644 --- a/packages/simplex-chat-client/types/typescript/src/types.ts +++ b/packages/simplex-chat-client/types/typescript/src/types.ts @@ -2487,6 +2487,7 @@ export namespace GroupLinkPlan { export interface GroupMember { groupMemberId: number // int64 groupId: number // int64 + indexInGroup: number // int64 memberId: string memberRole: GroupMemberRole memberCategory: GroupMemberCategory diff --git a/simplex-chat.cabal b/simplex-chat.cabal index a731f14eb9..bd3ca6e353 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -121,6 +121,7 @@ library Simplex.Chat.Store.Postgres.Migrations.M20250922_remove_unused_connections Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade + Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector else exposed-modules: Simplex.Chat.Archive @@ -266,6 +267,7 @@ library Simplex.Chat.Store.SQLite.Migrations.M20250922_remove_unused_connections Simplex.Chat.Store.SQLite.Migrations.M20251007_connections_sync Simplex.Chat.Store.SQLite.Migrations.M20251017_chat_tags_cascade + Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector other-modules: Paths_simplex_chat hs-source-dirs: diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 163a37cb3f..711a24c79e 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -1034,14 +1034,14 @@ introduceToModerators vr user gInfo@GroupInfo {groupId} m@GroupMember {memberRol introduceToAll :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM () introduceToAll vr user gInfo m = do - members <- withStore' $ \db -> getGroupMembers db vr user gInfo + members <- withStore' $ \db -> getGroupMembersForIntroduction db vr user gInfo m let recipients = filter memberCurrent members introduceMember vr user gInfo m recipients Nothing introduceToRemaining :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM () introduceToRemaining vr user gInfo m = do (members, introducedGMIds) <- - withStore' $ \db -> (,) <$> getGroupMembers db vr user gInfo <*> getIntroducedGroupMemberIds db m + withStore' $ \db -> (,) <$> getGroupMembersForIntroduction db vr user gInfo m <*> getIntroducedGroupMemberIds db m let recipients = filter (introduceMemP introducedGMIds) members introduceMember vr user gInfo m recipients Nothing where diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs index 9467675272..bbb5b6a8c0 100644 --- a/src/Simplex/Chat/Store/Connections.hs +++ b/src/Simplex/Chat/Store/Connections.hs @@ -142,14 +142,14 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupInfo {membership} - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, -- GroupInfo {membership = GroupMember {memberProfile}} pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts, -- from GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs index 00aa527603..3852665766 100644 --- a/src/Simplex/Chat/Store/Groups.hs +++ b/src/Simplex/Chat/Store/Groups.hs @@ -62,6 +62,7 @@ module Simplex.Chat.Store.Groups getGroupMemberIdViaMemberId, getScopeMemberIdViaMemberId, getGroupMembers, + getGroupMembersForIntroduction, getGroupModerators, getGroupRelays, getGroupMembersForExpiration, @@ -190,11 +191,11 @@ import Database.SQLite.Simple (Only (..), Query, (:.) (..)) import Database.SQLite.Simple.QQ (sql) #endif -type MaybeGroupMemberRow = (Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId) :. (Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, Maybe LocalAlias, Maybe Preferences) :. (Maybe UTCTime, Maybe UTCTime) :. (Maybe UTCTime, Maybe Int64, Maybe Int64, Maybe Int64, Maybe UTCTime) +type MaybeGroupMemberRow = (Maybe GroupMemberId, Maybe GroupId, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId) :. (Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, Maybe LocalAlias, Maybe Preferences) :. (Maybe UTCTime, Maybe UTCTime) :. (Maybe UTCTime, Maybe Int64, Maybe Int64, Maybe Int64, Maybe UTCTime) toMaybeGroupMember :: Int64 -> MaybeGroupMemberRow -> Maybe GroupMember -toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId) :. (Just profileId, Just displayName, Just fullName, shortDescr, image, contactLink, peerType, Just localAlias, contactPreferences) :. (Just createdAt, Just updatedAt) :. (supportChatTs, Just supportChatUnread, Just supportChatUnanswered, Just supportChatMentions, supportChatLastMsgFromMemberTs)) = - Just $ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. (profileId, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, contactPreferences) :. (createdAt, updatedAt) :. (supportChatTs, supportChatUnread, supportChatUnanswered, supportChatMentions, supportChatLastMsgFromMemberTs)) +toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just indexInGroup, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId) :. (Just profileId, Just displayName, Just fullName, shortDescr, image, contactLink, peerType, Just localAlias, contactPreferences) :. (Just createdAt, Just updatedAt) :. (supportChatTs, Just supportChatUnread, Just supportChatUnanswered, Just supportChatMentions, supportChatLastMsgFromMemberTs)) = + Just $ toGroupMember userContactId ((groupMemberId, groupId, indexInGroup, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. (profileId, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, contactPreferences) :. (createdAt, updatedAt) :. (supportChatTs, supportChatUnread, supportChatUnanswered, supportChatMentions, supportChatLastMsgFromMemberTs)) toMaybeGroupMember _ _ = Nothing createGroupLink :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> ConnId -> CreatedLinkContact -> GroupLinkId -> GroupMemberRole -> SubscriptionMode -> ExceptT StoreError IO GroupLink @@ -452,18 +453,35 @@ getHostMemberId_ db User {userId} groupId = ExceptT . firstRow fromOnly (SEHostMemberIdNotFound groupId) $ DB.query db "SELECT group_member_id FROM group_members WHERE user_id = ? AND group_id = ? AND member_category = ?" (userId, groupId, GCHostMember) +getUpdateNextIndexInGroup_ :: DB.Connection -> GroupId -> ExceptT StoreError IO Int64 +getUpdateNextIndexInGroup_ db groupId = + ExceptT . firstRow fromOnly (SEGroupNotFound groupId) $ + DB.query + db + [sql| + UPDATE groups + SET member_index = member_index + 1 + WHERE group_id = ? + RETURNING member_index + |] + (Only groupId) + createContactMemberInv_ :: IsContact a => DB.Connection -> User -> GroupId -> Maybe GroupMemberId -> a -> MemberIdRole -> GroupMemberCategory -> GroupMemberStatus -> InvitedBy -> Maybe ProfileId -> UTCTime -> VersionRangeChat -> ExceptT StoreError IO GroupMember createContactMemberInv_ db User {userId, userContactId} groupId invitedByGroupMemberId userOrContact MemberIdRole {memberId, memberRole} memberCategory memberStatus invitedBy incognitoProfileId createdAt vr = do incognitoProfile <- forM incognitoProfileId $ \profileId -> getProfileById db userId profileId - (localDisplayName, memberProfile) <- case (incognitoProfile, incognitoProfileId) of - (Just profile@LocalProfile {displayName}, Just profileId) -> - (,profile) <$> insertMemberIncognitoProfile_ displayName profileId - _ -> (,profile' userOrContact) <$> liftIO insertMember_ + (indexInGroup, localDisplayName, memberProfile) <- case (incognitoProfile, incognitoProfileId) of + (Just profile@LocalProfile {displayName}, Just profileId) -> do + (indexInGroup, localDisplayName) <- insertMemberIncognitoProfile_ displayName profileId + pure (indexInGroup, localDisplayName, profile) + _ -> do + (indexInGroup, localDisplayName) <- insertMember_ + pure (indexInGroup, localDisplayName, profile' userOrContact) groupMemberId <- liftIO $ insertedRowId db pure GroupMember { groupMemberId, groupId, + indexInGroup, memberId, memberRole, memberCategory, @@ -484,40 +502,44 @@ createContactMemberInv_ db User {userId, userContactId} groupId invitedByGroupMe } where memberChatVRange@(VersionRange minV maxV) = vr - insertMember_ :: IO ContactName + insertMember_ :: ExceptT StoreError IO (Int64, ContactName) insertMember_ = do let localDisplayName = localDisplayName' userOrContact - DB.execute - db - [sql| - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) - :. (userId, localDisplayName' userOrContact, contactId' userOrContact, localProfileId $ profile' userOrContact, createdAt, createdAt) - :. (minV, maxV) - ) - pure localDisplayName - insertMemberIncognitoProfile_ :: ContactName -> ProfileId -> ExceptT StoreError IO ContactName - insertMemberIncognitoProfile_ incognitoDisplayName customUserProfileId = ExceptT $ - withLocalDisplayName db userId incognitoDisplayName $ \incognitoLdn -> do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ DB.execute db [sql| INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) - :. (userId, incognitoLdn, contactId' userOrContact, localProfileId $ profile' userOrContact, customUserProfileId, createdAt, createdAt) + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) + :. (userId, localDisplayName' userOrContact, contactId' userOrContact, localProfileId $ profile' userOrContact, createdAt, createdAt) :. (minV, maxV) ) - pure $ Right incognitoLdn + pure (indexInGroup, localDisplayName) + insertMemberIncognitoProfile_ :: ContactName -> ProfileId -> ExceptT StoreError IO (Int64, ContactName) + insertMemberIncognitoProfile_ incognitoDisplayName customUserProfileId = + ExceptT . withLocalDisplayName db userId incognitoDisplayName $ \incognitoLdn -> runExceptT $ do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) + :. (userId, incognitoLdn, contactId' userOrContact, localProfileId $ profile' userOrContact, customUserProfileId, createdAt, createdAt) + :. (minV, maxV) + ) + pure (indexInGroup, incognitoLdn) deleteContactCardKeepConn :: DB.Connection -> Int64 -> Contact -> IO () deleteContactCardKeepConn db connId Contact {contactId, profile = LocalProfile {profileId}} = do @@ -542,16 +564,17 @@ createPreparedGroup db vr user@User {userId, userContactId} groupProfile busines let memberId = MemberId $ encodeUtf8 groupLDN <> "_host_unknown_id" hostProfile = profileFromName $ nameFromMemberId memberId (localDisplayName, profileId) <- createNewMemberProfile_ db user hostProfile currentTs + indexInGroup <- getUpdateNextIndexInGroup_ db groupId liftIO $ do DB.execute db [sql| INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, memberId, GRAdmin, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, GRAdmin, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) ) insertedRowId db @@ -737,16 +760,17 @@ createGroupViaLink' insertHost_ currentTs groupId = do (localDisplayName, profileId) <- createNewMemberProfile_ db user fromMemberProfile currentTs let MemberIdRole {memberId, memberRole} = fromMember + indexInGroup <- getUpdateNextIndexInGroup_ db groupId liftIO $ do DB.execute db [sql| INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, memberId, memberRole, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, memberRole, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) ) insertedRowId db @@ -1000,6 +1024,14 @@ getGroupMembers db vr user@User {userId, userContactId} GroupInfo {groupId} = do (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)") (userId, groupId, userContactId) +getGroupMembersForIntroduction :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupMember -> IO [GroupMember] +getGroupMembersForIntroduction db vr user@User {userId, userContactId} GroupInfo {groupId} _introduced@GroupMember {indexInGroup} = do + map (toContactMember vr user) + <$> DB.query + db + (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND index_in_group < ?") + (userId, groupId, userContactId, indexInGroup) + getGroupModerators :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> IO [GroupMember] getGroupModerators db vr user@User {userId, userContactId} GroupInfo {groupId} = do map (toContactMember vr user) @@ -1067,21 +1099,22 @@ getGroupInvitation db vr user groupId = createNewContactMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> Contact -> GroupMemberRole -> ConnId -> ConnReqInvitation -> SubscriptionMode -> ExceptT StoreError IO GroupMember createNewContactMember _ _ _ _ Contact {localDisplayName, activeConn = Nothing} _ _ _ _ = throwError $ SEContactNotReady localDisplayName createNewContactMember db gVar User {userId, userContactId} GroupInfo {groupId, membership} Contact {contactId, localDisplayName, profile, activeConn = Just Connection {connChatVersion, peerChatVRange}} memberRole agentConnId connRequest subMode = - createWithRandomId gVar $ \memId -> do + createWithRandomId' gVar $ \memId -> runExceptT $ do createdAt <- liftIO getCurrentTime member@GroupMember {groupMemberId} <- createMember_ (MemberId memId) createdAt - void $ createMemberConnection_ db userId groupMemberId agentConnId connChatVersion peerChatVRange Nothing 0 createdAt subMode + void $ liftIO $ createMemberConnection_ db userId groupMemberId agentConnId connChatVersion peerChatVRange Nothing 0 createdAt subMode pure member where VersionRange minV maxV = peerChatVRange invitedByGroupMemberId = groupMemberId' membership createMember_ memberId createdAt = do - insertMember_ + indexInGroup <- insertMember_ groupMemberId <- liftIO $ insertedRowId db pure GroupMember { groupMemberId, groupId, + indexInGroup, memberId, memberRole, memberCategory = GCInviteeMember, @@ -1101,45 +1134,50 @@ createNewContactMember db gVar User {userId, userContactId} GroupInfo {groupId, supportChat = Nothing } where - insertMember_ = - DB.execute - db - [sql| - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, invitedByGroupMemberId) - :. (userId, localDisplayName, contactId, localProfileId profile, connRequest, createdAt, createdAt) - :. (minV, maxV) - ) + insertMember_ = do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, invitedByGroupMemberId) + :. (userId, localDisplayName, contactId, localProfileId profile, connRequest, createdAt, createdAt) + :. (minV, maxV) + ) + pure indexInGroup createNewContactMemberAsync :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> Contact -> GroupMemberRole -> (CommandId, ConnId) -> VersionChat -> VersionRangeChat -> SubscriptionMode -> ExceptT StoreError IO () createNewContactMemberAsync db gVar user@User {userId, userContactId} GroupInfo {groupId, membership} Contact {contactId, localDisplayName, profile} memberRole (cmdId, agentConnId) chatV peerChatVRange subMode = - createWithRandomId gVar $ \memId -> do + createWithRandomId' gVar $ \memId -> runExceptT $ do createdAt <- liftIO getCurrentTime insertMember_ (MemberId memId) createdAt groupMemberId <- liftIO $ insertedRowId db - Connection {connId} <- createMemberConnection_ db userId groupMemberId agentConnId chatV peerChatVRange Nothing 0 createdAt subMode - setCommandConnId db user cmdId connId + Connection {connId} <- liftIO $ createMemberConnection_ db userId groupMemberId agentConnId chatV peerChatVRange Nothing 0 createdAt subMode + liftIO $ setCommandConnId db user cmdId connId where VersionRange minV maxV = peerChatVRange - insertMember_ memberId createdAt = - DB.execute - db - [sql| - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, groupMemberId' membership) - :. (userId, localDisplayName, contactId, localProfileId profile, createdAt, createdAt) - :. (minV, maxV) - ) + insertMember_ memberId createdAt = do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, groupMemberId' membership) + :. (userId, localDisplayName, contactId, localProfileId profile, createdAt, createdAt) + :. (minV, maxV) + ) createJoiningMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> VersionRangeChat -> Profile -> Maybe XContactId -> Maybe SharedMsgId -> GroupMemberRole -> GroupMemberStatus -> ExceptT StoreError IO (GroupMemberId, MemberId) createJoiningMember @@ -1161,26 +1199,28 @@ createJoiningMember "INSERT INTO contact_profiles (display_name, full_name, short_descr, image, contact_link, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)" (displayName, fullName, shortDescr, image, contactLink, userId, preferences, currentTs, currentTs) profileId <- liftIO $ insertedRowId db - createWithRandomId gVar $ \memId -> do + createWithRandomId' gVar $ \memId -> runExceptT $ do insertMember_ ldn profileId (MemberId memId) currentTs groupMemberId <- liftIO $ insertedRowId db pure (groupMemberId, MemberId memId) where VersionRange minV maxV = cReqChatVRange - insertMember_ ldn profileId memberId currentTs = - DB.execute - db - [sql| - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, memberId, memberRole, GCInviteeMember, memberStatus, fromInvitedBy userContactId IBUser, groupMemberId' membership) - :. (userId, ldn, Nothing :: (Maybe Int64), profileId, cReqXContactId_, welcomeMsgId_, currentTs, currentTs) - :. (minV, maxV) - ) + insertMember_ ldn profileId memberId currentTs = do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, memberStatus, fromInvitedBy userContactId IBUser, groupMemberId' membership) + :. (userId, ldn, Nothing :: (Maybe Int64), profileId, cReqXContactId_, welcomeMsgId_, currentTs, currentTs) + :. (minV, maxV) + ) getMemberJoinRequest :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO (Maybe (Maybe XContactId, Maybe SharedMsgId)) getMemberJoinRequest db User {userId} GroupInfo {groupId} GroupMember {groupMemberId = mId} = @@ -1242,22 +1282,24 @@ createBusinessRequestGroup membership <- createContactMemberInv_ db user groupId Nothing user (MemberIdRole (MemberId memberId) GROwner) GCUserMember GSMemCreator IBUser Nothing currentTs vr pure (groupId, membership) VersionRange minV maxV = cReqChatVRange - insertClientMember_ currentTs groupId membership = ExceptT $ do - withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do - createWithRandomId gVar $ \memId -> do - DB.execute - db - [sql| - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, MemberId memId, GRMember, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership) - :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) - :. (minV, maxV) - ) + insertClientMember_ currentTs groupId membership = + ExceptT . withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do + createWithRandomId' gVar $ \memId -> runExceptT $ do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, MemberId memId, GRMember, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership) + :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) + :. (minV, maxV) + ) groupMemberId <- liftIO $ insertedRowId db pure (groupMemberId, MemberId memId) @@ -1417,7 +1459,7 @@ createNewGroupMember db user gInfo invitingMember memInfo@MemberInfo {profile} m memContactId = Nothing, memProfileId } - liftIO $ createNewMember_ db user gInfo newMember currentTs + createNewMember_ db user gInfo newMember currentTs createNewMemberProfile_ :: DB.Connection -> User -> Profile -> UTCTime -> ExceptT StoreError IO (Text, ProfileId) createNewMemberProfile_ db User {userId} Profile {displayName, fullName, shortDescr, image, contactLink, preferences} createdAt = @@ -1429,7 +1471,7 @@ createNewMemberProfile_ db User {userId} Profile {displayName, fullName, shortDe profileId <- insertedRowId db pure $ Right (ldn, profileId) -createNewMember_ :: DB.Connection -> User -> GroupInfo -> NewGroupMember -> UTCTime -> IO GroupMember +createNewMember_ :: DB.Connection -> User -> GroupInfo -> NewGroupMember -> UTCTime -> ExceptT StoreError IO GroupMember createNewMember_ db User {userId, userContactId} @@ -1449,24 +1491,27 @@ createNewMember_ let invitedById = fromInvitedBy userContactId invitedBy activeConn = Nothing memberChatVRange@(VersionRange minV maxV) = maybe chatInitialVRange fromChatVRange memChatVRange - DB.execute - db - [sql| - INSERT INTO group_members - (group_id, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - |] - ( (groupId, memberId, memberRole, memberCategory, memberStatus, memRestriction, invitedById, memInvitedByGroupMemberId) - :. (userId, localDisplayName, memberContactId, memberContactProfileId, createdAt, createdAt) - :. (minV, maxV) - ) - groupMemberId <- insertedRowId db + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ + DB.execute + db + [sql| + INSERT INTO group_members + (group_id, index_in_group, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + |] + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, memRestriction, invitedById, memInvitedByGroupMemberId) + :. (userId, localDisplayName, memberContactId, memberContactProfileId, createdAt, createdAt) + :. (minV, maxV) + ) + groupMemberId <- liftIO $ insertedRowId db pure GroupMember { groupMemberId, groupId, + indexInGroup, memberId, memberRole, memberCategory, @@ -1523,33 +1568,20 @@ createIntroductions db chatV members toMember = do then pure [] else do currentTs <- getCurrentTime - catMaybes <$> mapM (createIntro_ currentTs) reMembers + mapM (insertIntro_ currentTs) reMembers where - createIntro_ :: UTCTime -> GroupMember -> IO (Maybe GroupMemberIntro) - createIntro_ ts reMember = - -- when members connect concurrently, host would try to create introductions between them in both directions; - -- this check avoids creating second (redundant) introduction - checkInverseIntro >>= \case - Just _ -> pure Nothing - Nothing -> do - DB.execute - db - [sql| - INSERT INTO group_member_intros - (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) - VALUES (?,?,?,?,?,?) - |] - (groupMemberId' reMember, groupMemberId' toMember, GMIntroPending, chatV, ts, ts) - introId <- insertedRowId db - pure $ Just GroupMemberIntro {introId, reMember, toMember, introStatus = GMIntroPending} - where - checkInverseIntro :: IO (Maybe Int64) - checkInverseIntro = - maybeFirstRow fromOnly $ - DB.query - db - "SELECT 1 FROM group_member_intros WHERE re_group_member_id = ? AND to_group_member_id = ? LIMIT 1" - (groupMemberId' toMember, groupMemberId' reMember) + insertIntro_ :: UTCTime -> GroupMember -> IO GroupMemberIntro + insertIntro_ ts reMember = do + DB.execute + db + [sql| + INSERT INTO group_member_intros + (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) + VALUES (?,?,?,?,?,?) + |] + (groupMemberId' reMember, groupMemberId' toMember, GMIntroPending, chatV, ts, ts) + introId <- insertedRowId db + pure GroupMemberIntro {introId, reMember, toMember, introStatus = GMIntroPending} updateIntroStatus :: DB.Connection -> Int64 -> GroupMemberIntroStatus -> IO () updateIntroStatus db introId introStatus = do @@ -1704,11 +1736,10 @@ createIntroReMember currentTs <- liftIO getCurrentTime (localDisplayName, memProfileId) <- createNewMemberProfile_ db user memberProfile currentTs let newMember = NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memRestriction, memInvitedBy = IBUnknown, memInvitedByGroupMemberId = Nothing, localDisplayName, memContactId = Nothing, memProfileId} - liftIO $ do - member <- createNewMember_ db user gInfo newMember currentTs - conn@Connection {connId = groupConnId} <- createMemberConnection_ db userId (groupMemberId' member) groupAgentConnId chatV mcvr memberContactId cLevel currentTs subMode - liftIO $ setCommandConnId db user groupCmdId groupConnId - pure (member :: GroupMember) {activeConn = Just conn} + member <- createNewMember_ db user gInfo newMember currentTs + conn@Connection {connId = groupConnId} <- liftIO $ createMemberConnection_ db userId (groupMemberId' member) groupAgentConnId chatV mcvr memberContactId cLevel currentTs subMode + liftIO $ setCommandConnId db user groupCmdId groupConnId + pure (member :: GroupMember) {activeConn = Just conn} createIntroToMemberContact :: DB.Connection -> User -> GroupMember -> GroupMember -> VersionChat -> VersionRangeChat -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> IO () createIntroToMemberContact db user@User {userId} GroupMember {memberContactId = viaContactId, activeConn} _to@GroupMember {groupMemberId, localDisplayName} chatV mcvr (groupCmdId, groupAgentConnId) directConnIds customUserProfileId subMode = do @@ -2468,21 +2499,22 @@ createNewUnknownGroupMember db vr user@User {userId, userContactId} GroupInfo {g currentTs <- liftIO getCurrentTime let memberProfile = profileFromName memberName (localDisplayName, profileId) <- createNewMemberProfile_ db user memberProfile currentTs - groupMemberId <- liftIO $ do + indexInGroup <- getUpdateNextIndexInGroup_ db groupId + liftIO $ DB.execute db [sql| INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, memberId, GRAuthor, GCPreMember, GSMemUnknown, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, GRAuthor, GCPreMember, GSMemUnknown, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) :. (minV, maxV) ) - insertedRowId db + groupMemberId <- liftIO $ insertedRowId db getGroupMemberById db vr user groupMemberId where VersionRange minV maxV = vr diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs index 47aabd16ee..d7dd0fde01 100644 --- a/src/Simplex/Chat/Store/Messages.hs +++ b/src/Simplex/Chat/Store/Messages.hs @@ -674,7 +674,7 @@ getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRe [sql| SELECT i.chat_item_id, -- GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, @@ -2998,7 +2998,7 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do -- CIMeta forwardedByMember, showGroupAsSender i.forwarded_by_group_member_id, i.show_group_as_sender, -- GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, @@ -3006,13 +3006,13 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do -- quoted ChatItem ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent, -- quoted GroupMember - rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category, + rm.group_member_id, rm.group_id, rm.index_in_group, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category, rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id, rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.chat_peer_type, rp.local_alias, rp.preferences, rm.created_at, rm.updated_at, rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts, -- deleted by GroupMember - dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category, + dbm.group_member_id, dbm.group_id, dbm.index_in_group, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category, dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id, dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.chat_peer_type, dbp.local_alias, dbp.preferences, dbm.created_at, dbm.updated_at, diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs index 89f8f6070b..9361713ea2 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations.hs +++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs @@ -21,6 +21,7 @@ import Simplex.Chat.Store.Postgres.Migrations.M20250919_group_summary import Simplex.Chat.Store.Postgres.Migrations.M20250922_remove_unused_connections import Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync import Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade +import Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector import Simplex.Messaging.Agent.Store.Shared (Migration (..)) schemaMigrations :: [(String, Text, Maybe Text)] @@ -41,7 +42,8 @@ schemaMigrations = ("20250919_group_summary", m20250919_group_summary, Just down_m20250919_group_summary), ("20250922_remove_unused_connections", m20250922_remove_unused_connections, Just down_m20250922_remove_unused_connections), ("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync), - ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade) + ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade), + ("20251117_member_relations_vector", m20251117_member_relations_vector, Just down_m20251117_member_relations_vector) ] -- | The list of migrations in ascending order by date diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs new file mode 100644 index 0000000000..197c90a66c --- /dev/null +++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs @@ -0,0 +1,62 @@ +{-# LANGUAGE QuasiQuotes #-} + +module Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector where + +import Data.Text (Text) +import qualified Data.Text as T +import Text.RawString.QQ (r) + +m20251117_member_relations_vector :: Text +m20251117_member_relations_vector = + T.pack + [r| +ALTER TABLE group_members ADD COLUMN index_in_group BIGINT NOT NULL DEFAULT 0; + +ALTER TABLE groups ADD COLUMN member_index BIGINT NOT NULL DEFAULT 0; + +ALTER TABLE group_members ADD COLUMN member_relations_vector BYTEA; + +CREATE INDEX tmp_idx_group_members_group_id_group_member_id ON group_members(group_id, group_member_id); + +CREATE TEMPORARY TABLE tmp_members_numbered AS +SELECT + group_member_id, + ROW_NUMBER() OVER ( + PARTITION BY group_id + ORDER BY group_member_id ASC + ) AS rn +FROM group_members; + +CREATE INDEX tmp_idx_members_numbered ON tmp_members_numbered(group_member_id); + +UPDATE group_members AS gm +SET index_in_group = n.rn +FROM tmp_members_numbered n +WHERE n.group_member_id = gm.group_member_id; + +DROP INDEX tmp_idx_group_members_group_id_group_member_id; +DROP INDEX tmp_idx_members_numbered; +DROP TABLE tmp_members_numbered; + +CREATE UNIQUE INDEX idx_group_members_group_id_index_in_group ON group_members(group_id, index_in_group); + +UPDATE groups g +SET member_index = COALESCE(( + SELECT MAX(index_in_group) + FROM group_members + WHERE group_members.group_id = g.group_id +), 0); +|] + +down_m20251117_member_relations_vector :: Text +down_m20251117_member_relations_vector = + T.pack + [r| +DROP INDEX idx_group_members_group_id_index_in_group; + +ALTER TABLE group_members DROP COLUMN index_in_group; + +ALTER TABLE groups DROP COLUMN member_index; + +ALTER TABLE group_members DROP COLUMN member_relations_vector; +|] diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql index 601dd97a6e..712099d7c9 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql +++ b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql @@ -706,7 +706,9 @@ CREATE TABLE test_chat_schema.group_members ( support_chat_items_mentions bigint DEFAULT 0 NOT NULL, support_chat_last_msg_from_member_ts timestamp with time zone, member_xcontact_id bytea, - member_welcome_shared_msg_id bytea + member_welcome_shared_msg_id bytea, + index_in_group bigint DEFAULT 0 NOT NULL, + member_relations_vector bytea ); @@ -805,7 +807,8 @@ CREATE TABLE test_chat_schema.groups ( request_shared_msg_id bytea, conn_link_prepared_connection smallint DEFAULT 0 NOT NULL, via_group_link_uri bytea, - summary_current_members_count bigint DEFAULT 0 NOT NULL + summary_current_members_count bigint DEFAULT 0 NOT NULL, + member_index bigint DEFAULT 0 NOT NULL ); @@ -2081,6 +2084,10 @@ CREATE INDEX idx_group_members_group_id ON test_chat_schema.group_members USING +CREATE UNIQUE INDEX idx_group_members_group_id_index_in_group ON test_chat_schema.group_members USING btree (group_id, index_in_group); + + + CREATE INDEX idx_group_members_invited_by ON test_chat_schema.group_members USING btree (invited_by); diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs index 1c819e6537..13ada872b2 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations.hs +++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs @@ -144,6 +144,7 @@ import Simplex.Chat.Store.SQLite.Migrations.M20250919_group_summary import Simplex.Chat.Store.SQLite.Migrations.M20250922_remove_unused_connections import Simplex.Chat.Store.SQLite.Migrations.M20251007_connections_sync import Simplex.Chat.Store.SQLite.Migrations.M20251017_chat_tags_cascade +import Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector import Simplex.Messaging.Agent.Store.Shared (Migration (..)) schemaMigrations :: [(String, Query, Maybe Query)] @@ -287,7 +288,8 @@ schemaMigrations = ("20250919_group_summary", m20250919_group_summary, Just down_m20250919_group_summary), ("20250922_remove_unused_connections", m20250922_remove_unused_connections, Just down_m20250922_remove_unused_connections), ("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync), - ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade) + ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade), + ("20251117_member_relations_vector", m20251117_member_relations_vector, Just down_m20251117_member_relations_vector) ] -- | The list of migrations in ascending order by date diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs new file mode 100644 index 0000000000..09ebe63708 --- /dev/null +++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs @@ -0,0 +1,106 @@ +{-# LANGUAGE QuasiQuotes #-} + +module Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector where + +import Database.SQLite.Simple (Query) +import Database.SQLite.Simple.QQ (sql) + +-- to do list: +-- - directory migration +-- - background process to set member_relations_vector based on group_member_intros +-- - also set member_relations_vector on forward (recipient list for sender is known there) +-- - take member locks when updating member_relations_vector +-- - for duration of migration forwarding operates in 2 modes simultaneously: +-- - if member_relations_vector is set, use it +-- - otherwise, use existing logic based on group_member_intros +-- - new invitees start with member_relations_vector = 0 for all existing (pre) members -> +-- member_relations_vector immediately can be used when new invitee sends +-- - pre members are not updated right away for new invitee, if their member_relations_vector is not set yet, +-- as it will be costly to update them all at once; instead it will be set once background process processes them; +-- also this means group_member_intros have to be maintained for them until then +-- - GroupMember.memberStatusVector is Maybe to make this differentiation +-- - user clients migration +-- - once directory service migrates to new state, member_relations_vector can be updated in db migration +-- as user clients wouldn't have as large group_member_intros +-- - TBC migration SQL +-- - alternative approach for member_relations_vector migration (both directory and user clients): +-- - set to 0 for all existing members right away in sql migration +-- (possibly limit to groups where user is admin or above, otherwise NULL) +-- - means that initially after migration new messages will be forwarded to all members, +-- however they will quickly report connected state via XGrpMemCon -> member_relations_vector will self-adjust +-- - allows for simple migration path, with immediate switch from group_member_intros, +-- avoids complexity of dual-mode forwarding during migration for directory / complex sql migration for user clients +-- - rework forwarding logic to use member_relations_vector: +-- - create new members with correct index_in_group = group's member_index + 1, +-- maintain groups.member_index +-- - when new invitee joins, set member_relations_vector to all 0 for them, update for pre members (set 0 for invitee's seq id) +-- - on XGrpMemCon update bitvectors for sender and referenced member (set 1 for corresponding seq ids) +-- - don't maintain group_member_intros (don't create, update status) +-- - on forwarding, get recipients based on sender's member_relations_vector +-- - for all 0s in bitvector, get members by index_in_group in corresponding positions +-- - second use of group_member_intros is targeted introductions of knocking member to "remaining" members +-- - has to be reworked to not rely on group_member_intros +-- - one approach could be to introduce accepted member to all (so, repeatedly introduce to moderators), +-- this idea was tested in PR 6327 +-- - another use of group_member_intros - createIntroductions, checkInverseIntro logic +-- - TBC how to avoid making redundant introductions between concurrently joining members +-- - second vector - for member introductions, or track in same vector +-- - when introducing to moderators only, do nothing - new moderators are introduced only to current members, +-- no pending in progress members, so race can't happen there +-- - when introducing to all, filter out members who already were introduced to this member +-- - can also solve previous issue of introducing remaining members in same way - don't introduce +-- to members this member already was introduced to +m20251117_member_relations_vector :: Query +m20251117_member_relations_vector = + [sql| +ALTER TABLE group_members ADD COLUMN index_in_group INTEGER NOT NULL DEFAULT 0; + +ALTER TABLE groups ADD COLUMN member_index INTEGER NOT NULL DEFAULT 0; + +ALTER TABLE group_members ADD COLUMN member_relations_vector BLOB; + +CREATE INDEX tmp_idx_group_members_group_id_group_member_id ON group_members(group_id, group_member_id); + +CREATE TEMPORARY TABLE tmp_members_numbered AS +SELECT + group_member_id, + ROW_NUMBER() OVER ( + PARTITION BY group_id + ORDER BY group_member_id ASC + ) AS rn +FROM group_members; + +CREATE INDEX tmp_idx_members_numbered ON tmp_members_numbered(group_member_id); + +UPDATE group_members AS gm +SET index_in_group = ( + SELECT rn + FROM tmp_members_numbered + WHERE tmp_members_numbered.group_member_id = gm.group_member_id +); + +DROP INDEX tmp_idx_group_members_group_id_group_member_id; +DROP INDEX tmp_idx_members_numbered; +DROP TABLE tmp_members_numbered; + +CREATE UNIQUE INDEX idx_group_members_group_id_index_in_group ON group_members(group_id, index_in_group); + +UPDATE groups AS g +SET member_index = COALESCE(( + SELECT MAX(index_in_group) + FROM group_members + WHERE group_members.group_id = g.group_id +), 0); +|] + +down_m20251117_member_relations_vector :: Query +down_m20251117_member_relations_vector = + [sql| +DROP INDEX idx_group_members_group_id_index_in_group; + +ALTER TABLE group_members DROP COLUMN index_in_group; + +ALTER TABLE groups DROP COLUMN member_index; + +ALTER TABLE group_members DROP COLUMN member_relations_vector; +|] diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt index dbb4823024..e343eadaeb 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt +++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt @@ -22,6 +22,40 @@ Query: Plan: SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?) +Query: + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + +Plan: +SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) +SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_job_scope_support_gm_id (job_scope_support_gm_id=?) +SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_sender_group_member_id (sender_group_member_id=?) +SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_job_scope_support_gm_id (job_scope_support_gm_id=?) +SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?) +SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?) +SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?) +SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?) +SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?) +SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?) +SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?) +SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?) +SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?) +SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?) +SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?) +SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?) +SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) +SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) +SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?) +SEARCH contacts USING COVERING INDEX idx_contacts_grp_direct_inv_from_group_member_id (grp_direct_inv_from_group_member_id=?) +SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?) + Query: UPDATE groups SET chat_ts = ?, @@ -42,10 +76,10 @@ SEARCH groups USING INTEGER PRIMARY KEY (rowid=?) Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -113,14 +147,14 @@ Query: g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupInfo {membership} - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, -- GroupInfo {membership = GroupMember {memberProfile}} pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts, -- from GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts @@ -224,18 +258,11 @@ Plan: SEARCH contact_requests USING COVERING INDEX sqlite_autoindex_contact_requests_1 (user_id=? AND local_display_name=?) SEARCH users USING INTEGER PRIMARY KEY (rowid=?) -Query: - INSERT INTO group_member_intros - (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) - VALUES (?,?,?,?,?,?) - -Plan: - Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -266,10 +293,44 @@ SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (conta Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + +Plan: +SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) +SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_job_scope_support_gm_id (job_scope_support_gm_id=?) +SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_sender_group_member_id (sender_group_member_id=?) +SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_job_scope_support_gm_id (job_scope_support_gm_id=?) +SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?) +SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?) +SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?) +SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?) +SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?) +SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?) +SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?) +SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?) +SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?) +SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?) +SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?) +SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?) +SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?) +SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) +SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) +SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?) +SEARCH contacts USING COVERING INDEX idx_contacts_grp_direct_inv_from_group_member_id (grp_direct_inv_from_group_member_id=?) +SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?) + +Query: + INSERT INTO group_members + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -431,9 +492,9 @@ SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?) Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -464,8 +525,8 @@ SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (conta Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) @@ -496,40 +557,6 @@ SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_mem SEARCH contacts USING COVERING INDEX idx_contacts_grp_direct_inv_from_group_member_id (grp_direct_inv_from_group_member_id=?) SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?) -Query: - INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - -Plan: -SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) -SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_job_scope_support_gm_id (job_scope_support_gm_id=?) -SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_sender_group_member_id (sender_group_member_id=?) -SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_job_scope_support_gm_id (job_scope_support_gm_id=?) -SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?) -SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?) -SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?) -SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?) -SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?) -SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?) -SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?) -SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?) -SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?) -SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?) -SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?) -SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?) -SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) -SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) -SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?) -SEARCH contacts USING COVERING INDEX idx_contacts_grp_direct_inv_from_group_member_id (grp_direct_inv_from_group_member_id=?) -SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?) - Query: INSERT INTO messages ( msg_sent, chat_msg_event, msg_body, connection_id, group_id, @@ -844,7 +871,7 @@ SEARCH s USING COVERING INDEX idx_group_snd_item_statuses_chat_item_id_group_mem Query: SELECT i.chat_item_id, -- GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, @@ -962,12 +989,19 @@ Query: Plan: +Query: + INSERT INTO group_member_intros + (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) + VALUES (?,?,?,?,?,?) + +Plan: + Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + (group_id, index_in_group, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, + user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, + peer_chat_min_version, peer_chat_max_version) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -1064,7 +1098,7 @@ Query: -- CIMeta forwardedByMember, showGroupAsSender i.forwarded_by_group_member_id, i.show_group_as_sender, -- GroupMember - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, @@ -1072,13 +1106,13 @@ Query: -- quoted ChatItem ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent, -- quoted GroupMember - rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category, + rm.group_member_id, rm.group_id, rm.index_in_group, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category, rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id, rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.chat_peer_type, rp.local_alias, rp.preferences, rm.created_at, rm.updated_at, rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts, -- deleted by GroupMember - dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category, + dbm.group_member_id, dbm.group_id, dbm.index_in_group, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category, dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id, dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.chat_peer_type, dbp.local_alias, dbp.preferences, dbm.created_at, dbm.updated_at, @@ -1611,44 +1645,10 @@ SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?) Query: INSERT INTO group_members - ( group_id, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) - -Plan: -SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) -SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_job_scope_support_gm_id (job_scope_support_gm_id=?) -SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_sender_group_member_id (sender_group_member_id=?) -SEARCH delivery_tasks USING COVERING INDEX idx_delivery_tasks_job_scope_support_gm_id (job_scope_support_gm_id=?) -SEARCH received_probes USING COVERING INDEX idx_received_probes_group_member_id (group_member_id=?) -SEARCH sent_probe_hashes USING COVERING INDEX idx_sent_probe_hashes_group_member_id (group_member_id=?) -SEARCH sent_probes USING COVERING INDEX idx_sent_probes_group_member_id (group_member_id=?) -SEARCH group_snd_item_statuses USING COVERING INDEX idx_group_snd_item_statuses_group_member_id (group_member_id=?) -SEARCH chat_item_moderations USING COVERING INDEX idx_chat_item_moderations_moderator_member_id (moderator_member_id=?) -SEARCH chat_item_reactions USING COVERING INDEX idx_chat_item_reactions_group_member_id (group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_group_member_id (group_scope_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_forwarded_by_group_member_id (forwarded_by_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_item_deleted_by_group_member_id (item_deleted_by_group_member_id=?) -SEARCH chat_items USING COVERING INDEX idx_chat_items_group_member_id (group_member_id=?) -SEARCH pending_group_messages USING COVERING INDEX idx_pending_group_messages_group_member_id (group_member_id=?) -SEARCH messages USING COVERING INDEX idx_messages_forwarded_by_group_member_id (forwarded_by_group_member_id=?) -SEARCH messages USING COVERING INDEX idx_messages_author_group_member_id (author_group_member_id=?) -SEARCH connections USING COVERING INDEX idx_connections_group_member_id (group_member_id=?) -SEARCH rcv_files USING COVERING INDEX idx_rcv_files_group_member_id (group_member_id=?) -SEARCH snd_files USING COVERING INDEX idx_snd_files_group_member_id (group_member_id=?) -SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) -SEARCH group_member_intros USING COVERING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) -SEARCH group_members USING COVERING INDEX idx_group_members_invited_by_group_member_id (invited_by_group_member_id=?) -SEARCH contacts USING COVERING INDEX idx_contacts_grp_direct_inv_from_group_member_id (grp_direct_inv_from_group_member_id=?) -SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (contact_group_member_id=?) - -Query: - INSERT INTO group_members - (group_id, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, - user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, - peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -3790,6 +3790,15 @@ Query: Plan: SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) +Query: + UPDATE groups + SET member_index = member_index + 1 + WHERE group_id = ? + RETURNING member_index + +Plan: +SEARCH groups USING INTEGER PRIMARY KEY (rowid=?) + Query: UPDATE groups SET via_group_link_uri = ?, via_group_link_uri_hash = ? @@ -4460,7 +4469,7 @@ Query: SELECT contact_profile_id, member_profile_id, local_display_name FROM group_members WHERE group_id = ? Plan: -SEARCH group_members USING INDEX sqlite_autoindex_group_members_1 (group_id=?) +SEARCH group_members USING INDEX idx_group_members_group_id_index_in_group (group_id=?) Query: SELECT DISTINCT group_id, worker_scope @@ -4970,7 +4979,7 @@ Query: g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupMember - membership - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, @@ -5004,7 +5013,7 @@ Query: g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupMember - membership - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, @@ -5031,7 +5040,7 @@ Query: g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupMember - membership - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, @@ -5080,7 +5089,7 @@ SEARCH p USING INTEGER PRIMARY KEY (rowid=?) Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5107,7 +5116,7 @@ SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JO Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5126,7 +5135,7 @@ SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JO Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5139,13 +5148,13 @@ Query: LEFT JOIN connections c ON c.group_member_id = m.group_member_id WHERE m.group_id = ? AND m.member_category = ? Plan: -SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=?) +SEARCH m USING INDEX idx_group_members_group_id_index_in_group (group_id=?) SEARCH p USING INTEGER PRIMARY KEY (rowid=?) SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JOIN Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5164,7 +5173,7 @@ SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JO Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5183,7 +5192,7 @@ SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JO Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -5202,7 +5211,26 @@ SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JO Query: SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, + m.created_at, m.updated_at, + m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, + c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id, + c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.user_contact_link_id, + c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter, + c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version + FROM group_members m + JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) + LEFT JOIN connections c ON c.group_member_id = m.group_member_id + WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND index_in_group < ? +Plan: +SEARCH m USING INDEX idx_group_members_group_id_index_in_group (group_id=? AND index_in_group Nothing toGroupMember :: Int64 -> GroupMemberRow -> GroupMember -toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, BI showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. profileRow :. (createdAt, updatedAt) :. (supportChatTs_, supportChatUnread, supportChatMemberAttention, supportChatMentions, supportChatLastMsgFromMemberTs)) = +toGroupMember userContactId ((groupMemberId, groupId, indexInGroup, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, BI showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. profileRow :. (createdAt, updatedAt) :. (supportChatTs_, supportChatUnread, supportChatMemberAttention, supportChatMentions, supportChatLastMsgFromMemberTs)) = let memberProfile = rowToLocalProfile profileRow memberSettings = GroupMemberSettings {showMessages} blockedByAdmin = maybe False mrsBlocked memberRestriction_ @@ -702,7 +702,7 @@ groupMemberQuery :: Query groupMemberQuery = [sql| SELECT - m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, m.created_at, m.updated_at, m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, @@ -742,7 +742,7 @@ groupInfoQueryFields = g.business_chat, g.business_member_id, g.customer_member_id, g.ui_themes, g.summary_current_members_count, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri, -- GroupMember - membership - mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, + mu.group_member_id, mu.group_id, mu.index_in_group, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences, mu.created_at, mu.updated_at, diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs index bb86cb2522..667660c97b 100644 --- a/src/Simplex/Chat/Types.hs +++ b/src/Simplex/Chat/Types.hs @@ -921,6 +921,7 @@ type GroupMemberId = Int64 data GroupMember = GroupMember { groupMemberId :: GroupMemberId, groupId :: GroupId, + indexInGroup :: Int64, memberId :: MemberId, memberRole :: GroupMemberRole, memberCategory :: GroupMemberCategory, diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index 52a015c31f..4c5efa26b6 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -3663,7 +3663,7 @@ testGroupMsgDecryptError ps = withTestChat ps "bob" $ \bob -> do bob <## "subscribed 2 connections on server localhost" alice #> "#team hello again" - bob <# "#team alice> skipped message ID 9..11" + bob <# "#team alice> skipped message ID 8..10" bob <# "#team alice> hello again" bob #> "#team received!" alice <# "#team bob> received!" From 247ab16a74af2c76a63dd8b9ee8fee3e6cf8a406 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Thu, 20 Nov 2025 09:33:37 +0000 Subject: [PATCH 09/32] ci/reproducible builds: pin Java version (#6447) * ci/reproducible builds: pin Java version * ci/reproducible builds: fix aarch64 builds * ci/reproducible builds: chech java hash --- Dockerfile.build | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 3c841cfb25..fddc96b6c2 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -6,7 +6,9 @@ FROM ubuntu:${TAG} AS build ARG GHC=9.6.3 ARG CABAL=3.10.2.0 -ARG JAVA=17 +ARG JAVA_VER=17.0.17.10.1 +ARG JAVA_HASH_AMD64=e3e11daa5c22a45153bbeff1a0c21bf08631791e4e8d8ed14deba31c7cf9af1a +ARG JAVA_HASH_ARM64=2b460859b681757b33a7591b6238ecaf51569d05d2684984e5f0a89c6514acbc ENV TZ=Etc/UTC \ DEBIAN_FRONTEND=noninteractive @@ -44,10 +46,26 @@ RUN apt-get update && \ # depends on libjpeg.so.8 and liblcms2.so.2 which are NOT copied into final # /usr/lib/runtime/lib directory and I do not have time to figure out gradle.kotlin # to fix this :( -RUN curl --proto '=https' --tlsv1.2 -sSf 'https://apt.corretto.aws/corretto.key' | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg &&\ - echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/corretto.list &&\ - apt update &&\ - apt install -y java-${JAVA}-amazon-corretto-jdk +RUN export JAVA_FILENAME='java-corretto.deb' \ + JAVA_VER_MAJOR=$(printf "${JAVA_VER}" | awk -F. '{print $1}') \ + JAVA_VER_DEB=$(printf "${JAVA_VER}" | sed 's/\.1$/-1/') && \ + case "$(uname -m)" in \ + x86_64) export JAVA_ARCH='amd64' JAVA_HASH="$JAVA_HASH_AMD64" ;; \ + aarch64) export JAVA_ARCH='arm64' JAVA_HASH="$JAVA_HASH_ARM64" ;; \ + *) echo "unknown arch $(uname -m)" && exit 1 ;; \ + esac && \ + curl --proto '=https' --tlsv1.2 -sSf \ + "https://corretto.aws/downloads/resources/${JAVA_VER}/java-${JAVA_VER_MAJOR}-amazon-corretto-jdk_${JAVA_VER_DEB}_${JAVA_ARCH}.deb" \ + -o "${JAVA_FILENAME}" && \ + if echo "${JAVA_HASH} ${JAVA_FILENAME}" | sha256sum -c -; then \ + if apt install -y ./"${JAVA_FILENAME}"; then \ + rm ./"${JAVA_FILENAME}"; \ + else \ + echo "Failed to install Java Corretto" && exit 1; \ + fi \ + else \ + echo "Checksum mismatch" && exit 1; \ + fi # Specify bootstrap Haskell versions ENV BOOTSTRAP_HASKELL_GHC_VERSION=${GHC} From af7540248ece729fbc0bb216b2b107384ce69bf6 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Mon, 24 Nov 2025 07:36:44 +0000 Subject: [PATCH 10/32] core: relations vector operations (#6459) * core: relations vector operations * tests * simplify * comment * remove space * core: use 1 byte for each member-to-member relation (#6462) --------- Co-authored-by: Evgeny --- simplex-chat.cabal | 2 + src/Simplex/Chat/Types/MemberRelations.hs | 74 ++++++++ tests/MemberRelationsTests.hs | 209 ++++++++++++++++++++++ tests/Test.hs | 2 + 4 files changed, 287 insertions(+) create mode 100644 src/Simplex/Chat/Types/MemberRelations.hs create mode 100644 tests/MemberRelationsTests.hs diff --git a/simplex-chat.cabal b/simplex-chat.cabal index bd3ca6e353..24ccf24ded 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -84,6 +84,7 @@ library Simplex.Chat.Store.Shared Simplex.Chat.Styled Simplex.Chat.Types + Simplex.Chat.Types.MemberRelations Simplex.Chat.Types.Preferences Simplex.Chat.Types.Shared Simplex.Chat.Types.UITheme @@ -544,6 +545,7 @@ test-suite simplex-chat-test JSONFixtures JSONTests MarkdownTests + MemberRelationsTests MessageBatching OperatorTests ProtocolTests diff --git a/src/Simplex/Chat/Types/MemberRelations.hs b/src/Simplex/Chat/Types/MemberRelations.hs new file mode 100644 index 0000000000..7245b22472 --- /dev/null +++ b/src/Simplex/Chat/Types/MemberRelations.hs @@ -0,0 +1,74 @@ +{-# LANGUAGE LambdaCase #-} + +module Simplex.Chat.Types.MemberRelations + ( MemberRelation (..), + getRelation, + setRelation, + setRelations, + ) +where + +import Control.Monad +import Data.Bits ((.&.), (.|.), complement) +import Data.ByteString (ByteString) +import qualified Data.ByteString as B +import Data.ByteString.Internal (toForeignPtr, unsafeCreate) +import Data.Int (Int64) +import Data.Word (Word8) +import Foreign.ForeignPtr (withForeignPtr) +import Foreign.Marshal.Utils (copyBytes, fillBytes) +import Foreign.Ptr (plusPtr) +import Foreign.Storable (peekByteOff, pokeByteOff) + +data MemberRelation + = MRNew + | MRIntroduced + | MRConnected + deriving (Eq, Show) + +toRelationInt :: MemberRelation -> Word8 +toRelationInt = \case + MRNew -> 0 + MRIntroduced -> 1 + MRConnected -> 2 + +fromRelationInt :: Word8 -> MemberRelation +fromRelationInt = \case + 0 -> MRNew + 1 -> MRIntroduced + 2 -> MRConnected + _ -> MRNew + +-- | Get the relation status of a member at a given index from the relations vector. +-- Returns 'MRNew' if the vector is not long enough (lazy initialization). +getRelation :: Int64 -> ByteString -> MemberRelation +getRelation i v + | i < 0 || fromIntegral i >= B.length v = MRNew + | otherwise = fromRelationInt $ (v `B.index` fromIntegral i) .&. relationMask + + +-- | Set the relation status of a member at a given index in the relations vector. +-- Expands the vector lazily if needed (padding with zeros for 'MRNew' relation). +setRelation :: Int64 -> MemberRelation -> ByteString -> ByteString +setRelation i r v + | i >= 0 = setRelations [(i, r)] v + | otherwise = v + +-- | Set multiple relations at once. +-- Expands the vector lazily if needed (padding with zeros for 'MRNew' relation). +setRelations :: [(Int64, MemberRelation)] -> ByteString -> ByteString +setRelations [] v = v +setRelations relations v = + let (fp, off, len) = toForeignPtr v + newLen = max len $ fromIntegral $ maximum (map fst relations) + 1 + in unsafeCreate newLen $ \ptr -> do + withForeignPtr fp $ \vPtr -> copyBytes ptr (vPtr `plusPtr` off) len + when (newLen > len) $ fillBytes (ptr `plusPtr` len) 0 (newLen - len) + forM_ relations $ \(ix, r) -> when (ix >= 0) $ do + let i = fromIntegral ix + b <- peekByteOff ptr i + let b' = (b .&. complement relationMask) .|. toRelationInt r + pokeByteOff ptr i b' + +relationMask :: Word8 +relationMask = 0x07 -- reserving 3 bits diff --git a/tests/MemberRelationsTests.hs b/tests/MemberRelationsTests.hs new file mode 100644 index 0000000000..968dcbec43 --- /dev/null +++ b/tests/MemberRelationsTests.hs @@ -0,0 +1,209 @@ +{-# LANGUAGE OverloadedStrings #-} + +module MemberRelationsTests where + +import Control.Monad +import qualified Data.ByteString as B +import Simplex.Chat.Types.MemberRelations +import Test.Hspec + +memberRelationsTests :: Spec +memberRelationsTests = do + describe "MemberRelation vector operations" $ do + describe "getRelation" $ do + it "returns MRNew for empty vector" $ do + getRelation 0 B.empty `shouldBe` MRNew + getRelation 5 B.empty `shouldBe` MRNew + getRelation 100 B.empty `shouldBe` MRNew + + it "returns MRNew for negative index" $ do + getRelation (-1) B.empty `shouldBe` MRNew + getRelation (-5) (B.pack [0xFF]) `shouldBe` MRNew + + it "returns MRNew for index beyond vector length" $ do + let vec = B.pack [0x00] + getRelation 10 vec `shouldBe` MRNew + + it "reads single relation from byte" $ do + let vec = B.pack [0x01] + getRelation 0 vec `shouldBe` MRIntroduced + + it "reads multiple relations" $ do + let vec = B.pack [0, 0, 1, 2] + getRelation 0 vec `shouldBe` MRNew + getRelation 1 vec `shouldBe` MRNew + getRelation 2 vec `shouldBe` MRIntroduced + getRelation 3 vec `shouldBe` MRConnected + + it "reads multiple relations 2" $ do + let vec = B.pack [1, 1, 0, 0, 2, 2, 0, 0] + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 1 vec `shouldBe` MRIntroduced + getRelation 4 vec `shouldBe` MRConnected + getRelation 5 vec `shouldBe` MRConnected + + it "ignore reserved bits" $ do + let vec = B.pack [0xF9] -- 11111001 + getRelation 0 vec `shouldBe` MRIntroduced + + describe "setRelation" $ do + it "sets relation in empty vector (lazy expansion)" $ do + let vec = setRelation 0 MRIntroduced B.empty + getRelation 0 vec `shouldBe` MRIntroduced + + it "ignores negative index" $ do + let vec = setRelation (-1) MRIntroduced B.empty + vec `shouldBe` B.empty + + it "expands vector to required length" $ do + let vec = setRelation 5 MRConnected B.empty + B.length vec `shouldBe` 6 + getRelation 5 vec `shouldBe` MRConnected + -- Other positions should be MRNew (0) + getRelation 0 vec `shouldBe` MRNew + getRelation 10 vec `shouldBe` MRNew + B.length vec `shouldBe` 6 + + it "updates existing relation without affecting others" $ do + -- Start: [01][01][00][00] + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelation 1 MRIntroduced vec1 + -- Update: [01][10][00][00] + let vec3 = setRelation 1 MRConnected vec2 + getRelation 0 vec3 `shouldBe` MRIntroduced + getRelation 1 vec3 `shouldBe` MRConnected + + it "updates relation in specific byte of multi-byte vector" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelation 10 MRConnected vec1 + B.length vec2 `shouldBe` 11 + getRelation 0 vec2 `shouldBe` MRIntroduced + getRelation 10 vec2 `shouldBe` MRConnected + forM_ [1..9] $ \i -> getRelation i vec2 `shouldBe` MRNew + + it "handles setting relation at last position in byte" $ do + let vec = setRelation 3 MRConnected B.empty + getRelation 3 vec `shouldBe` MRConnected + + it "preserves vector when setting same value" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelation 0 MRIntroduced vec1 + vec2 `shouldBe` vec1 + getRelation 0 vec2 `shouldBe` MRIntroduced + + it "preserves reserved bits" $ do + let v = B.pack [0xF8] -- 11111000 + getRelation 0 v `shouldBe` MRNew + let v' = setRelation 0 MRIntroduced v + getRelation 0 v' `shouldBe` MRIntroduced + B.unpack v' `shouldBe` [0xF9] -- 11111001 + + describe "setRelations" $ do + it "returns same vector for empty list" $ do + let vec = B.pack [0x42] + setRelations [] vec `shouldBe` vec + + it "sets multiple relations in empty vector" $ do + let updates = [(0, MRIntroduced), (1, MRConnected), (2, MRIntroduced)] + let vec = setRelations updates B.empty + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 1 vec `shouldBe` MRConnected + getRelation 2 vec `shouldBe` MRIntroduced + getRelation 3 vec `shouldBe` MRNew -- Unset position + + it "sets multiple relations 1" $ do + let updates = [(0, MRIntroduced), (1, MRConnected), (2, MRConnected), (3, MRIntroduced)] + let vec = setRelations updates B.empty + B.length vec `shouldBe` 4 + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 1 vec `shouldBe` MRConnected + getRelation 2 vec `shouldBe` MRConnected + getRelation 3 vec `shouldBe` MRIntroduced + + it "sets multiple relations 2" $ do + let updates = [(0, MRIntroduced), (5, MRConnected), (10, MRIntroduced)] + let vec = setRelations updates B.empty + B.length vec `shouldBe` 11 + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 5 vec `shouldBe` MRConnected + getRelation 10 vec `shouldBe` MRIntroduced + getRelation 7 vec `shouldBe` MRNew -- Unset position between + + it "handles sparse updates (few indices in large range)" $ do + -- Sparse: 3 updates in large group + let updates = [(0, MRIntroduced), (100, MRConnected), (5000, MRIntroduced)] + let vec = setRelations updates B.empty + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 100 vec `shouldBe` MRConnected + getRelation 5000 vec `shouldBe` MRIntroduced + getRelation 50 vec `shouldBe` MRNew -- Untouched position + + it "handles dense updates (many consecutive indices)" $ do + -- Dense: many consecutive updates + let updates = [(i, if even i then MRIntroduced else MRConnected) | i <- [0 .. 99]] + let vec = setRelations updates B.empty + all (\i -> getRelation i vec == (if even i then MRIntroduced else MRConnected)) [0 .. 99] `shouldBe` True + + it "handles unsorted input correctly" $ do + let updates = [(10, MRConnected), (2, MRIntroduced), (5, MRConnected), (0, MRIntroduced)] + let vec = setRelations updates B.empty + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 2 vec `shouldBe` MRIntroduced + getRelation 5 vec `shouldBe` MRConnected + getRelation 10 vec `shouldBe` MRConnected + + it "handles duplicate indices (last one wins)" $ do + let updates = [(0, MRIntroduced), (0, MRConnected), (0, MRIntroduced)] + let vec = setRelations updates B.empty + getRelation 0 vec `shouldBe` MRIntroduced + + it "preserves existing relations not in update list" $ do + let vec1 = setRelation 0 MRConnected B.empty + let vec2 = setRelation 5 MRIntroduced vec1 + let updates = [(10, MRConnected)] + let vec3 = setRelations updates vec2 + getRelation 0 vec3 `shouldBe` MRConnected + getRelation 5 vec3 `shouldBe` MRIntroduced + getRelation 10 vec3 `shouldBe` MRConnected + + describe "edge cases and invariants" $ do + it "round-trip: set then get returns same value" $ do + let vec1 = setRelation 42 MRConnected B.empty + getRelation 42 vec1 `shouldBe` MRConnected + + it "multiple round-trips preserve values" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelation 1 MRConnected vec1 + let vec3 = setRelation 2 MRIntroduced vec2 + getRelation 0 vec3 `shouldBe` MRIntroduced + getRelation 1 vec3 `shouldBe` MRConnected + getRelation 2 vec3 `shouldBe` MRIntroduced + + it "setRelations equivalent to multiple setRelation calls" $ do + let updates = [(0, MRIntroduced), (5, MRConnected), (10, MRIntroduced)] + let vecBatch = setRelations updates B.empty + let vecSeq = setRelation 10 MRIntroduced $ setRelation 5 MRConnected $ setRelation 0 MRIntroduced B.empty + vecBatch `shouldBe` vecSeq + getRelation 0 vecBatch `shouldBe` getRelation 0 vecSeq + getRelation 5 vecBatch `shouldBe` getRelation 5 vecSeq + getRelation 10 vecBatch `shouldBe` getRelation 10 vecSeq + + it "handles large group size (10000 members)" $ do + let updates = [(0, MRIntroduced), (5000, MRConnected), (9999, MRIntroduced)] + let vec = setRelations updates B.empty + B.length vec `shouldBe` 10000 + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 5000 vec `shouldBe` MRConnected + getRelation 9999 vec `shouldBe` MRIntroduced + + it "all status values can be stored and retrieved" $ do + let vec1 = setRelation 0 MRNew B.empty + let vec2 = setRelation 1 MRIntroduced vec1 + let vec3 = setRelation 2 MRConnected vec2 + getRelation 0 vec3 `shouldBe` MRNew + getRelation 1 vec3 `shouldBe` MRIntroduced + getRelation 2 vec3 `shouldBe` MRConnected + + it "vector length is minimal (lazy expansion)" $ do + let vec = setRelation 3 MRConnected B.empty + B.length vec `shouldBe` 4 diff --git a/tests/Test.hs b/tests/Test.hs index e4e76fd43e..e1a5a58c7d 100644 --- a/tests/Test.hs +++ b/tests/Test.hs @@ -13,6 +13,7 @@ import Control.Logger.Simple import Data.Time.Clock.System import JSONTests import MarkdownTests +import MemberRelationsTests import MessageBatching import ProtocolTests import OperatorTests @@ -59,6 +60,7 @@ main = do #endif describe "SimpleX chat markdown" markdownTests describe "JSON Tests" jsonTests + describe "Member relations" memberRelationsTests describe "SimpleX chat view" viewTests describe "SimpleX chat protocol" protocolTests describe "Valid names" validNameTests From 65e3d8ca7cd5753dc9869280dfb4e1878484a624 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Mon, 24 Nov 2025 09:43:33 +0000 Subject: [PATCH 11/32] core: fix relation vector indexes in code and migrations to start from 0 instead of 1 (#6460) --- src/Simplex/Chat/Store/Groups.hs | 2 +- .../M20251117_member_relations_vector.hs | 18 +++++------ .../M20251117_member_relations_vector.hs | 30 +++++++------------ .../SQLite/Migrations/chat_query_plans.txt | 2 +- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs index 3852665766..c04a31c0a9 100644 --- a/src/Simplex/Chat/Store/Groups.hs +++ b/src/Simplex/Chat/Store/Groups.hs @@ -462,7 +462,7 @@ getUpdateNextIndexInGroup_ db groupId = UPDATE groups SET member_index = member_index + 1 WHERE group_id = ? - RETURNING member_index + RETURNING member_index - 1 |] (Only groupId) diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs index 197c90a66c..3f6deeb80f 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs +++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs @@ -18,31 +18,31 @@ ALTER TABLE group_members ADD COLUMN member_relations_vector BYTEA; CREATE INDEX tmp_idx_group_members_group_id_group_member_id ON group_members(group_id, group_member_id); -CREATE TEMPORARY TABLE tmp_members_numbered AS +CREATE TEMPORARY TABLE tmp_members_indexed AS SELECT group_member_id, ROW_NUMBER() OVER ( PARTITION BY group_id ORDER BY group_member_id ASC - ) AS rn + ) - 1 AS idx_in_group FROM group_members; -CREATE INDEX tmp_idx_members_numbered ON tmp_members_numbered(group_member_id); +CREATE INDEX tmp_idx_members_indexed ON tmp_members_indexed(group_member_id); UPDATE group_members AS gm -SET index_in_group = n.rn -FROM tmp_members_numbered n -WHERE n.group_member_id = gm.group_member_id; +SET index_in_group = tmi.idx_in_group +FROM tmp_members_indexed tmi +WHERE tmi.group_member_id = gm.group_member_id; DROP INDEX tmp_idx_group_members_group_id_group_member_id; -DROP INDEX tmp_idx_members_numbered; -DROP TABLE tmp_members_numbered; +DROP INDEX tmp_idx_members_indexed; +DROP TABLE tmp_members_indexed; CREATE UNIQUE INDEX idx_group_members_group_id_index_in_group ON group_members(group_id, index_in_group); UPDATE groups g SET member_index = COALESCE(( - SELECT MAX(index_in_group) + SELECT MAX(index_in_group) + 1 FROM group_members WHERE group_members.group_id = g.group_id ), 0); diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs index 09ebe63708..5c4251cc55 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs +++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs @@ -40,16 +40,8 @@ import Database.SQLite.Simple.QQ (sql) -- - for all 0s in bitvector, get members by index_in_group in corresponding positions -- - second use of group_member_intros is targeted introductions of knocking member to "remaining" members -- - has to be reworked to not rely on group_member_intros --- - one approach could be to introduce accepted member to all (so, repeatedly introduce to moderators), --- this idea was tested in PR 6327 --- - another use of group_member_intros - createIntroductions, checkInverseIntro logic --- - TBC how to avoid making redundant introductions between concurrently joining members --- - second vector - for member introductions, or track in same vector --- - when introducing to moderators only, do nothing - new moderators are introduced only to current members, --- no pending in progress members, so race can't happen there --- - when introducing to all, filter out members who already were introduced to this member --- - can also solve previous issue of introducing remaining members in same way - don't introduce --- to members this member already was introduced to +-- - set MRIntroduced status in member relations vector on first introduction, +-- exclude previously introduced members on second introduction m20251117_member_relations_vector :: Query m20251117_member_relations_vector = [sql| @@ -61,33 +53,33 @@ ALTER TABLE group_members ADD COLUMN member_relations_vector BLOB; CREATE INDEX tmp_idx_group_members_group_id_group_member_id ON group_members(group_id, group_member_id); -CREATE TEMPORARY TABLE tmp_members_numbered AS +CREATE TEMPORARY TABLE tmp_members_indexed AS SELECT group_member_id, ROW_NUMBER() OVER ( PARTITION BY group_id ORDER BY group_member_id ASC - ) AS rn + ) - 1 AS idx_in_group FROM group_members; -CREATE INDEX tmp_idx_members_numbered ON tmp_members_numbered(group_member_id); +CREATE INDEX tmp_idx_members_indexed ON tmp_members_indexed(group_member_id); UPDATE group_members AS gm SET index_in_group = ( - SELECT rn - FROM tmp_members_numbered - WHERE tmp_members_numbered.group_member_id = gm.group_member_id + SELECT idx_in_group + FROM tmp_members_indexed + WHERE tmp_members_indexed.group_member_id = gm.group_member_id ); DROP INDEX tmp_idx_group_members_group_id_group_member_id; -DROP INDEX tmp_idx_members_numbered; -DROP TABLE tmp_members_numbered; +DROP INDEX tmp_idx_members_indexed; +DROP TABLE tmp_members_indexed; CREATE UNIQUE INDEX idx_group_members_group_id_index_in_group ON group_members(group_id, index_in_group); UPDATE groups AS g SET member_index = COALESCE(( - SELECT MAX(index_in_group) + SELECT MAX(index_in_group) + 1 FROM group_members WHERE group_members.group_id = g.group_id ), 0); diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt index e343eadaeb..9156b56fcb 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt +++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt @@ -3794,7 +3794,7 @@ Query: UPDATE groups SET member_index = member_index + 1 WHERE group_id = ? - RETURNING member_index + RETURNING member_index - 1 Plan: SEARCH groups USING INTEGER PRIMARY KEY (rowid=?) From 594a74e337296a4ac35a12605257cb3792441ca3 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Tue, 25 Nov 2025 07:31:35 +0000 Subject: [PATCH 12/32] docs: relations vector rfc (#6463) --- .../2025-11-24-member-relations-vector.md | 133 ++++++++++++++++++ .../M20251117_member_relations_vector.hs | 37 ----- 2 files changed, 133 insertions(+), 37 deletions(-) create mode 100644 docs/rfcs/2025-11-24-member-relations-vector.md diff --git a/docs/rfcs/2025-11-24-member-relations-vector.md b/docs/rfcs/2025-11-24-member-relations-vector.md new file mode 100644 index 0000000000..c4e8cf7224 --- /dev/null +++ b/docs/rfcs/2025-11-24-member-relations-vector.md @@ -0,0 +1,133 @@ +# Member relations vectors + +## Problem + +Maintaining member introduction records takes N^2 space. + +## Solution + +Migrate to member relations byte vector, with per member relation encoded by member index. + +Requires: + +1. Per group member index (Done). +2. Primitives to work with byte vector (Done). +3. Rework forwarding logic to use relations vector. +4. Rework introductions logic to use relations vector (avoid duplicate introductions). +5. Migration from introductions to vector. + +Migration is 2-stage: + +1. Live migration to accommodate large volume of introductions data, with admin client choosing mode of operation based on presence of relation vector for member. +2. Offline migration of remaining introduction records. Drop mode of operation based on introductions. + +### Forwarding + +When new invitee connects (CON) -> host makes introductions: + +1. For this invitee: set member relations to 'MRIntroduced' for respective members. _**(Take member lock)**_ +2. For pre-members: + - Member has vector: Set relation to 'MRIntroducedTo' for invitee member - N updates. _**(Take member locks/take group lock?)**_ + - No vector: Create introduction record (Transitional mode of operation based on introductions). + +When member reports XGrpMemCon ("connected with another member"), for both reporting and referenced members: + +1. Member has vector: Set relation to 'MRConnected'. _**(Take member lock)**_ +2. No vector: Update introduction record status (Transitional). + +When member sends message -> host forwards: + +1. Member has vector: Get recipients based on sender relations vector ('MRIntroduced' + 'MRIntroducedTo' members). +2. No vector: Get recipients based on introduction records (Transitional), set sender's vector. _**(Take member lock)**_ + - Compiled list of recipients to be marked as introduced; differentiate 'MRIntroduced'/'MRIntroducedTo'? (Complication of splitting introduced into 2 relations). + - Additionally get Connected members, currently they are filtered out as not requiring forward. (It is necessary to make a complete computation of vector in one go, as this member will then be skipped in background updates) + +#### Avoid duplicate forwards + +N updates approach allows us to avoid duplicate forwards: + +- Admin only forwards based on introductions embedded into relations vector: 'MRIntroduced', 'MRIntroducedTo'. + +- Admin doesn't forward to 'MRNew' members. + +Following diagram illustrates that in multi-admin scenario only host of "later" invitee (Bob) will forward messages between his and other admin's invitees. + +```mermaid +sequenceDiagram + participant A as Alice + participant B as Bob + participant C as Cath + +note over A, C: Alice invites and introduces Cath +A <<->> C: invite, CON +A ->> B: announce Cath +A ->> C: introduce Bob +note over A, C: Bob invites and introduces Dan +create participant D as Dan +B <<->> D: invite, CON +B ->> A: announce Dan +B ->> C: announce Dan +B ->> D: introduce Alice, Cath +note over A, B: Vectors (only Dan/Cath relation interests us
    - we want to avoid duplicate forwards) +note left of A: Alice vectors
    For Cath: Dan - MRNew
    For Dan: Cath - MRNew +note right of B: Bob vectors
    For Cath: Dan - MRIntroduced
    For Dan: Cath - MRIntroducedTo +note over A, B: Only Bob forwards between Cath and Dan +C ->> B: x.grp.mem.con (connected to Dan) +D ->> B: or: x.grp.mem.con (connected to Cath)
    (x.grp.mem.con from either is enough) +note right of B: Bob vectors
    For Cath: Dan - MRConnected
    For Dan: Cath - MRConnected +note over A, B: Only Bob forwards between Cath and Dan +``` + +### Avoid duplicate introductions + +Scenario 1. Pending member is accepted to group -> avoid repeat introductions to moderators and above. + +Scenario 2. Two invitees connect to host concurrently -> avoid introductions race. + +Both can be solved by excluding already introduced members: +- Member (new invitee) has vector: filter out 'MRIntroduced', 'MRIntroducedTo' members from list of members to introduce. +- No vector: filter out based on introduction records (Transitional; `introduceToRemaining` + restore `checkInverseIntro` logic). + +### Live migration (Stage 1) + +Background process to set members' vectors based on introductions. + +Goes over members with NULL relation vector. Logic to determine relations is same as when setting sender's vector on forwarding. The latter is optimization -> faster migration of hot paths. _**(Take member locks)**_ + +TBC report when done - for directory service. Or we can track remaining member records with NULL vector. + +### Offline migration (Stage 2) + +TBC SQL to set relations vectors based on remaining introductions records. + +### Other considerations + +#### 1. Introductions race - missed introductions + +We may have identified race where some pairs of members may never become introduced to each other. It can occur if 2 hosts concurrently invite (announce) and introduce their respective invitees based to their respective local member lists. + +Consider such timeline: + + 1. Admin 1 invites Invitee 1. + + Invitee 1 connects to Admin 1 (CON). + + Admin 1 announces (x.grp.mem.new) Invitee 1 and introduces him to known members (Admin 1 hasn't seen Invitee 2). + + 2. Admin 2 invites Invitee 2. + + Invitee 2 connects to Admin 2 (CON). + + _Consider following scenario: Admin 2 hasn't received x.grp.mem.new for Invitee 1 from Admin 1._ Admin 2 announces (x.grp.mem.new) Invitee 2 and introduces him to known members (Admin 2 hasn't seen Invitee 1). + + 3. Both admins receive (with delay) opposite x.grp.mem.new -> both admins already made introductions before and consider opposite admin would introduce "new" member to their "older" invitee. + +This is status quo, this work will not improve it. + +We will revert change of admins making decision of introductions lists based purely on member index, which may have made such race more likely. Instead they will determine introductions lists as following: all current members minus already introduced members (see "Avoid duplicate introductions" section). + +#### 2. Double x.grp.mem.con notifications + +As alternative to N updates for introduced members, we considered redundant forwarding in multi-admin scenario and modifying user clients (2-stage release) to send x.grp.mem.con notifications to both own host and host of connected member. + +Not symmetrical: a "later" invitee doesn't know which member is the host of an "earlier" invitee. diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs index 5c4251cc55..bf5308bcfd 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs +++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs @@ -5,43 +5,6 @@ module Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector wh import Database.SQLite.Simple (Query) import Database.SQLite.Simple.QQ (sql) --- to do list: --- - directory migration --- - background process to set member_relations_vector based on group_member_intros --- - also set member_relations_vector on forward (recipient list for sender is known there) --- - take member locks when updating member_relations_vector --- - for duration of migration forwarding operates in 2 modes simultaneously: --- - if member_relations_vector is set, use it --- - otherwise, use existing logic based on group_member_intros --- - new invitees start with member_relations_vector = 0 for all existing (pre) members -> --- member_relations_vector immediately can be used when new invitee sends --- - pre members are not updated right away for new invitee, if their member_relations_vector is not set yet, --- as it will be costly to update them all at once; instead it will be set once background process processes them; --- also this means group_member_intros have to be maintained for them until then --- - GroupMember.memberStatusVector is Maybe to make this differentiation --- - user clients migration --- - once directory service migrates to new state, member_relations_vector can be updated in db migration --- as user clients wouldn't have as large group_member_intros --- - TBC migration SQL --- - alternative approach for member_relations_vector migration (both directory and user clients): --- - set to 0 for all existing members right away in sql migration --- (possibly limit to groups where user is admin or above, otherwise NULL) --- - means that initially after migration new messages will be forwarded to all members, --- however they will quickly report connected state via XGrpMemCon -> member_relations_vector will self-adjust --- - allows for simple migration path, with immediate switch from group_member_intros, --- avoids complexity of dual-mode forwarding during migration for directory / complex sql migration for user clients --- - rework forwarding logic to use member_relations_vector: --- - create new members with correct index_in_group = group's member_index + 1, --- maintain groups.member_index --- - when new invitee joins, set member_relations_vector to all 0 for them, update for pre members (set 0 for invitee's seq id) --- - on XGrpMemCon update bitvectors for sender and referenced member (set 1 for corresponding seq ids) --- - don't maintain group_member_intros (don't create, update status) --- - on forwarding, get recipients based on sender's member_relations_vector --- - for all 0s in bitvector, get members by index_in_group in corresponding positions --- - second use of group_member_intros is targeted introductions of knocking member to "remaining" members --- - has to be reworked to not rely on group_member_intros --- - set MRIntroduced status in member relations vector on first introduction, --- exclude previously introduced members on second introduction m20251117_member_relations_vector :: Query m20251117_member_relations_vector = [sql| From efbc4835a8e64ae85fb11cc0d38bff4f0fcab2f4 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Tue, 25 Nov 2025 10:06:40 +0000 Subject: [PATCH 13/32] tests: skip multicast discovery in Mac CI (#6458) * tests: skip multicast discovery in Mac CI * tests: remove unneeded xitMacCI'' --- tests/ChatTests/Utils.hs | 3 +++ tests/RemoteTests.hs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs index dfb0aece74..778ddec72f 100644 --- a/tests/ChatTests/Utils.hs +++ b/tests/ChatTests/Utils.hs @@ -93,6 +93,9 @@ xit' = if os == "linux" then xit else it xit'' :: (HasCallStack, Example a) => String -> a -> SpecWith (Arg a) xit'' = ifCI xit Hspec.it +xitMacCI :: HasCallStack => String -> (TestParams -> Expectation) -> SpecWith (Arg (TestParams -> Expectation)) +xitMacCI = ifCI (if os == "darwin" then xit else it) it + xdescribe'' :: HasCallStack => String -> SpecWith a -> SpecWith a xdescribe'' = ifCI xdescribe describe diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs index e21f97d69e..9790681f3b 100644 --- a/tests/RemoteTests.hs +++ b/tests/RemoteTests.hs @@ -33,7 +33,7 @@ remoteTests = describe "Remote" $ do it "connects with new pairing (stops mobile)" $ remoteHandshakeTest False it "connects with new pairing (stops desktop)" $ remoteHandshakeTest True it "connects with stored pairing" remoteHandshakeStoredTest - it "connects with multicast discovery" remoteHandshakeDiscoverTest + xitMacCI "connects with multicast discovery" remoteHandshakeDiscoverTest it "refuses invalid client cert" remoteHandshakeRejectTest it "connects with stored server bindings" storedBindingsTest it "sends messages" remoteMessageTest From 5e160298410b87975b194163d843d18e7360cecd Mon Sep 17 00:00:00 2001 From: Evgeny Date: Tue, 25 Nov 2025 15:49:33 +0000 Subject: [PATCH 14/32] ios: reduce memory used by iOS share extension (#6465) --- apps/ios/SimpleX SE/ShareAPI.swift | 38 +++++++++++++++++++++++++--- apps/ios/SimpleX SE/ShareModel.swift | 12 ++++----- apps/ios/SimpleXChat/ChatUtils.swift | 4 +-- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/apps/ios/SimpleX SE/ShareAPI.swift b/apps/ios/SimpleX SE/ShareAPI.swift index 4dad9d5d15..6495d09b03 100644 --- a/apps/ios/SimpleX SE/ShareAPI.swift +++ b/apps/ios/SimpleX SE/ShareAPI.swift @@ -48,7 +48,7 @@ func apiSetEncryptLocalFiles(_ enable: Bool) throws { throw r.unexpected } -func apiGetChats(userId: User.ID) throws -> Array { +func apiGetChats(userId: User.ID) throws -> Array { let r: APIResult = sendSimpleXCmd(SEChatCommand.apiGetChats(userId: userId)) if case let .result(.apiChats(user: _, chats: chats)) = r { return chats } throw r.unexpected @@ -170,7 +170,7 @@ enum SEChatResponse: Decodable, ChatAPIResult { case activeUser(user: User) case chatStarted case chatRunning - case apiChats(user: UserRef, chats: [ChatData]) + case apiChats(user: UserRef, chats: [SEChatData]) case newChatItems(user: UserRef, chatItems: [AChatItem]) case cmdOk(user_: UserRef?) @@ -199,7 +199,7 @@ enum SEChatResponse: Decodable, ChatAPIResult { } static func fallbackResult(_ type: String, _ json: NSDictionary) -> SEChatResponse? { - if type == "apiChats", let r = parseApiChats(json) { + if type == "apiChats", let r = seParseApiChats(json) { .apiChats(user: r.user, chats: r.chats) } else { nil @@ -239,3 +239,35 @@ enum SEChatEvent: Decodable, ChatAPIResult { } } } + +public struct SEChatData: Decodable, Identifiable, Hashable, ChatLike { + public var chatInfo: ChatInfo + + public var id: ChatId { get { chatInfo.id } } + + public init(chatInfo: ChatInfo) { + self.chatInfo = chatInfo + } + + public static func invalidJSON(_ json: Data?) -> SEChatData { + SEChatData(chatInfo: .invalidJSON(json: json)) + } +} + +public func seParseApiChats(_ jResp: NSDictionary) -> (user: UserRef, chats: [SEChatData])? { + if let jApiChats = jResp["apiChats"] as? NSDictionary, + let user: UserRef = try? decodeObject(jApiChats["user"] as Any), + let jChats = jApiChats["chats"] as? NSArray { + let chats: [SEChatData] = jChats.map { jChat in + if let jChatDict = jChat as? NSDictionary, + let jChatInfo = jChatDict["chatInfo"], + let chatInfo: ChatInfo = try? decodeObject(jChatInfo) { + return SEChatData(chatInfo: chatInfo) + } + return SEChatData.invalidJSON(serializeJSON(jChat, options: .prettyPrinted)) + } + return (user, chats) + } else { + return nil + } +} diff --git a/apps/ios/SimpleX SE/ShareModel.swift b/apps/ios/SimpleX SE/ShareModel.swift index 5080cf2040..fd5c4c990f 100644 --- a/apps/ios/SimpleX SE/ShareModel.swift +++ b/apps/ios/SimpleX SE/ShareModel.swift @@ -19,11 +19,11 @@ private let MAX_DOWNSAMPLE_SIZE: Int64 = 2000 class ShareModel: ObservableObject { @Published var sharedContent: SharedContent? - @Published var chats: [ChatData] = [] + @Published var chats: [SEChatData] = [] @Published var profileImages: [ChatInfo.ID: UIImage] = [:] @Published var search = "" @Published var comment = "" - @Published var selected: ChatData? + @Published var selected: SEChatData? @Published var isLoaded = false @Published var bottomBar: BottomBar = .loadingSpinner @Published var errorAlert: ErrorAlert? @@ -60,13 +60,13 @@ class ShareModel: ObservableObject { } } - func isProhibited(_ chat: ChatData?) -> Bool { + func isProhibited(_ chat: SEChatData?) -> Bool { if let chat, let sharedContent { sharedContent.prohibited(in: chat, hasSimplexLink: hasSimplexLink) } else { false } } - var filteredChats: [ChatData] { + var filteredChats: [SEChatData] { search.isEmpty ? filterChatsToForwardTo(chats: chats) : filterChatsToForwardTo(chats: chats) @@ -253,7 +253,7 @@ class ShareModel: ObservableObject { } } - private func fetchChats() -> Result, ErrorAlert> { + private func fetchChats() -> Result, ErrorAlert> { do { guard let user = try apiGetActiveUser() else { return .failure( @@ -396,7 +396,7 @@ enum SharedContent { } } - func prohibited(in chatData: ChatData, hasSimplexLink: Bool) -> Bool { + func prohibited(in chatData: SEChatData, hasSimplexLink: Bool) -> Bool { chatData.prohibitedByPref( hasSimplexLink: hasSimplexLink, isMediaOrFileAttachment: cryptoFile != nil, diff --git a/apps/ios/SimpleXChat/ChatUtils.swift b/apps/ios/SimpleXChat/ChatUtils.swift index 98ee9cd5d4..451ac8b4ef 100644 --- a/apps/ios/SimpleXChat/ChatUtils.swift +++ b/apps/ios/SimpleXChat/ChatUtils.swift @@ -9,9 +9,7 @@ import Foundation public protocol ChatLike { - var chatInfo: ChatInfo { get} - var chatItems: [ChatItem] { get } - var chatStats: ChatStats { get } + var chatInfo: ChatInfo { get } } extension ChatLike { From 4827e6c736fc00259668b64d117630543c63d97e Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Thu, 27 Nov 2025 00:35:12 +0000 Subject: [PATCH 15/32] website: update donations page --- docs/DONATIONS.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/DONATIONS.md b/docs/DONATIONS.md index 3fdf362021..be8010eef2 100644 --- a/docs/DONATIONS.md +++ b/docs/DONATIONS.md @@ -19,7 +19,7 @@ Please donate via: - BTC: [bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u](bitcoin:bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u) - XMR: [8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt](monero:8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt) - BCH: [qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg](bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg) -- ETH/USDT (Ethereum, Arbitrum One): [0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a) +- ETH/USDT (Ethereum, Arbitrum One): [0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a) ([donate.simplexchat.eth](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a)) - ZEC: [t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg](zcash:t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg) - ZEC shielded: [u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq](zcash:u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq) - DOGE: [D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf](dogecoin:D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf) @@ -30,3 +30,7 @@ Thank you, Evgeny SimpleX Chat founder + +## SimpleX Community Vouchers + +Please comment on our plan to make SimpleX network sustainable and get a free access pass (an NFT) for early testing: https://simplex.chat/vouchers From 3691bf9e67ec1ed6ab7f1675ffeae4c9754418e4 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Thu, 27 Nov 2025 23:36:04 +0000 Subject: [PATCH 16/32] website: update donations page --- docs/DONATIONS.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/DONATIONS.md b/docs/DONATIONS.md index be8010eef2..276a57ed8a 100644 --- a/docs/DONATIONS.md +++ b/docs/DONATIONS.md @@ -15,21 +15,15 @@ Your donations help us raise more funds - any amount, even the price of the cup Please donate via: -- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission). +- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission) - BTC: [bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u](bitcoin:bc1q2gy6f02nn6vvcxs0pnu29tpnpyz0qf66505d4u) - XMR: [8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt](monero:8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt) -- BCH: [qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg](bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg) - ETH/USDT (Ethereum, Arbitrum One): [0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a) ([donate.simplexchat.eth](ethereum:0xD7047Fe3Eecb2f2FF78d839dD927Be27Bc12c86a)) -- ZEC: [t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg](zcash:t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg) -- ZEC shielded: [u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq](zcash:u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq) -- DOGE: [D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf](dogecoin:D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf) -- SOL: [7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu](solana:7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu) +- [Other cryptocurrencies](https://github.com/simplex-chat/simplex-chat#please-support-us-with-your-donations) Thank you, -Evgeny - -SimpleX Chat founder +Evgeny, SimpleX Chat founder ## SimpleX Community Vouchers From f5896d6ac51baab1469dffd3ad74ada7fb568217 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Sat, 29 Nov 2025 22:59:58 +0000 Subject: [PATCH 17/32] website: update jobs --- docs/JOIN_TEAM.md | 54 +++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/docs/JOIN_TEAM.md b/docs/JOIN_TEAM.md index 2e428409df..edf3ba199b 100644 --- a/docs/JOIN_TEAM.md +++ b/docs/JOIN_TEAM.md @@ -6,31 +6,49 @@ layout: layouts/jobs.html # Join SimpleX Chat team -SimpleX Chat is a seed stage startup with a lot of user growth in 2022-2025, and a lot of exciting technical and product problems to solve to grow faster. - -We currently have 4 people in the team. - -We are looking for passionate and creative people to help us! +Join SimpleX Chat team to build the future of secure, private, and decentralized communications. ## Who we are looking for -### Mobile application developer +### iOS Engineer -You: -- created mobile applications for Android platforms as **your own full-time or side projects**, -- expertise with Android APIs, Kotlin and JetPack Compose framework, -- [a good taste](https://paulgraham.com/taste.html) for mobile apps design would be a bonus. +We are looking for an entrepreneurial iOS engineer. -It is not a full time job yet, we have some specific problems to solve in the Android app. If we are happy working together it is likely to evolve into a full-time job offer in 2026. +Please send your exceptional achievements related to iOS (created in your own free time, or via grants, or startups you co-founded, but not as part of employment or contract): +- popular iOS open-source libraries or frameworks. +- iOS apps you developed on your own or as part of 2-people team. +- technical publications about iOS engineering. -Please ONLY apply if you created and released your own apps (not as a job or contract for somebody else). +This is a full-time remote contract. You must be in UTC +/- 8 hours timezone. + +### Application Engineer + +We are looking for an entrepreneurial Android/Desktop applications engineer with an advanced expertise in: +- Kotlin Multiplatform. +- Jetpack Compose and JVM development. +- desktop applications for Linux, Mac and Windows. +- advanced knowledge of C/C++, Java, JavaScript and some other programming languages. + +Please send your exceptional engineering achievements (created in your own free time, or via grants, or startups you co-founded, but not as part of employment or contract): +- popular open-source libraries, frameworks or applications. +- apps you developed on your own or as part of 2-3 people team. +- technical publications about engineering. + +This is a full-time remote contract. You must be in UTC +/- 8 hours timezone. + +

    Community Builder

    + +We are looking for an entrepreneurial Community Builder and Marketer, with successful crowdfunding experience. + +Please send your exceptional achievements related to community building, social media marketing, or crowdfunding (created in your free time or in startups you co-founded, but not as part of contract or employment): +- large, active online communities, social media accounts, podcasts, or YouTube channels. +- successful crowdfunding campaigns that raised significant funds. +- high-profile publications, interviews, or viral content pieces. + +This is a part-time remote contract. You must be in UTC +/- 8 hours timezone. ## How to join the team -1. [Install the app](https://github.com/simplex-chat/simplex-chat#install-the-app), try using it with the friends and [join some user groups](https://github.com/simplex-chat/simplex-chat#join-user-groups) – you will discover a lot of things that need improvements. +To apply, please [install SimpleX Chat app](./DOWNLOADS.md) and send your achievements to this [SimpleX address](https://smp16.simplex.im/a#OGL3qf7utOrUERFoFOROgdQaAkj_znzoeACNKDAsFNA). -2. Also look through [GitHub issues](https://github.com/simplex-chat/simplex-chat/issues) submitted by the users to see what would you want to contribute as a test. - -3. [Connect to us](https://smp4.simplex.im/a#IWCurmcnKDvfOzGrQdqlXjKinqkvO10a2q__nWBVG6c) via SimpleX Chat to chat about what you want to contribute and about joining the team. - -4. You can also email [jobs@simplex.chat](mailto:jobs@simplex.chat?subject=Join%20SimpleX%20Chat%20team) +**We do NOT review CVs at the initial stage, please only send the links to your achievements**. From 8ff0ccf3922c8ecdd054bef9a8abba1aa2cf1582 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Mon, 1 Dec 2025 10:13:18 +0000 Subject: [PATCH 18/32] ci: build simplex-chat CLI deb package (#6474) * ci: build simplex-chat CLI deb package * scripts/build-cli-deb: reproducible size (also actual file size) * scripts/build-cli-deb: fix epoch * scripts/build-cli-deb: set epoch to 1764547200 --- .github/workflows/build.yml | 40 ++++++++++++++++++++++++++++---- scripts/desktop/build-cli-deb.sh | 37 +++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 5 deletions(-) create mode 100755 scripts/desktop/build-cli-deb.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fc1c18fe1..04c70546fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,16 @@ jobs: done strip /out/simplex-chat + - name: Build CLI deb + if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true + shell: docker exec -t builder sh -eu {0} + run: | + version=${{ github.ref }} + version=${version#refs/tags/v} + version=${version%-*} + + ./scripts/desktop/build-cli-deb.sh "$version" + - name: Copy tests from container if: matrix.should_run == true shell: bash @@ -232,21 +242,41 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true shell: bash run: | - docker cp builder:/out/simplex-chat ./simplex-chat-ubuntu-${{ matrix.os_underscore }}-${{ matrix.arch }} - path="${{ github.workspace }}/simplex-chat-ubuntu-${{ matrix.os_underscore }}-${{ matrix.arch }}" - echo "bin_path=$path" >> $GITHUB_OUTPUT - echo "bin_hash=$(echo SHA2-256\(simplex-chat-ubuntu-${{ matrix.os_underscore }}-${{ matrix.arch }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT + cli_name="simplex-chat-ubuntu-${{ matrix.os_underscore }}-${{ matrix.arch }}" + cli_deb_name="${cli_name}.deb" + cli_path="${{ github.workspace }}" + + docker cp builder:/out/simplex-chat "./${cli_name}" + docker cp builder:/out/deb-build/simplex-chat.deb "./${cli_deb_name}" + + echo "bin_name=${cli_name}" >> $GITHUB_OUTPUT + echo "bin_path=${cli_path}/${cli_name}" >> $GITHUB_OUTPUT + echo "bin_hash=$(echo SHA2-256\(${cli_name}\)= $(openssl sha256 "${cli_path}/${cli_name}" | cut -d' ' -f 2))" >> $GITHUB_OUTPUT + + echo "deb_name=${cli_deb_name}" >> $GITHUB_OUTPUT + echo "deb_path=${cli_path}/${cli_deb_name}" >> $GITHUB_OUTPUT + echo "deb_hash=$(echo SHA2-256\(${cli_deb_name}\)= $(openssl sha256 "${cli_path}/${cli_deb_name}" | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - name: Upload CLI if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true uses: ./.github/actions/prepare-release with: + bin_name: ${{ steps.linux_cli_prepare.outputs.bin_name }} bin_path: ${{ steps.linux_cli_prepare.outputs.bin_path }} - bin_name: simplex-chat-ubuntu-${{ matrix.os_underscore }}-${{ matrix.arch }} bin_hash: ${{ steps.linux_cli_prepare.outputs.bin_hash }} github_ref: ${{ github.ref }} github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Upload CLI deb + if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true + uses: ./.github/actions/prepare-release + with: + bin_name: ${{ steps.linux_cli_prepare.outputs.deb_name }} + bin_path: ${{ steps.linux_cli_prepare.outputs.deb_path }} + bin_hash: ${{ steps.linux_cli_prepare.outputs.deb_hash }} + github_ref: ${{ github.ref }} + github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Build Desktop if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true shell: docker exec -t builder sh -eu {0} diff --git a/scripts/desktop/build-cli-deb.sh b/scripts/desktop/build-cli-deb.sh new file mode 100755 index 0000000000..7422520d71 --- /dev/null +++ b/scripts/desktop/build-cli-deb.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env sh +set -eu + +export SOURCE_DATE_EPOCH=1764547200 + +CLI_VERSION="$1" +CLI_PATH_TO_BIN="${2:-/out/simplex-chat}" +BUILD_FOLDER="${3:-/out/deb-build}" + +size=$(stat -c '%s' "$CLI_PATH_TO_BIN" | awk '{printf "%.0f\n", ($1+1023)/1024}') +arch=$(case "$(uname -m)" in x86_64) printf "amd64" ;; aarch64) printf "arm64" ;; *) printf "unknown" ;; esac) +package='simplex-chat' + +mkdir "$BUILD_FOLDER" +cd "$BUILD_FOLDER" + +mkdir -p ./${package}/DEBIAN +mkdir -p ./${package}/usr/bin +cat > ./${package}/DEBIAN/control << EOF +Package: ${package} +Version: ${CLI_VERSION} +Section: Messenger +Priority: optional +Architecture: ${arch} +Maintainer: SimpleX Chat +Description: SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design! (CLI) +Installed-Size: ${size} +EOF + +cp "$CLI_PATH_TO_BIN" ./${package}/usr/bin/simplex-chat +chmod +x ./${package}/usr/bin/simplex-chat + +find ./${package} -exec touch -d "@${SOURCE_DATE_EPOCH}" {} + + +dpkg-deb --build --root-owner-group --uniform-compression ./${package} + +strip-nondeterminism "./${package}.deb" From 702f198566bc9a0bdada26eda5fccf580af3df8b Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Tue, 2 Dec 2025 11:33:30 +0000 Subject: [PATCH 19/32] ci: add cli deb and fix formatting to reproducible-builds (#6483) * scripts/reproducible-builds: add cli deb and fix formatting * scripts/reproducible-builds: properly strip v from tag --- scripts/simplex-chat-reproduce-builds.sh | 216 ++++++++++++----------- 1 file changed, 117 insertions(+), 99 deletions(-) diff --git a/scripts/simplex-chat-reproduce-builds.sh b/scripts/simplex-chat-reproduce-builds.sh index c7d9170c4a..e1a62dc73a 100755 --- a/scripts/simplex-chat-reproduce-builds.sh +++ b/scripts/simplex-chat-reproduce-builds.sh @@ -20,115 +20,133 @@ package direct-sqlcipher export DOCKER_BUILDKIT=1 +version=${TAG#v} +version=${version%-*} + cleanup() { - docker exec -t "${container_name}" sh -c 'rm -rf ./dist-newstyle ./apps' 2>/dev/null || : - rm -rf -- "${tempdir}" - docker rm --force "${container_name}" 2>/dev/null || : - docker image rm "${image_name}" 2>/dev/null || : - cd "${init_dir}" + docker exec -t "${container_name}" sh -c 'rm -rf ./dist-newstyle ./apps' 2>/dev/null || : + rm -rf -- "${tempdir}" + docker rm --force "${container_name}" 2>/dev/null || : + docker image rm "${image_name}" 2>/dev/null || : + cd "${init_dir}" } trap 'cleanup' EXIT INT mkdir -p "${init_dir}/${TAG}-${repo_name}/from-source" "${init_dir}/${TAG}-${repo_name}/prebuilt" git -C "${tempdir}" clone "${repo}.git" &&\ - cd "${tempdir}/${repo_name}" &&\ - git checkout "${TAG}" + cd "${tempdir}/${repo_name}" &&\ + git checkout "${TAG}" for os in '22.04' '24.04'; do - os_url="$(printf '%s' "${os}" | tr '.' '_')" + os_url="$(printf '%s' "${os}" | tr '.' '_')" - cli_name="simplex-chat-ubuntu-${os_url}-x86_64" - deb_name="simplex-desktop-ubuntu-${os_url}-x86_64.deb" - appimage_name="simplex-desktop-x86_64.AppImage" + cli_name="simplex-chat-ubuntu-${os_url}-x86_64" + deb_name="simplex-desktop-ubuntu-${os_url}-x86_64.deb" + appimage_name="simplex-desktop-x86_64.AppImage" - # Build image - docker build \ - --no-cache \ - --build-arg TAG="${os}" \ - --build-arg GHC="${ghc}" \ - -f "${tempdir}/${repo_name}/Dockerfile.build" \ - -t "${image_name}" \ - . + # Build image + docker build \ + --no-cache \ + --build-arg TAG="${os}" \ + --build-arg GHC="${ghc}" \ + -f "${tempdir}/${repo_name}/Dockerfile.build" \ + -t "${image_name}" \ + . - printf '%s' "${cabal_local}" > "${tempdir}/${repo_name}/cabal.project.local" + printf '%s' "${cabal_local}" > "${tempdir}/${repo_name}/cabal.project.local" - # Run container in background - docker run -t -d \ - --name "${container_name}" \ - --device /dev/fuse \ - --cap-add SYS_ADMIN \ - --security-opt apparmor:unconfined \ - -v "${tempdir}/${repo_name}:/project" \ - "${image_name}" + # Run container in background + docker run -t -d \ + --name "${container_name}" \ + --device /dev/fuse \ + --cap-add SYS_ADMIN \ + --security-opt apparmor:unconfined \ + -v "${tempdir}/${repo_name}:/project" \ + "${image_name}" - # Consistent permissions - docker exec \ - -t "${container_name}" \ - sh -c 'find /project -type d -exec chmod 755 {} \; ; find /project -type f -perm /111 -exec chmod 755 {} \; ; find /project -type f ! -perm /111 -exec chmod 644 {} \;' + # Consistent permissions + docker exec \ + -t "${container_name}" \ + sh -c 'find /project -type d -exec chmod 755 {} \; ; find /project -type f -perm /111 -exec chmod 755 {} \; ; find /project -type f ! -perm /111 -exec chmod 644 {} \;' - # CLI - docker exec \ - -t "${container_name}" \ - sh -c 'cabal clean && cabal update && cabal build -j && mkdir -p /out && for i in simplex-chat; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable) && chmod +x "$bin" && mv "$bin" /out/; done && strip /out/simplex-chat' + # CLI + docker exec \ + -t "${container_name}" \ + sh -c 'cabal clean && cabal update && cabal build -j && mkdir -p /out && for i in simplex-chat; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable) && chmod +x "$bin" && mv "$bin" /out/; done && strip /out/simplex-chat' - # Copy CLI - docker cp \ - "${container_name}":/out/simplex-chat \ - "${init_dir}/${TAG}-${repo_name}/from-source/${cli_name}" + # Copy CLI + docker cp \ + "${container_name}":/out/simplex-chat \ + "${init_dir}/${TAG}-${repo_name}/from-source/${cli_name}" - # Download prebuilt CLI binary - curl -L \ - --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ - -O "${repo}/releases/download/${TAG}/${cli_name}" + # Download prebuilt CLI binary + curl -L \ + --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ + -O "${repo}/releases/download/${TAG}/${cli_name}" - # Desktop: deb - docker exec \ - -t "${container_name}" \ - sh -c './scripts/desktop/make-deb-linux.sh' + # CLI: deb + docker exec \ + -t "${container_name}" \ + sh -c "./scripts/desktop/build-cli-deb.sh ${version}" - # Copy deb - docker cp \ - "${container_name}":/project/apps/multiplatform/release/main/deb/simplex_x86_64.deb \ - "${init_dir}/${TAG}-${repo_name}/from-source/${deb_name}" + # Copy CLI: deb + docker cp \ + "${container_name}":/out/deb-build/simplex-chat.deb \ + "${init_dir}/${TAG}-${repo_name}/from-source/${cli_name}.deb" - # Download prebuilt deb package - curl -L \ - --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ - -O "${repo}/releases/download/${TAG}/${deb_name}" + # Download prebuilt CLI: deb binary + curl -L \ + --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ + -O "${repo}/releases/download/${TAG}/${cli_name}.deb" - # Desktop: appimage. Build only on 22.04 - case "$os" in - 22.04) - # Appimage - docker exec \ - -t "${container_name}" \ - sh -c './scripts/desktop/make-appimage-linux.sh && mv ./apps/multiplatform/release/main/*imple*.AppImage ./apps/multiplatform/release/main/simplex.appimage' + # Desktop: deb + docker exec \ + -t "${container_name}" \ + sh -c './scripts/desktop/make-deb-linux.sh' - # Copy appimage - docker cp \ - "${container_name}":/project/apps/multiplatform/release/main/simplex.appimage \ - "${init_dir}/${TAG}-${repo_name}/from-source/${appimage_name}" + # Copy deb + docker cp \ + "${container_name}":/project/apps/multiplatform/release/main/deb/simplex_x86_64.deb \ + "${init_dir}/${TAG}-${repo_name}/from-source/${deb_name}" - # Download prebuilt appimage binary - curl -L \ - --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ - -O "${repo}/releases/download/${TAG}/${appimage_name}" - ;; - esac - - # Important! Remove dist-newstyle for the next interation - docker exec \ - -t "${container_name}" \ - sh -c 'rm -rf ./dist-newstyle ./apps/multiplatform' + # Download prebuilt deb package + curl -L \ + --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ + -O "${repo}/releases/download/${TAG}/${deb_name}" - # Also restore git to previous state - git reset --hard && git clean -dfx + # Desktop: appimage. Build only on 22.04 + case "$os" in + 22.04) + # Appimage + docker exec \ + -t "${container_name}" \ + sh -c './scripts/desktop/make-appimage-linux.sh && mv ./apps/multiplatform/release/main/*imple*.AppImage ./apps/multiplatform/release/main/simplex.appimage' - # Stop containers, delete images - docker stop "${container_name}" - docker rm --force "${container_name}" - docker image rm "${image_name}" + # Copy appimage + docker cp \ + "${container_name}":/project/apps/multiplatform/release/main/simplex.appimage \ + "${init_dir}/${TAG}-${repo_name}/from-source/${appimage_name}" + + # Download prebuilt appimage binary + curl -L \ + --output-dir "${init_dir}/${TAG}-${repo_name}/prebuilt/" \ + -O "${repo}/releases/download/${TAG}/${appimage_name}" + ;; + esac + + # Important! Remove dist-newstyle for the next interation + docker exec \ + -t "${container_name}" \ + sh -c 'rm -rf ./dist-newstyle ./apps/multiplatform' + + # Also restore git to previous state + git reset --hard && git clean -dfx + + # Stop containers, delete images + docker stop "${container_name}" + docker rm --force "${container_name}" + docker image rm "${image_name}" done # Cleanup @@ -145,27 +163,27 @@ bad=0 # Check hashes for all binaries for file in "${path_bin}"/from-source/*; do - # Extract binary name - app="$(basename ${file})" + # Extract binary name + app="$(basename ${file})" - # Compute hash for compiled binary - compiled=$(sha256sum "${path_bin}/from-source/${app}" | awk '{print $1}') - # Compute hash for prebuilt binary - prebuilt=$(sha256sum "${path_bin}/prebuilt/${app}" | awk '{print $1}') + # Compute hash for compiled binary + compiled=$(sha256sum "${path_bin}/from-source/${app}" | awk '{print $1}') + # Compute hash for prebuilt binary + prebuilt=$(sha256sum "${path_bin}/prebuilt/${app}" | awk '{print $1}') - # Compare - if [ "${compiled}" != "${prebuilt}" ]; then - # If hashes doesn't match, set bad... - bad=1 + # Compare + if [ "${compiled}" != "${prebuilt}" ]; then + # If hashes doesn't match, set bad... + bad=1 - # ... and print affected binary - printf "%s - sha256sum hash doesn't match\n" "${app}" - fi + # ... and print affected binary + printf "%s - sha256sum hash doesn't match\n" "${app}" + fi done # If everything is still okay, compute checksums file if [ "${bad}" = 0 ]; then - sha256sum "${path_bin}"/from-source/* | sed -e "s|$PWD/||g" -e 's|from-source/||g' -e "s|-$repo_name||g" > "${path_bin}/_sha256sums" + sha256sum "${path_bin}"/from-source/* | sed -e "s|$PWD/||g" -e 's|from-source/||g' -e "s|-$repo_name||g" > "${path_bin}/_sha256sums" - printf 'Checksums computed - %s\n' "${path_bin}/_sha256sums" + printf 'Checksums computed - %s\n' "${path_bin}/_sha256sums" fi From 2ed76fd3867c0962c7b2518b5a4191933eda15f2 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Wed, 3 Dec 2025 11:16:37 +0000 Subject: [PATCH 20/32] ci: execute reproducible script from tag (#6485) * ci: execute reproducible script from tag * ci: target our repository tags --- .github/workflows/reproduce-schedule.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reproduce-schedule.yml b/.github/workflows/reproduce-schedule.yml index 7364976467..0febed4c87 100644 --- a/.github/workflows/reproduce-schedule.yml +++ b/.github/workflows/reproduce-schedule.yml @@ -9,9 +9,6 @@ jobs: reproduce: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Get latest release shell: bash run: | @@ -23,6 +20,12 @@ jobs: grep -i "tag_name" | \ awk -F \" '{print "TAG="$4}' >> $GITHUB_ENV + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ env.TAG }} + repository: simplex-chat/simplex-chat + # Otherwise we run out of disk space with Docker build - name: Free disk space shell: bash From f76e994034934f01b3ed6bafe7eb99021f077f88 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Tue, 9 Dec 2025 14:48:32 +0000 Subject: [PATCH 21/32] core: forward based on relations vector (#6464) * core: forward based on relations vector wip * fix introductions * fix forwarding tests * fix forwarding inside support scope * fix deduplication test * fix more tests * plans, api * live migration wip * enable tests * member locks * api * plans * fix for postgres * fix for postgres * rename predicate * rename predicate * optimize * refactor * fix * check * move part of migration to sql * plans * core: preserve detailed information in relation vectors (#6484) * core: relations vector live migrations; stage 2 migration sql (#6472) * rework forwarding in support scope * move operations inside transactions * set_member_vector_new_relation function * read vector ad-hoc * partition in transaction * fix postgres * postgres schema * api * plans * remove comment * lock before migration computation * refactor * simplify set relations * retreive only support scope members * fix * refactor * fix comment * enable tests * 1 second * for update * locks * fix mask * plans * fix * postgres --------- Co-authored-by: Evgeny Poberezkin --- .../src/Directory/Store/Migrate.hs | 2 +- bots/api/TYPES.md | 14 +- cabal.project | 2 +- .../2025-11-24-member-relations-vector.md | 3 +- .../types/typescript/src/types.ts | 26 +- scripts/nix/sha256map.nix | 2 +- simplex-chat.cabal | 2 + src/Simplex/Chat.hs | 4 +- src/Simplex/Chat/Library/Commands.hs | 22 + src/Simplex/Chat/Library/Internal.hs | 82 +-- src/Simplex/Chat/Library/Subscriber.hs | 129 ++--- src/Simplex/Chat/Mobile.hs | 4 +- src/Simplex/Chat/Options/Postgres.hs | 7 +- src/Simplex/Chat/Options/SQLite.hs | 13 +- src/Simplex/Chat/Store/Delivery.hs | 2 +- src/Simplex/Chat/Store/Groups.hs | 466 +++++++++++------- src/Simplex/Chat/Store/Postgres/Migrations.hs | 2 + .../M20251117_member_relations_vector.hs | 97 ++++ ...0251128_member_relations_vector_stage_2.hs | 45 ++ .../Store/Postgres/Migrations/chat_schema.sql | 74 +++ src/Simplex/Chat/Store/SQLite/Migrations.hs | 2 + .../M20251117_member_relations_vector.hs | 80 +++ ...0251128_member_relations_vector_stage_2.hs | 42 ++ .../SQLite/Migrations/chat_query_plans.txt | 240 +++++---- src/Simplex/Chat/Store/Shared.hs | 4 +- src/Simplex/Chat/Types/MemberRelations.hs | 124 ++++- src/Simplex/Chat/View.hs | 1 - tests/ChatTests/Groups.hs | 54 +- tests/MemberRelationsTests.hs | 201 +++++--- tests/SchemaDump.hs | 11 +- 30 files changed, 1260 insertions(+), 497 deletions(-) create mode 100644 src/Simplex/Chat/Store/Postgres/Migrations/M20251128_member_relations_vector_stage_2.hs create mode 100644 src/Simplex/Chat/Store/SQLite/Migrations/M20251128_member_relations_vector_stage_2.hs diff --git a/apps/simplex-directory-service/src/Directory/Store/Migrate.hs b/apps/simplex-directory-service/src/Directory/Store/Migrate.hs index ad37eba6d7..e22f4ed470 100644 --- a/apps/simplex-directory-service/src/Directory/Store/Migrate.hs +++ b/apps/simplex-directory-service/src/Directory/Store/Migrate.hs @@ -46,7 +46,7 @@ runDirectoryMigrations :: DirectoryOpts -> ChatConfig -> DBStore -> IO () runDirectoryMigrations opts ChatConfig {confirmMigrations} chatStore = migrateDBSchema chatStore - (toDBOpts dbOptions chatSuffix False) + (toDBOpts dbOptions chatSuffix False []) (Just "sx_directory_migrations") directorySchemaMigrations MigrationConfig {confirm, backupPath = Nothing} diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md index 9140f3b164..62c5dff3b5 100644 --- a/bots/api/TYPES.md +++ b/bots/api/TYPES.md @@ -3349,6 +3349,14 @@ GroupMemberNotFound: - type: "groupMemberNotFound" - groupMemberId: int64 +GroupMemberNotFoundByIndex: +- type: "groupMemberNotFoundByIndex" +- groupMemberIndex: int64 + +MemberRelationsVectorNotFound: +- type: "memberRelationsVectorNotFound" +- groupMemberId: int64 + GroupHostMemberNotFound: - type: "groupHostMemberNotFound" - groupId: int64 @@ -3361,6 +3369,9 @@ MemberContactGroupMemberNotFound: - type: "memberContactGroupMemberNotFound" - contactId: int64 +InvalidMemberRelationUpdate: +- type: "invalidMemberRelationUpdate" + GroupWithoutUser: - type: "groupWithoutUser" @@ -3447,9 +3458,6 @@ PendingConnectionNotFound: - type: "pendingConnectionNotFound" - connId: int64 -IntroNotFound: -- type: "introNotFound" - UniqueID: - type: "uniqueID" diff --git a/cabal.project b/cabal.project index df5ac1ba24..9f8d821a2e 100644 --- a/cabal.project +++ b/cabal.project @@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 3016b929b48d3116f8ee60169c06383ca57f78e0 + tag: 92a9579e6958026e42a45e32c0e62fca243b4b0f source-repository-package type: git diff --git a/docs/rfcs/2025-11-24-member-relations-vector.md b/docs/rfcs/2025-11-24-member-relations-vector.md index c4e8cf7224..087541fda3 100644 --- a/docs/rfcs/2025-11-24-member-relations-vector.md +++ b/docs/rfcs/2025-11-24-member-relations-vector.md @@ -72,10 +72,11 @@ note over A, B: Vectors (only Dan/Cath relation interests us
    - we want to avo note left of A: Alice vectors
    For Cath: Dan - MRNew
    For Dan: Cath - MRNew note right of B: Bob vectors
    For Cath: Dan - MRIntroduced
    For Dan: Cath - MRIntroducedTo note over A, B: Only Bob forwards between Cath and Dan +C <<->> D: connect C ->> B: x.grp.mem.con (connected to Dan) D ->> B: or: x.grp.mem.con (connected to Cath)
    (x.grp.mem.con from either is enough) note right of B: Bob vectors
    For Cath: Dan - MRConnected
    For Dan: Cath - MRConnected -note over A, B: Only Bob forwards between Cath and Dan +note over A, B: Bob stops forwarding between Cath and Dan ``` ### Avoid duplicate introductions diff --git a/packages/simplex-chat-client/types/typescript/src/types.ts b/packages/simplex-chat-client/types/typescript/src/types.ts index e67eae39a0..5e3309238b 100644 --- a/packages/simplex-chat-client/types/typescript/src/types.ts +++ b/packages/simplex-chat-client/types/typescript/src/types.ts @@ -3735,9 +3735,12 @@ export type StoreError = | StoreError.GroupNotFoundByName | StoreError.GroupMemberNameNotFound | StoreError.GroupMemberNotFound + | StoreError.GroupMemberNotFoundByIndex + | StoreError.MemberRelationsVectorNotFound | StoreError.GroupHostMemberNotFound | StoreError.GroupMemberNotFoundByMemberId | StoreError.MemberContactGroupMemberNotFound + | StoreError.InvalidMemberRelationUpdate | StoreError.GroupWithoutUser | StoreError.DuplicateGroupMember | StoreError.GroupAlreadyJoined @@ -3761,7 +3764,6 @@ export type StoreError = | StoreError.ConnectionNotFoundById | StoreError.ConnectionNotFoundByMemberId | StoreError.PendingConnectionNotFound - | StoreError.IntroNotFound | StoreError.UniqueID | StoreError.LargeMsg | StoreError.InternalError @@ -3820,9 +3822,12 @@ export namespace StoreError { | "groupNotFoundByName" | "groupMemberNameNotFound" | "groupMemberNotFound" + | "groupMemberNotFoundByIndex" + | "memberRelationsVectorNotFound" | "groupHostMemberNotFound" | "groupMemberNotFoundByMemberId" | "memberContactGroupMemberNotFound" + | "invalidMemberRelationUpdate" | "groupWithoutUser" | "duplicateGroupMember" | "groupAlreadyJoined" @@ -3846,7 +3851,6 @@ export namespace StoreError { | "connectionNotFoundById" | "connectionNotFoundByMemberId" | "pendingConnectionNotFound" - | "introNotFound" | "uniqueID" | "largeMsg" | "internalError" @@ -3988,6 +3992,16 @@ export namespace StoreError { groupMemberId: number // int64 } + export interface GroupMemberNotFoundByIndex extends Interface { + type: "groupMemberNotFoundByIndex" + groupMemberIndex: number // int64 + } + + export interface MemberRelationsVectorNotFound extends Interface { + type: "memberRelationsVectorNotFound" + groupMemberId: number // int64 + } + export interface GroupHostMemberNotFound extends Interface { type: "groupHostMemberNotFound" groupId: number // int64 @@ -4003,6 +4017,10 @@ export namespace StoreError { contactId: number // int64 } + export interface InvalidMemberRelationUpdate extends Interface { + type: "invalidMemberRelationUpdate" + } + export interface GroupWithoutUser extends Interface { type: "groupWithoutUser" } @@ -4112,10 +4130,6 @@ export namespace StoreError { connId: number // int64 } - export interface IntroNotFound extends Interface { - type: "introNotFound" - } - export interface UniqueID extends Interface { type: "uniqueID" } diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 7acb51e97c..406ef76cc5 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."3016b929b48d3116f8ee60169c06383ca57f78e0" = "1gvv96w1ag8xh19an5j50isjw0yq1cbsywii5s1adaplr6fw34mb"; + "https://github.com/simplex-chat/simplexmq.git"."92a9579e6958026e42a45e32c0e62fca243b4b0f" = "0hacyi4hsbca55l4n2n4pcsmsfvh2jaw681j6106y5mkillmb3fv"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl"; diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 24ccf24ded..bc49fc0b45 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -123,6 +123,7 @@ library Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector + Simplex.Chat.Store.Postgres.Migrations.M20251128_member_relations_vector_stage_2 else exposed-modules: Simplex.Chat.Archive @@ -269,6 +270,7 @@ library Simplex.Chat.Store.SQLite.Migrations.M20251007_connections_sync Simplex.Chat.Store.SQLite.Migrations.M20251017_chat_tags_cascade Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector + Simplex.Chat.Store.SQLite.Migrations.M20251128_member_relations_vector_stage_2 other-modules: Paths_simplex_chat hs-source-dirs: diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs index 9b711c2b50..93132fb413 100644 --- a/src/Simplex/Chat.hs +++ b/src/Simplex/Chat.hs @@ -118,8 +118,8 @@ logCfg = LogConfig {lc_file = Nothing, lc_stderr = True} createChatDatabase :: ChatDbOpts -> MigrationConfig -> IO (Either MigrationError ChatDatabase) createChatDatabase chatDbOpts migrationConfig = runExceptT $ do - chatStore <- ExceptT $ createChatStore (toDBOpts chatDbOpts chatSuffix False) migrationConfig - agentStore <- ExceptT $ createAgentStore (toDBOpts chatDbOpts agentSuffix False) migrationConfig + chatStore <- ExceptT $ createChatStore (toDBOpts chatDbOpts chatSuffix False chatDBFunctions) migrationConfig + agentStore <- ExceptT $ createAgentStore (toDBOpts chatDbOpts agentSuffix False []) migrationConfig pure ChatDatabase {chatStore, agentStore} newChatController :: ChatDatabase -> Maybe User -> ChatConfig -> ChatOpts -> Bool -> IO ChatController diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index 630cad4e70..7f4ee238b1 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -167,6 +167,9 @@ startChatController mainApp enableSndFiles = do runExceptT (syncConnections' users) >>= \case Left e -> liftIO $ putStrLn $ "Error synchronizing connections: " <> show e Right _ -> pure () + runExceptT migrateMemberRelations >>= \case + Left e -> liftIO $ putStrLn $ "Error migrating member relations: " <> show e + Right _ -> pure () restoreCalls s <- asks agentAsync readTVarIO s >>= maybe (start s users) (pure . fst) @@ -178,6 +181,10 @@ startChatController mainApp enableSndFiles = do (userDiff, connDiff) <- withAgent (\a -> syncConnections a aUserIds connIds) withFastStore' setConnectionsSyncTs toView $ CEvtConnectionsDiff (AgentUserId <$> userDiff) (AgentConnId <$> connDiff) + migrateMemberRelations = + when mainApp $ + whenM (withStore' hasMembersWithoutVector) $ + void $ forkIO runRelationsVectorMigration start s users = do a1 <- async agentSubscriber a2 <- @@ -4163,6 +4170,21 @@ agentSubscriber = do type AgentSubResult = Map ConnId (Either AgentErrorType (Maybe ClientServiceId)) +runRelationsVectorMigration :: CM () +runRelationsVectorMigration = do + liftIO $ threadDelay' 5000000 -- 5 seconds (initial delay) + migrateMembers + where + stepDelay = 1000000 -- 1 second + migrateMembers = flip catchAllErrors eToView $ do + lift waitChatStartedAndActivated + gmIds <- withStore' getGMsWithoutVectorIds + forM_ gmIds $ \gmId -> do + lift waitChatStartedAndActivated + withStore' (`migrateMemberRelationsVector'` gmId) `catchAllErrors` eToView + liftIO $ threadDelay' stepDelay + unless (null gmIds) migrateMembers + cleanupManager :: CM () cleanupManager = do interval <- asks (cleanupManagerInterval . config) diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 711a24c79e..523224c76d 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -73,6 +73,7 @@ import Simplex.Chat.Store.Messages import Simplex.Chat.Store.Profiles import Simplex.Chat.Store.Shared import Simplex.Chat.Types +import Simplex.Chat.Types.MemberRelations import Simplex.Chat.Types.Preferences import Simplex.Chat.Types.Shared import Simplex.Chat.Util (encryptFile, shuffle) @@ -1024,65 +1025,84 @@ introduceToModerators :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> introduceToModerators vr user gInfo@GroupInfo {groupId} m@GroupMember {memberRole, memberId} = do forM_ (memberConn m) $ \mConn -> do let msg = - if (maxVersion (memberChatVRange m) >= groupKnockingVersion) + if maxVersion (memberChatVRange m) >= groupKnockingVersion then XGrpLinkAcpt GAPendingReview memberRole memberId else XMsgNew $ MCSimple $ extMsgContent (MCText pendingReviewMessage) Nothing void $ sendDirectMemberMessage mConn msg groupId modMs <- withStore' $ \db -> getGroupModerators db vr user gInfo - let rcpModMs = filter (\mem -> memberCurrent mem && maxVersion (memberChatVRange mem) >= groupKnockingVersion) modMs + let rcpModMs = filter shouldIntroduce modMs introduceMember vr user gInfo m rcpModMs (Just $ MSMember $ memberId' m) + where + shouldIntroduce :: GroupMember -> Bool + shouldIntroduce mem = + memberCurrent mem + && groupMemberId' mem /= groupMemberId' m + && maxVersion (memberChatVRange mem) >= groupKnockingVersion introduceToAll :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM () introduceToAll vr user gInfo m = do - members <- withStore' $ \db -> getGroupMembersForIntroduction db vr user gInfo m - let recipients = filter memberCurrent members + members <- withStore' $ \db -> getGroupMembers db vr user gInfo + vector_ <- withStore' (`getMemberRelationsVector_` m) + let recipients = filter (shouldIntroduce vector_) members introduceMember vr user gInfo m recipients Nothing + where + shouldIntroduce :: Maybe ByteString -> GroupMember -> Bool + shouldIntroduce vector_ m' = + memberCurrent m' + && groupMemberId' m' /= groupMemberId' m + && maybe True (\v -> getRelation (indexInGroup m') v == MRNew) vector_ introduceToRemaining :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> CM () introduceToRemaining vr user gInfo m = do - (members, introducedGMIds) <- - withStore' $ \db -> (,) <$> getGroupMembersForIntroduction db vr user gInfo m <*> getIntroducedGroupMemberIds db m - let recipients = filter (introduceMemP introducedGMIds) members + members <- withStore' $ \db -> getGroupMembers db vr user gInfo + vector_ <- withStore' (`getMemberRelationsVector_` m) + recipients <- filterRecipients vector_ members introduceMember vr user gInfo m recipients Nothing where - introduceMemP introducedGMIds mem = - memberCurrent mem - && groupMemberId' mem `notElem` introducedGMIds - && groupMemberId' mem /= groupMemberId' m + filterRecipients :: Maybe ByteString -> [GroupMember] -> CM [GroupMember] + filterRecipients vector_ members = do + newRelation <- case vector_ of + Nothing -> do + introducedGMIds <- S.fromList <$> withStore' (`getIntroducedGroupMemberIds` m) + pure $ \m' -> groupMemberId' m' `S.notMember` introducedGMIds + Just vec -> pure $ \m' -> getRelation (indexInGroup m') vec == MRNew + pure $ filter (\m' -> groupMemberId' m' /= groupMemberId' m && memberCurrent m' && newRelation m') members introduceMember :: VersionRangeChat -> User -> GroupInfo -> GroupMember -> [GroupMember] -> Maybe MsgScope -> CM () introduceMember _ _ _ GroupMember {activeConn = Nothing} _ _ = throwChatError $ CEInternalError "member connection not active" -introduceMember vr user gInfo@GroupInfo {groupId} m@GroupMember {activeConn = Just conn} introduceToMembers msgScope = do - void . sendGroupMessage' user gInfo introduceToMembers $ XGrpMemNew (memberInfo gInfo m) msgScope +introduceMember vr user gInfo@GroupInfo {groupId} toMember@GroupMember {activeConn = Just conn} introduceToMembers msgScope = do + void . sendGroupMessage' user gInfo introduceToMembers $ XGrpMemNew (memberInfo gInfo toMember) msgScope sendIntroductions introduceToMembers where - sendIntroductions members = do - intros <- withStore' $ \db -> createIntroductions db (maxVersion vr) members m - shuffledIntros <- liftIO $ shuffleIntros intros - if m `supportsVersion` batchSendVersion + sendIntroductions reMembers = do + updateToMemberVector reMembers + reMembers' <- withStore' $ \db -> createIntrosOrUpdateVectors db vr reMembers toMember + shuffledReMembers <- liftIO $ shuffleMembers reMembers' + if toMember `supportsVersion` batchSendVersion then do - let events = map (memberIntro . reMember) shuffledIntros + let events = map memberIntro shuffledReMembers forM_ (L.nonEmpty events) $ \events' -> sendGroupMemberMessages user conn events' groupId - else forM_ shuffledIntros $ \intro -> - processIntro intro `catchAllErrors` eToView + else forM_ shuffledReMembers $ \reMember -> + void $ sendDirectMemberMessage conn (memberIntro reMember) groupId + updateToMemberVector :: [GroupMember] -> CM () + updateToMemberVector reMembers = do + let relations = map (\GroupMember {indexInGroup} -> (indexInGroup, (IDReferencedIntroduced, MRIntroduced))) reMembers + withStore' $ \db -> setMemberVectorNewRelations db toMember relations memberIntro :: GroupMember -> ChatMsgEvent 'Json memberIntro reMember = let mInfo = memberInfo gInfo reMember mRestrictions = memberRestrictions reMember in XGrpMemIntro mInfo mRestrictions - shuffleIntros :: [GroupMemberIntro] -> IO [GroupMemberIntro] - shuffleIntros intros = do - let (admins, others) = partition isAdmin intros + shuffleMembers :: [GroupMember] -> IO [GroupMember] + shuffleMembers reMembers = do + let (admins, others) = partition isAdmin reMembers (admPics, admNoPics) = partition hasPicture admins (othPics, othNoPics) = partition hasPicture others mconcat <$> mapM shuffle [admPics, admNoPics, othPics, othNoPics] where - isAdmin GroupMemberIntro {reMember = GroupMember {memberRole}} = memberRole >= GRAdmin - hasPicture GroupMemberIntro {reMember = GroupMember {memberProfile = LocalProfile {image}}} = isJust image - processIntro intro@GroupMemberIntro {introId} = do - void $ sendDirectMemberMessage conn (memberIntro $ reMember intro) groupId - withStore' $ \db -> updateIntroStatus db introId GMIntroSent + isAdmin GroupMember {memberRole} = memberRole >= GRAdmin + hasPicture GroupMember {memberProfile = LocalProfile {image}} = isJust image userProfileInGroup :: User -> GroupInfo -> Maybe Profile -> Profile userProfileInGroup user = userProfileInGroup' user . groupFeatureUserAllowed SGFSimplexLinks @@ -2047,8 +2067,8 @@ readyMemberConn GroupMember {groupMemberId, activeConn = Just conn@Connection {c | otherwise = Nothing readyMemberConn GroupMember {activeConn = Nothing} = Nothing -sendGroupMemberMessage :: MsgEncodingI e => GroupInfo -> GroupMember -> ChatMsgEvent e -> Maybe Int64 -> CM () -> CM () -sendGroupMemberMessage gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId} chatMsgEvent introId_ postDeliver = do +sendGroupMemberMessage :: MsgEncodingI e => GroupInfo -> GroupMember -> ChatMsgEvent e -> Maybe GroupMemberIntro -> CM () -> CM () +sendGroupMemberMessage gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId} chatMsgEvent intro_ postDeliver = do msg <- createSndMessage chatMsgEvent (GroupId groupId) messageMember msg `catchAllErrors` eToView where @@ -2056,7 +2076,7 @@ sendGroupMemberMessage gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId} c messageMember SndMessage {msgId, msgBody} = forM_ (memberSendAction gInfo (chatMsgEvent :| []) [m] m) $ \case MSASend conn -> deliverMessage conn (toCMEventTag chatMsgEvent) msgBody msgId >> postDeliver MSASendBatched conn -> deliverMessage conn (toCMEventTag chatMsgEvent) msgBody msgId >> postDeliver - MSAPending -> withStore' $ \db -> createPendingGroupMessage db groupMemberId msgId introId_ + MSAPending -> withStore' $ \db -> createPendingGroupMessage db groupMemberId msgId (introId <$> intro_) MSAForwarded -> pure () -- TODO ensure order - pending messages interleave with user input messages diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 5073da9c77..27f3a4f61c 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -28,7 +28,7 @@ import Data.Either (lefts, partitionEithers, rights) import Data.Foldable (foldr') import Data.Functor (($>)) import Data.Int (Int64) -import Data.List (find, foldl') +import Data.List (find) import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as L import Data.Map.Strict (Map) @@ -62,6 +62,7 @@ import Simplex.Chat.Store.Messages import Simplex.Chat.Store.Profiles import Simplex.Chat.Store.Shared import Simplex.Chat.Types +import Simplex.Chat.Types.MemberRelations import Simplex.Chat.Types.Preferences import Simplex.Chat.Types.Shared import Simplex.FileTransfer.Description (ValidFileDescription) @@ -2615,13 +2616,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memId) >>= \case Left _ -> messageError "x.grp.mem.inv error: referenced member does not exist" Right reMember -> do - introId <- withStore $ \db -> do - GroupMemberIntro {introId} <- getIntroduction db reMember m - liftIO $ updateIntroStatus db introId GMIntroInvReceived - pure introId - sendGroupMemberMessage gInfo reMember (XGrpMemFwd (memberInfo gInfo m) introInv) (Just introId) $ - withStore' $ - \db -> updateIntroStatus db introId GMIntroInvForwarded + intro_ <- withStore' $ \db -> getIntroduction db reMember m + update intro_ GMIntroInvReceived + sendGroupMemberMessage gInfo reMember (XGrpMemFwd (memberInfo gInfo m) introInv) intro_ $ + update intro_ GMIntroInvForwarded + where + update (Just GroupMemberIntro {introId}) status = withStore' $ \db -> updateIntroStatus db introId status + update Nothing _ = pure () _ -> messageError "x.grp.mem.inv can be only sent by invitee member" xGrpMemFwd :: GroupInfo -> GroupMember -> MemberInfo -> IntroInvitation -> CM () @@ -2715,45 +2716,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = blocked = mrsBlocked restriction xGrpMemCon :: GroupInfo -> GroupMember -> MemberId -> CM () - xGrpMemCon gInfo sendingMember memId = do - refMember <- withStore $ \db -> getGroupMemberByMemberId db vr user gInfo memId - case (memberCategory sendingMember, memberCategory refMember) of - (GCInviteeMember, GCInviteeMember) -> - withStore' (\db -> runExceptT $ getIntroduction db refMember sendingMember) >>= \case - Right intro -> inviteeXGrpMemCon intro - Left _ -> - withStore' (\db -> runExceptT $ getIntroduction db sendingMember refMember) >>= \case - Right intro -> forwardMemberXGrpMemCon intro - Left _ -> messageWarning "x.grp.mem.con: no introduction" - (GCInviteeMember, _) -> - withStore' (\db -> runExceptT $ getIntroduction db refMember sendingMember) >>= \case - Right intro -> inviteeXGrpMemCon intro - Left _ -> messageWarning "x.grp.mem.con: no introduction" - (_, GCInviteeMember) -> - withStore' (\db -> runExceptT $ getIntroduction db sendingMember refMember) >>= \case - Right intro -> forwardMemberXGrpMemCon intro - Left _ -> messageWarning "x.grp.mem.con: no introductiosupportn" - -- Note: we can allow XGrpMemCon to all member categories if we decide to support broader group forwarding, - -- deduplication (see saveGroupRcvMsg, saveGroupFwdRcvMsg) already supports sending XGrpMemCon - -- to any forwarding member, not only host/inviting member; - -- database would track all members connections then - -- (currently it's done via group_member_intros for introduced connections only) - _ -> - messageWarning "x.grp.mem.con: neither member is invitee" - where - inviteeXGrpMemCon :: GroupMemberIntro -> CM () - inviteeXGrpMemCon GroupMemberIntro {introId, introStatus} = case introStatus of - GMIntroReConnected -> updateStatus introId GMIntroConnected - GMIntroToConnected -> pure () - GMIntroConnected -> pure () - _ -> updateStatus introId GMIntroToConnected - forwardMemberXGrpMemCon :: GroupMemberIntro -> CM () - forwardMemberXGrpMemCon GroupMemberIntro {introId, introStatus} = case introStatus of - GMIntroToConnected -> updateStatus introId GMIntroConnected - GMIntroReConnected -> pure () - GMIntroConnected -> pure () - _ -> updateStatus introId GMIntroReConnected - updateStatus introId status = withStore' $ \db -> updateIntroStatus db introId status + xGrpMemCon gInfo sendingMem memId = do + refMem <- withStore $ \db -> getGroupMemberByMemberId db vr user gInfo memId + withStore' (`migrateMemberRelationsVector` sendingMem) + withStore' (`migrateMemberRelationsVector` refMem) + -- Updating vectors in separate transactions to avoid deadlocks. + withStore $ \db -> setMemberVectorRelationConnected db sendingMem refMem MRSubjectConnected + withStore $ \db -> setMemberVectorRelationConnected db refMem sendingMem MRReferencedConnected xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> Bool -> ChatMessage 'Json -> RcvMessage -> UTCTime -> Bool -> CM (Maybe DeliveryJobScope) xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId withMessages chatMsg msg brokerTs forwarded = do @@ -3238,10 +3207,10 @@ runDeliveryJobWorker a deliveryKey Worker {doWork} = do DJSMemberSupport scopeGMId -> do -- for member support scope we just load all recipients in one go, without cursor modMs <- withStore' $ \db -> getGroupModerators db vr user gInfo - let moderatorFilter mem = - memberCurrent mem - && maxVersion (memberChatVRange mem) >= groupKnockingVersion - && Just (groupMemberId' mem) /= singleSenderGMId_ + let moderatorFilter m = + memberCurrent m + && maxVersion (memberChatVRange m) >= groupKnockingVersion + && Just (groupMemberId' m) /= singleSenderGMId_ modMs' = filter moderatorFilter modMs mems <- if Just scopeGMId == singleSenderGMId_ @@ -3255,42 +3224,30 @@ runDeliveryJobWorker a deliveryKey Worker {doWork} = do Nothing -> throwChatError $ CEInternalError "delivery job worker: singleSenderGMId is required when not using relays" Just singleSenderGMId -> do sender <- withStore $ \db -> getGroupMemberById db vr user singleSenderGMId - mems <- buildMemberList sender - unless (null mems) $ deliver body mems + ms <- buildMemberList sender + unless (null ms) $ deliver body ms where - buildMemberList sender = case jobScope of - DJSGroup {jobSpec} - | jobSpecImpliedPending jobSpec -> - filter memberCurrentOrPending <$> getAllIntroducedAndInvited - | otherwise -> - filter memberCurrent <$> getAllIntroducedAndInvited - DJSMemberSupport scopeGMId -> do - -- moderators introduced to this invited member - introducedModMs <- - if memberCategory sender == GCInviteeMember - then withStore' $ \db -> getForwardIntroducedModerators db vr user sender - else pure [] - -- invited moderators to which this member was introduced - invitedModMs <- withStore' $ \db -> getForwardInvitedModerators db vr user sender - let modMs = introducedModMs <> invitedModMs - modMs' = filter (\mem -> memberCurrent mem && maxVersion (memberChatVRange mem) >= groupKnockingVersion) modMs - if scopeGMId == groupMemberId' sender - then pure modMs' - else - withStore' (\db -> getForwardScopeMember db vr user sender scopeGMId) >>= \case - Just scopeMem -> pure $ scopeMem : modMs' - _ -> pure modMs' - where - getAllIntroducedAndInvited = do - ChatConfig {highlyAvailable} <- asks config - -- members introduced to this invited member - introducedMembers <- - if memberCategory sender == GCInviteeMember - then withStore' $ \db -> getForwardIntroducedMembers db vr user sender highlyAvailable - else pure [] - -- invited members to which this member was introduced - invitedMembers <- withStore' $ \db -> getForwardInvitedMembers db vr user sender highlyAvailable - pure $ introducedMembers <> invitedMembers + buildMemberList sender = do + vec <- withStore $ \db -> migrateGetMemberRelationsVector db sender + -- this excludes the sender + let introducedMemsIdxs = getRelationsIndexes MRIntroduced vec + case jobScope of + DJSGroup {jobSpec} -> do + ms <- withStore' $ \db -> getGroupMembersByIndexes db vr user gInfo introducedMemsIdxs + pure $ filter shouldForwardTo ms + where + shouldForwardTo m + | jobSpecImpliedPending jobSpec = memberCurrentOrPending m + | otherwise = memberCurrent m + DJSMemberSupport scopeGMId -> do + ms <- withStore' $ \db -> getSupportScopeMembersByIndexes db vr user gInfo scopeGMId introducedMemsIdxs + pure $ filter shouldForwardTo ms + where + shouldForwardTo m = groupMemberId' m == scopeGMId || currentModerator m + currentModerator m@GroupMember {memberRole} = + memberRole >= GRModerator + && memberCurrent m + && maxVersion (memberChatVRange m) >= groupKnockingVersion where deliver :: ByteString -> [GroupMember] -> CM () deliver msgBody mems = diff --git a/src/Simplex/Chat/Mobile.hs b/src/Simplex/Chat/Mobile.hs index b22cfebcdd..3c8f170b0d 100644 --- a/src/Simplex/Chat/Mobile.hs +++ b/src/Simplex/Chat/Mobile.hs @@ -295,8 +295,8 @@ chatMigrateInitKey :: ChatDbOpts -> Bool -> String -> Bool -> IO (Either DBMigra chatMigrateInitKey chatDbOpts keepKey confirm backgroundMode = runExceptT $ do confirmMigrations <- liftEitherWith (const DBMInvalidConfirmation) $ strDecode $ B.pack confirm let migrationConfig = MigrationConfig confirmMigrations (Just "") - chatStore <- migrate createChatStore (toDBOpts chatDbOpts chatSuffix keepKey) migrationConfig - agentStore <- migrate createAgentStore (toDBOpts chatDbOpts agentSuffix keepKey) migrationConfig + chatStore <- migrate createChatStore (toDBOpts chatDbOpts chatSuffix keepKey chatDBFunctions) migrationConfig + agentStore <- migrate createAgentStore (toDBOpts chatDbOpts agentSuffix keepKey []) migrationConfig liftIO $ initialize chatStore ChatDatabase {chatStore, agentStore} where opts = mobileChatOpts $ removeDbKey chatDbOpts diff --git a/src/Simplex/Chat/Options/Postgres.hs b/src/Simplex/Chat/Options/Postgres.hs index 13af13b20a..c74ae37750 100644 --- a/src/Simplex/Chat/Options/Postgres.hs +++ b/src/Simplex/Chat/Options/Postgres.hs @@ -58,8 +58,8 @@ migrationBackupPathP = pure Nothing dbString :: ChatDbOpts -> String dbString ChatDbOpts {dbConnstr} = dbConnstr -toDBOpts :: ChatDbOpts -> String -> Bool -> DBOpts -toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema} dbSuffix _keepKey = +toDBOpts :: ChatDbOpts -> String -> Bool -> [()] -> DBOpts +toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema} dbSuffix _keepKey _dbFunctions = DBOpts { connstr = B.pack dbConnstr, schema = B.pack $ if null dbSchemaPrefix then "simplex_v1" <> dbSuffix else dbSchemaPrefix <> dbSuffix, @@ -73,6 +73,9 @@ chatSuffix = "_chat_schema" agentSuffix :: String agentSuffix = "_agent_schema" +chatDBFunctions :: [()] +chatDBFunctions = [] + mobileDbOpts :: CString -> CString -> IO ChatDbOpts mobileDbOpts schemaPrefix connstr = do dbSchemaPrefix <- peekCString schemaPrefix diff --git a/src/Simplex/Chat/Options/SQLite.hs b/src/Simplex/Chat/Options/SQLite.hs index 8591f0801c..7e25bb2217 100644 --- a/src/Simplex/Chat/Options/SQLite.hs +++ b/src/Simplex/Chat/Options/SQLite.hs @@ -11,7 +11,9 @@ import qualified Data.ByteArray as BA import qualified Data.ByteString.Char8 as B import Foreign.C.String import Options.Applicative +import Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector import Simplex.Messaging.Agent.Store.Interface (DBOpts (..)) +import Simplex.Messaging.Agent.Store.SQLite.Common (SQLiteFuncDef (..), SQLiteFuncPtrs (..)) import Simplex.Messaging.Agent.Store.SQLite.DB (TrackQueries (..)) import System.FilePath (combine) @@ -70,10 +72,11 @@ migrationBackupPathP = dbString :: ChatDbOpts -> String dbString ChatDbOpts {dbFilePrefix} = dbFilePrefix <> "_chat.db, " <> dbFilePrefix <> "_agent.db" -toDBOpts :: ChatDbOpts -> String -> Bool -> DBOpts -toDBOpts ChatDbOpts {dbFilePrefix, dbKey, trackQueries, vacuumOnMigration} dbSuffix keepKey = do +toDBOpts :: ChatDbOpts -> String -> Bool -> [SQLiteFuncDef] -> DBOpts +toDBOpts ChatDbOpts {dbFilePrefix, dbKey, trackQueries, vacuumOnMigration} dbSuffix keepKey dbFunctions = do DBOpts { dbFilePath = dbFilePrefix <> dbSuffix, + dbFunctions, dbKey, keepKey, vacuum = vacuumOnMigration, @@ -86,6 +89,12 @@ chatSuffix = "_chat.db" agentSuffix :: String agentSuffix = "_agent.db" +chatDBFunctions :: [SQLiteFuncDef] +chatDBFunctions = + [ SQLiteFuncDef "migrate_relations_vector" 3 (SQLiteAggrPtrs sqliteMemberRelationsStepPtr sqliteMemberRelationsFinalPtr), + SQLiteFuncDef "set_member_vector_new_relation" 4 (SQLiteFuncPtr True sqliteSetMemberVectorNewRelationPtr) + ] + mobileDbOpts :: CString -> CString -> IO ChatDbOpts mobileDbOpts fp key = do dbFilePrefix <- peekCString fp diff --git a/src/Simplex/Chat/Store/Delivery.hs b/src/Simplex/Chat/Store/Delivery.hs index 30fffac0e7..c1da436f04 100644 --- a/src/Simplex/Chat/Store/Delivery.hs +++ b/src/Simplex/Chat/Store/Delivery.hs @@ -185,7 +185,7 @@ getNextDeliveryTasks db gInfo task = | otherwise = -- For fully connected groups we guarantee a singleSenderGMId for a delivery job by additionally filtering -- on sender_group_member_id here, so that the job can then retrieve less members as recipients, - -- optimizing for this single sender (see processDeliveryJob -> getForwardIntroducedMembers, etc.). + -- optimizing for this single sender (see processDeliveryJob -> fully connected group branch). -- We do this optimization in the job to decrease load on admins using mobile devices for clients. map fromOnly <$> DB.query diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs index c04a31c0a9..44dcd3c7f9 100644 --- a/src/Simplex/Chat/Store/Groups.hs +++ b/src/Simplex/Chat/Store/Groups.hs @@ -58,11 +58,13 @@ module Simplex.Chat.Store.Groups getMentionedGroupMember, getMentionedMemberByMemberId, getGroupMemberById, + getGroupMemberByIndex, getGroupMemberByMemberId, getGroupMemberIdViaMemberId, getScopeMemberIdViaMemberId, getGroupMembers, - getGroupMembersForIntroduction, + getGroupMembersByIndexes, + getSupportScopeMembersByIndexes, getGroupModerators, getGroupRelays, getGroupMembersForExpiration, @@ -98,14 +100,17 @@ module Simplex.Chat.Store.Groups deleteGroupMemberConnection, updateGroupMemberRole, createIntroductions, + createIntrosOrUpdateVectors, + setMemberVectorNewRelations, + setMembersVectorsNewRelation, + setMemberVectorRelationConnected, + migrateGetMemberRelationsVector, + migrateMemberRelationsVector, + migrateMemberRelationsVector', + getMemberRelationsVector_, updateIntroStatus, getIntroduction, getIntroducedGroupMemberIds, - getForwardIntroducedMembers, - getForwardIntroducedModerators, - getForwardInvitedMembers, - getForwardInvitedModerators, - getForwardScopeMember, createIntroReMember, createIntroToMemberContact, getMatchingContacts, @@ -146,6 +151,8 @@ module Simplex.Chat.Store.Groups setGroupChatTTL, getGroupChatTTL, getUserGroupsToExpire, + hasMembersWithoutVector, + getGMsWithoutVectorIds, updateGroupAlias, ) where @@ -155,8 +162,11 @@ import Control.Monad.Except import Control.Monad.IO.Class import Crypto.Random (ChaChaDRG) import Data.Bifunctor (second) +import Data.ByteString (ByteString) +import qualified Data.ByteString as B import Data.Char (toLower) import Data.Either (rights) +import Data.Foldable (foldrM) import Data.Int (Int64) import Data.List (partition, sortOn) import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing) @@ -170,6 +180,7 @@ import Simplex.Chat.Protocol hiding (Binary) import Simplex.Chat.Store.Direct import Simplex.Chat.Store.Shared import Simplex.Chat.Types +import Simplex.Chat.Types.MemberRelations (IntroductionDirection (..), MemberRelation (..), setNewRelations, setRelationConnected, toIntroDirInt, toRelationInt) import Simplex.Chat.Types.Preferences import Simplex.Chat.Types.Shared import Simplex.Chat.Types.UITheme @@ -180,11 +191,12 @@ import qualified Simplex.Messaging.Agent.Store.DB as DB import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Crypto.Ratchet (pattern PQEncOff, pattern PQSupportOff) import Simplex.Messaging.Protocol (SubscriptionMode (..)) -import Simplex.Messaging.Util (eitherToMaybe, firstRow', safeDecodeUtf8, ($>>), ($>>=), (<$$>)) +import Simplex.Messaging.Util (eitherToMaybe, firstRow', safeDecodeUtf8, ($>>=), (<$$>)) import Simplex.Messaging.Version import UnliftIO.STM #if defined(dbPostgres) -import Database.PostgreSQL.Simple (Only (..), Query, (:.) (..)) +import qualified Data.Set as S +import Database.PostgreSQL.Simple (In (..), Only (..), Query, (:.) (..)) import Database.PostgreSQL.Simple.SqlQQ (sql) #else import Database.SQLite.Simple (Only (..), Query, (:.) (..)) @@ -511,12 +523,12 @@ createContactMemberInv_ db User {userId, userContactId} groupId invitedByGroupMe db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, Binary B.empty, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) :. (userId, localDisplayName' userOrContact, contactId' userOrContact, localProfileId $ profile' userOrContact, createdAt, createdAt) :. (minV, maxV) ) @@ -530,12 +542,12 @@ createContactMemberInv_ db User {userId, userContactId} groupId invitedByGroupMe db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, Binary B.empty, fromInvitedBy userContactId invitedBy, invitedByGroupMemberId) :. (userId, incognitoLdn, contactId' userOrContact, localProfileId $ profile' userOrContact, customUserProfileId, createdAt, createdAt) :. (minV, maxV) ) @@ -570,11 +582,11 @@ createPreparedGroup db vr user@User {userId, userContactId} groupProfile busines db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, GRAdmin, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, GRAdmin, GCHostMember, GSMemAccepted, Binary B.empty, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) ) insertedRowId db @@ -766,11 +778,11 @@ createGroupViaLink' db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, memberRole, GCHostMember, GSMemAccepted, Binary B.empty, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) ) insertedRowId db @@ -994,6 +1006,22 @@ getGroupMemberById db vr user@User {userId} groupMemberId = (groupMemberQuery <> " WHERE m.group_member_id = ? AND m.user_id = ?") (groupMemberId, userId) +getGroupMemberByIndex :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> Int64 -> ExceptT StoreError IO GroupMember +getGroupMemberByIndex db vr user GroupInfo {groupId} indexInGroup = + ExceptT . firstRow (toContactMember vr user) (SEGroupMemberNotFoundByIndex indexInGroup) $ + DB.query + db + (groupMemberQuery <> " WHERE m.group_id = ? AND m.index_in_group = ?") + (groupId, indexInGroup) + +getSupportScopeMemberByIndex :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupMemberId -> Int64 -> ExceptT StoreError IO GroupMember +getSupportScopeMemberByIndex db vr user GroupInfo {groupId} scopeGMId indexInGroup = + ExceptT . firstRow (toContactMember vr user) (SEGroupMemberNotFoundByIndex indexInGroup) $ + DB.query + db + (groupMemberQuery <> " WHERE m.group_id = ? AND m.index_in_group = ? AND (m.member_role IN (?,?,?) OR m.group_member_id = ?)") + (groupId, indexInGroup, GRModerator, GRAdmin, GROwner, scopeGMId) + getGroupMemberByMemberId :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> MemberId -> ExceptT StoreError IO GroupMember getGroupMemberByMemberId db vr user GroupInfo {groupId} memberId = ExceptT . firstRow (toContactMember vr user) (SEGroupMemberNotFoundByMemberId memberId) $ @@ -1017,20 +1045,38 @@ getGroupMemberIdViaMemberId db User {userId} GroupInfo {groupId} memberId = (userId, groupId, memberId) getGroupMembers :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> IO [GroupMember] -getGroupMembers db vr user@User {userId, userContactId} GroupInfo {groupId} = do +getGroupMembers db vr user@User {userId, userContactId} GroupInfo {groupId} = map (toContactMember vr user) <$> DB.query db (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?)") (userId, groupId, userContactId) -getGroupMembersForIntroduction :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupMember -> IO [GroupMember] -getGroupMembersForIntroduction db vr user@User {userId, userContactId} GroupInfo {groupId} _introduced@GroupMember {indexInGroup} = do - map (toContactMember vr user) - <$> DB.query +getGroupMembersByIndexes :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> [Int64] -> IO [GroupMember] +getGroupMembersByIndexes db vr user gInfo indexesInGroup = do +#if defined(dbPostgres) + let GroupInfo {groupId} = gInfo + map (toContactMember vr user) <$> + DB.query db - (groupMemberQuery <> " WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND index_in_group < ?") - (userId, groupId, userContactId, indexInGroup) + (groupMemberQuery <> " WHERE m.group_id = ? AND m.index_in_group IN ?") + (groupId, In indexesInGroup) +#else + rights <$> mapM (runExceptT . getGroupMemberByIndex db vr user gInfo) indexesInGroup +#endif + +getSupportScopeMembersByIndexes :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> GroupMemberId -> [Int64] -> IO [GroupMember] +getSupportScopeMembersByIndexes db vr user gInfo scopeGMId indexesInGroup = do +#if defined(dbPostgres) + let GroupInfo {groupId} = gInfo + map (toContactMember vr user) <$> + DB.query + db + (groupMemberQuery <> " WHERE m.group_id = ? AND m.index_in_group IN ? AND (m.member_role IN (?,?,?) OR m.group_member_id = ?)") + (groupId, In indexesInGroup, GRModerator, GRAdmin, GROwner, scopeGMId) +#else + rights <$> mapM (runExceptT . getSupportScopeMemberByIndex db vr user gInfo scopeGMId) indexesInGroup +#endif getGroupModerators :: DB.Connection -> VersionRangeChat -> User -> GroupInfo -> IO [GroupMember] getGroupModerators db vr user@User {userId, userContactId} GroupInfo {groupId} = do @@ -1141,12 +1187,12 @@ createNewContactMember db gVar User {userId, userContactId} GroupInfo {groupId, db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, invitedByGroupMemberId) + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, Binary B.empty, fromInvitedBy userContactId IBUser, invitedByGroupMemberId) :. (userId, localDisplayName, contactId, localProfileId profile, connRequest, createdAt, createdAt) :. (minV, maxV) ) @@ -1169,12 +1215,12 @@ createNewContactMemberAsync db gVar user@User {userId, userContactId} GroupInfo db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, fromInvitedBy userContactId IBUser, groupMemberId' membership) + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, GSMemInvited, Binary B.empty, fromInvitedBy userContactId IBUser, groupMemberId' membership) :. (userId, localDisplayName, contactId, localProfileId profile, createdAt, createdAt) :. (minV, maxV) ) @@ -1212,12 +1258,12 @@ createJoiningMember db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, memberStatus, fromInvitedBy userContactId IBUser, groupMemberId' membership) + ( (groupId, indexInGroup, memberId, memberRole, GCInviteeMember, memberStatus, Binary B.empty, fromInvitedBy userContactId IBUser, groupMemberId' membership) :. (userId, ldn, Nothing :: (Maybe Int64), profileId, cReqXContactId_, welcomeMsgId_, currentTs, currentTs) :. (minV, maxV) ) @@ -1291,12 +1337,12 @@ createBusinessRequestGroup db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, MemberId memId, GRMember, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership) + ( (groupId, indexInGroup, MemberId memId, GRMember, GCInviteeMember, GSMemAccepted, Binary B.empty, fromInvitedBy userContactId IBUser, groupMemberId' membership) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) :. (minV, maxV) ) @@ -1497,12 +1543,12 @@ createNewMember_ db [sql| INSERT INTO group_members - (group_id, index_in_group, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, + (group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, member_restriction, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, memRestriction, invitedById, memInvitedByGroupMemberId) + ( (groupId, indexInGroup, memberId, memberRole, memberCategory, memberStatus, Binary B.empty, memRestriction, invitedById, memInvitedByGroupMemberId) :. (userId, localDisplayName, memberContactId, memberContactProfileId, createdAt, createdAt) :. (minV, maxV) ) @@ -1561,27 +1607,196 @@ updateGroupMemberRole :: DB.Connection -> User -> GroupMember -> GroupMemberRole updateGroupMemberRole db User {userId} GroupMember {groupMemberId} memRole = DB.execute db "UPDATE group_members SET member_role = ? WHERE user_id = ? AND group_member_id = ?" (memRole, userId, groupMemberId) -createIntroductions :: DB.Connection -> VersionChat -> [GroupMember] -> GroupMember -> IO [GroupMemberIntro] -createIntroductions db chatV members toMember = do - let reMembers = filter (\m -> memberCurrent m && groupMemberId' m /= groupMemberId' toMember) members - if null reMembers - then pure [] - else do +createIntroductions :: DB.Connection -> VersionChat -> [GroupMember] -> GroupMember -> IO [GroupMember] +createIntroductions db chatV reMembers toMember + | null reMembers = pure [] + | otherwise = do currentTs <- getCurrentTime - mapM (insertIntro_ currentTs) reMembers + catMaybes <$> mapM (createIntro_ currentTs) reMembers where - insertIntro_ :: UTCTime -> GroupMember -> IO GroupMemberIntro - insertIntro_ ts reMember = do - DB.execute + createIntro_ :: UTCTime -> GroupMember -> IO (Maybe GroupMember) + createIntro_ ts reMember = + -- when members connect concurrently, host would try to create introductions between them in both directions; + -- this check avoids creating second (redundant) introduction + checkInverseIntro >>= \case + Just _ -> pure Nothing + Nothing -> do + DB.execute + db + [sql| + INSERT INTO group_member_intros + (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) + VALUES (?,?,?,?,?,?) + |] + (groupMemberId' reMember, groupMemberId' toMember, GMIntroPending, chatV, ts, ts) + pure $ Just reMember + where + checkInverseIntro :: IO (Maybe Int64) + checkInverseIntro = + maybeFirstRow fromOnly $ + DB.query + db + "SELECT 1 FROM group_member_intros WHERE re_group_member_id = ? AND to_group_member_id = ? LIMIT 1" + (groupMemberId' toMember, groupMemberId' reMember) + +-- Create introductions for members without vectors and update vectors for members with vectors. +-- Partitioning and updates happen in same transaction to avoid race conditions. +createIntrosOrUpdateVectors :: DB.Connection -> VersionRangeChat -> [GroupMember] -> GroupMember -> IO [GroupMember] +createIntrosOrUpdateVectors db vr reMembers toMember + | null reMembers = pure [] + | otherwise = do + (memsWithVec, memsWithoutVec) <- partitionByVector reMembers + let GroupMember {indexInGroup} = toMember + setMembersVectorsNewRelation db memsWithVec indexInGroup IDSubjectIntroduced MRIntroduced + memsWithoutVec' <- createIntroductions db (maxVersion vr) memsWithoutVec toMember + pure $ memsWithoutVec' <> memsWithVec + where + partitionByVector :: [GroupMember] -> IO ([GroupMember], [GroupMember]) +#if defined(dbPostgres) + partitionByVector members = do + let memberIds = map groupMemberId' members + -- Lock rows first to ensure partitioning doesn't change in case of concurrent updates + _ :: [Only Int] <- + DB.query + db + "SELECT 1 FROM group_members WHERE group_member_id IN ? FOR UPDATE" + (Only $ In memberIds) + memberIdsWithVec <- S.fromList . map fromOnly <$> + DB.query + db + "SELECT group_member_id FROM group_members WHERE group_member_id IN ? AND member_relations_vector IS NOT NULL" + (Only $ In memberIds) + pure $ partition (\m -> groupMemberId' m `S.member` memberIdsWithVec) members +#else + partitionByVector = foldrM checkMember ([], []) + where + checkMember m (withVec, withoutVec) = do + hasVec <- isJust <$> maybeFirstRow fromOnly + (DB.query db "SELECT 1 FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL" (Only $ groupMemberId' m) :: IO [Only Int64]) + pure $ if hasVec then (m : withVec, withoutVec) else (withVec, m : withoutVec) +#endif + +setMemberVectorNewRelations :: DB.Connection -> GroupMember -> [(Int64, (IntroductionDirection, MemberRelation))] -> IO () +setMemberVectorNewRelations db GroupMember {groupMemberId} relations = do + v_ <- maybeFirstRow fromOnly $ + DB.query + db +#if defined(dbPostgres) + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? FOR UPDATE" +#else + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ?" +#endif + (Only groupMemberId) + let v' = setNewRelations relations $ fromMaybe B.empty v_ + currentTs <- getCurrentTime + DB.execute + db + [sql| + UPDATE group_members + SET member_relations_vector = ?, updated_at = ? + WHERE group_member_id = ? + |] + (Binary v', currentTs, groupMemberId) + +setMembersVectorsNewRelation :: DB.Connection -> [GroupMember] -> Int64 -> IntroductionDirection -> MemberRelation -> IO () +setMembersVectorsNewRelation db members idx dir status = do + currentTs <- getCurrentTime +#if defined(dbPostgres) + let memberIds = map groupMemberId' members + DB.execute + db + "UPDATE group_members SET member_relations_vector = set_member_vector_new_relation(member_relations_vector, ?, ?, ?), updated_at = ? WHERE group_member_id IN ?" + (idx, toIntroDirInt dir, toRelationInt status, currentTs, In memberIds) +#else + forM_ members $ \GroupMember {groupMemberId} -> + DB.execute + db + "UPDATE group_members SET member_relations_vector = set_member_vector_new_relation(member_relations_vector, ?, ?, ?), updated_at = ? WHERE group_member_id = ?" + (idx, toIntroDirInt dir, toRelationInt status, currentTs, groupMemberId) +#endif + +setMemberVectorRelationConnected :: DB.Connection -> GroupMember -> GroupMember -> MemberRelation -> ExceptT StoreError IO () +setMemberVectorRelationConnected db GroupMember {groupMemberId} GroupMember {indexInGroup} newStatus = do + when (newStatus /= MRSubjectConnected && newStatus /= MRReferencedConnected) $ + throwError SEInvalidMemberRelationUpdate + v <- ExceptT $ + firstRow fromOnly (SEMemberRelationsVectorNotFound groupMemberId) $ + DB.query db - [sql| - INSERT INTO group_member_intros - (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) - VALUES (?,?,?,?,?,?) - |] - (groupMemberId' reMember, groupMemberId' toMember, GMIntroPending, chatV, ts, ts) - introId <- insertedRowId db - pure GroupMemberIntro {introId, reMember, toMember, introStatus = GMIntroPending} +#if defined(dbPostgres) + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL FOR UPDATE" +#else + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NOT NULL" +#endif + (Only groupMemberId) + let v' = setRelationConnected indexInGroup newStatus v + currentTs <- liftIO getCurrentTime + liftIO $ DB.execute + db + [sql| + UPDATE group_members + SET member_relations_vector = ?, updated_at = ? + WHERE group_member_id = ? + |] + (Binary v', currentTs, groupMemberId) + +migrateGetMemberRelationsVector :: DB.Connection -> GroupMember -> ExceptT StoreError IO ByteString +migrateGetMemberRelationsVector db m@GroupMember {groupMemberId} = do + liftIO $ migrateMemberRelationsVector db m + ExceptT . firstRow fromOnly (SEGroupMemberNotFound groupMemberId) $ + DB.query + db + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ?" + (Only groupMemberId) + +migrateMemberRelationsVector :: DB.Connection -> GroupMember -> IO () +migrateMemberRelationsVector db GroupMember {groupMemberId} = + migrateMemberRelationsVector' db groupMemberId + +migrateMemberRelationsVector' :: DB.Connection -> GroupMemberId -> IO () +migrateMemberRelationsVector' db groupMemberId = do + currentTs <- liftIO getCurrentTime + liftIO $ do +#if defined(dbPostgres) + -- Lock the row first to ensure computation runs only after lock is acquired + _ :: [Only Int] <- + DB.query + db + "SELECT 1 FROM group_members WHERE group_member_id = ? AND member_relations_vector IS NULL FOR UPDATE" + (Only groupMemberId) +#endif + DB.execute + db + [sql| + UPDATE group_members + SET + member_relations_vector = ( + SELECT migrate_relations_vector(idx, direction, intro_status) + FROM ( + SELECT m.index_in_group AS idx, 0 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.to_group_member_id + WHERE i.re_group_member_id = group_members.group_member_id + UNION ALL + SELECT m.index_in_group AS idx, 1 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.re_group_member_id + WHERE i.to_group_member_id = group_members.group_member_id + ) AS relations + ), + updated_at = ? + WHERE group_member_id = ? + AND member_relations_vector IS NULL + |] + (currentTs, groupMemberId) + +getMemberRelationsVector_ :: DB.Connection -> GroupMember -> IO (Maybe ByteString) +getMemberRelationsVector_ db GroupMember {groupMemberId} = + maybeFirstRow fromOnly $ + DB.query + db + "SELECT member_relations_vector FROM group_members WHERE group_member_id = ?" + (Only groupMemberId) updateIntroStatus :: DB.Connection -> Int64 -> GroupMemberIntroStatus -> IO () updateIntroStatus db introId introStatus = do @@ -1595,9 +1810,9 @@ updateIntroStatus db introId introStatus = do |] (introStatus, currentTs, introId) -getIntroduction :: DB.Connection -> GroupMember -> GroupMember -> ExceptT StoreError IO GroupMemberIntro -getIntroduction db reMember toMember = ExceptT $ - firstRow toIntro SEIntroNotFound $ +getIntroduction :: DB.Connection -> GroupMember -> GroupMember -> IO (Maybe GroupMemberIntro) +getIntroduction db reMember toMember = + maybeFirstRow toIntro $ DB.query db [sql| @@ -1619,106 +1834,6 @@ getIntroducedGroupMemberIds db invitee = "SELECT re_group_member_id FROM group_member_intros WHERE to_group_member_id = ?" (Only $ groupMemberId' invitee) -getForwardIntroducedMembers :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> Bool -> IO [GroupMember] -getForwardIntroducedMembers db vr user invitee highlyAvailable = do - memberIds <- map fromOnly <$> query - rights <$> mapM (runExceptT . getGroupMemberById db vr user) memberIds - where - mId = groupMemberId' invitee - query - | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected) - | otherwise = - DB.query - db - (q <> " AND intro_chat_protocol_version >= ?") - (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, groupForwardVersion) - q = - [sql| - SELECT re_group_member_id - FROM group_member_intros - WHERE to_group_member_id = ? AND intro_status NOT IN (?,?,?) - |] - --- for support scope we don't need to filter by intro_chat_protocol_version for non highly available client, --- as we will filter moderators supporting this feature by a higher version (as opposed to getForwardIntroducedMembers) -getForwardIntroducedModerators :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> IO [GroupMember] -getForwardIntroducedModerators db vr user@User {userContactId} invitee = do - memberIds <- map fromOnly <$> query - rights <$> mapM (runExceptT . getGroupMemberById db vr user) memberIds - where - mId = groupMemberId' invitee - query = - DB.query - db - [sql| - SELECT i.re_group_member_id - FROM group_member_intros i - JOIN group_members m ON m.group_member_id = i.re_group_member_id - WHERE i.to_group_member_id = ? AND i.intro_status NOT IN (?,?,?) - AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?) - |] - (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, userContactId, GRModerator, GRAdmin, GROwner) - -getForwardInvitedMembers :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> Bool -> IO [GroupMember] -getForwardInvitedMembers db vr user forwardMember highlyAvailable = do - memberIds <- map fromOnly <$> query - rights <$> mapM (runExceptT . getGroupMemberById db vr user) memberIds - where - mId = groupMemberId' forwardMember - query - | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected) - | otherwise = - DB.query - db - (q <> " AND intro_chat_protocol_version >= ?") - (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, groupForwardVersion) - q = - [sql| - SELECT to_group_member_id - FROM group_member_intros - WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?) - |] - --- for support scope we don't need to filter by intro_chat_protocol_version for non highly available client, --- as we will filter moderators supporting this feature by a higher version (as opposed to getForwardInvitedMembers) -getForwardInvitedModerators :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> IO [GroupMember] -getForwardInvitedModerators db vr user@User {userContactId} forwardMember = do - memberIds <- map fromOnly <$> query - rights <$> mapM (runExceptT . getGroupMemberById db vr user) memberIds - where - mId = groupMemberId' forwardMember - query = - DB.query - db - [sql| - SELECT i.to_group_member_id - FROM group_member_intros i - JOIN group_members m ON m.group_member_id = i.to_group_member_id - WHERE i.re_group_member_id = ? AND i.intro_status NOT IN (?,?,?) - AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?) - |] - (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, userContactId, GRModerator, GRAdmin, GROwner) - -getForwardScopeMember :: DB.Connection -> VersionRangeChat -> User -> GroupMember -> GroupMemberId -> IO (Maybe GroupMember) -getForwardScopeMember db vr user GroupMember {groupMemberId = sendingGMId} scopeGMId = do - (introExists_ :: Maybe Int64) <- - liftIO $ maybeFirstRow fromOnly $ - DB.query - db - [sql| - SELECT 1 - FROM group_member_intros - WHERE - ( - (re_group_member_id = ? AND to_group_member_id = ?) OR - (re_group_member_id = ? AND to_group_member_id = ?) - ) - AND intro_status NOT IN (?,?,?) - LIMIT 1 - |] - (sendingGMId, scopeGMId, scopeGMId, sendingGMId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected) - pure introExists_ $>> (eitherToMaybe <$> runExceptT (getGroupMemberById db vr user scopeGMId)) - createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> VersionChat -> MemberInfo -> Maybe MemberRestrictions -> (CommandId, ConnId) -> SubscriptionMode -> ExceptT StoreError IO GroupMember createIntroReMember db @@ -2505,12 +2620,12 @@ createNewUnknownGroupMember db vr user@User {userId, userContactId} GroupInfo {g db [sql| INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |] - ( (groupId, indexInGroup, memberId, GRAuthor, GCPreMember, GSMemUnknown, fromInvitedBy userContactId IBUnknown) + ( (groupId, indexInGroup, memberId, GRAuthor, GCPreMember, GSMemUnknown, Binary B.empty, fromInvitedBy userContactId IBUnknown) :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs) :. (minV, maxV) ) @@ -2608,6 +2723,25 @@ getUserGroupsToExpire db User {userId} globalTTL = where cond = if globalTTL == 0 then "" else " OR chat_item_ttl IS NULL" +hasMembersWithoutVector :: DB.Connection -> IO Bool +hasMembersWithoutVector db = + fromOnly . head + <$> DB.query_ + db + "SELECT EXISTS (SELECT 1 FROM group_members WHERE member_relations_vector IS NULL LIMIT 1)" + +getGMsWithoutVectorIds :: DB.Connection -> IO [GroupMemberId] +getGMsWithoutVectorIds db = + map fromOnly <$> + DB.query_ + db + [sql| + SELECT group_member_id + FROM group_members + WHERE member_relations_vector IS NULL + LIMIT 1000 + |] + updateGroupAlias :: DB.Connection -> UserId -> GroupInfo -> LocalAlias -> IO GroupInfo updateGroupAlias db userId g@GroupInfo {groupId} localAlias = do updatedAt <- getCurrentTime diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs index 9361713ea2..9dd388be0a 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations.hs +++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs @@ -22,6 +22,7 @@ import Simplex.Chat.Store.Postgres.Migrations.M20250922_remove_unused_connection import Simplex.Chat.Store.Postgres.Migrations.M20251007_connections_sync import Simplex.Chat.Store.Postgres.Migrations.M20251017_chat_tags_cascade import Simplex.Chat.Store.Postgres.Migrations.M20251117_member_relations_vector +-- import Simplex.Chat.Store.Postgres.Migrations.M20251128_member_relations_vector_stage_2 import Simplex.Messaging.Agent.Store.Shared (Migration (..)) schemaMigrations :: [(String, Text, Maybe Text)] @@ -44,6 +45,7 @@ schemaMigrations = ("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync), ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade), ("20251117_member_relations_vector", m20251117_member_relations_vector, Just down_m20251117_member_relations_vector) + -- ("20251128_member_relations_vector_stage_2", m20251128_member_relations_vector_stage_2, Just down_m20251128_member_relations_vector_stage_2) ] -- | The list of migrations in ascending order by date diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs index 3f6deeb80f..33583cc076 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs +++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20251117_member_relations_vector.hs @@ -6,10 +6,91 @@ import Data.Text (Text) import qualified Data.Text as T import Text.RawString.QQ (r) +-- This migration creates custom aggregate function migrate_relations_vector(idx, direction, intro_status). +-- Used in live migration and stage 2 migration (M20251128_member_relations_vector_stage_2). +-- +-- Vector byte encoding: 4 reserved | 1 direction | 3 status +-- Direction: 0 = IDSubjectIntroduced, 1 = IDReferencedIntroduced +-- Status values: 0 = MRNew, 1 = MRIntroduced, 2 = MRSubjectConnected, 3 = MRReferencedConnected, 4 = MRConnected +-- +-- The aggregate transforms intro_status into relation status: +-- - intro_status 'new'/'sent'/'rcv'/'fwd': MRIntroduced (1) +-- - intro_status 're-con': if direction=0 then MRSubjectConnected (2), else MRReferencedConnected (3) +-- - intro_status 'to-con': if direction=0 then MRReferencedConnected (3), else MRSubjectConnected (2) +-- - intro_status 'con': MRConnected (4) +-- +-- Final byte combines direction and status: byte = (direction << 3) | status + m20251117_member_relations_vector :: Text m20251117_member_relations_vector = T.pack [r| +CREATE FUNCTION set_member_vector_new_relation(v BYTEA, idx BIGINT, direction INT, status INT) +RETURNS BYTEA AS $$ +DECLARE + new_len INT; + result BYTEA; + byte_val INT; + old_byte INT; +BEGIN + IF idx < 0 THEN + RETURN v; + END IF; + IF idx < length(v) THEN + old_byte := get_byte(v, idx::INT); + ELSE + old_byte := 0; + END IF; + byte_val := (old_byte & x'F0'::INT) | (direction * 8) | status; + new_len := GREATEST(length(v), idx + 1); + IF new_len > length(v) THEN + result := v || (SELECT string_agg('\x00'::BYTEA, ''::BYTEA) FROM generate_series(1, new_len - length(v))); + ELSE + result := v; + END IF; + result := set_byte(result, idx::INT, byte_val); + RETURN result; +END; +$$ LANGUAGE plpgsql IMMUTABLE; + +CREATE FUNCTION migrate_relations_vector_step(state BYTEA, idx BIGINT, direction INT, intro_status TEXT) +RETURNS BYTEA AS $$ +DECLARE + new_len INT; + result BYTEA; + status INT; + byte_val INT; +BEGIN + IF idx < 0 THEN + RETURN state; + END IF; + IF intro_status = 're-con' THEN + IF direction = 0 THEN status := 2; ELSE status := 3; END IF; + ELSIF intro_status = 'to-con' THEN + IF direction = 0 THEN status := 3; ELSE status := 2; END IF; + ELSIF intro_status = 'con' THEN + status := 4; + ELSE + status := 1; + END IF; + byte_val := (direction * 8) + status; + new_len := GREATEST(length(state), idx + 1); + IF new_len > length(state) THEN + result := state || (SELECT string_agg('\x00'::BYTEA, ''::BYTEA) FROM generate_series(1, new_len - length(state))); + ELSE + result := state; + END IF; + result := set_byte(result, idx::INT, byte_val); + RETURN result; +END; +$$ LANGUAGE plpgsql IMMUTABLE; + +CREATE AGGREGATE migrate_relations_vector(BIGINT, INT, TEXT) ( + SFUNC = migrate_relations_vector_step, + STYPE = BYTEA, + INITCOND = '' +); + ALTER TABLE group_members ADD COLUMN index_in_group BIGINT NOT NULL DEFAULT 0; ALTER TABLE groups ADD COLUMN member_index BIGINT NOT NULL DEFAULT 0; @@ -46,12 +127,28 @@ SET member_index = COALESCE(( FROM group_members WHERE group_members.group_id = g.group_id ), 0); + +UPDATE group_members +SET member_relations_vector = ''::BYTEA +WHERE group_id IN ( + SELECT mu.group_id + FROM group_members mu + WHERE mu.member_category = 'user' + AND ( + mu.member_role NOT IN ('admin', 'owner') + OR mu.member_status IN ('removed', 'left', 'deleted') + ) +); |] down_m20251117_member_relations_vector :: Text down_m20251117_member_relations_vector = T.pack [r| +DROP AGGREGATE migrate_relations_vector(BIGINT, INT, TEXT); +DROP FUNCTION migrate_relations_vector_step(BYTEA, BIGINT, INT, TEXT); +DROP FUNCTION set_member_vector_new_relation(BYTEA, BIGINT, INT, INT); + DROP INDEX idx_group_members_group_id_index_in_group; ALTER TABLE group_members DROP COLUMN index_in_group; diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20251128_member_relations_vector_stage_2.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20251128_member_relations_vector_stage_2.hs new file mode 100644 index 0000000000..7cfc273d62 --- /dev/null +++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20251128_member_relations_vector_stage_2.hs @@ -0,0 +1,45 @@ +{-# LANGUAGE QuasiQuotes #-} + +module Simplex.Chat.Store.Postgres.Migrations.M20251128_member_relations_vector_stage_2 where + +import Data.Text (Text) +import qualified Data.Text as T +import Text.RawString.QQ (r) + +-- Build member_relations_vector for all members that don't have it yet. +-- Uses custom aggregate function migrate_relations_vector defined in M20251117_member_relations_vector. +-- +-- Query returns (idx, direction, intro_status) for each introduction: +-- - direction 0 (IDSubjectIntroduced): current member (subject) is re_group_member_id, was introduced to referenced member +-- - direction 1 (IDReferencedIntroduced): current member (subject) is to_group_member_id, referenced member was introduced to it + +-- TODO [relations vector] drop group_member_intros in the end of migration +m20251128_member_relations_vector_stage_2 :: Text +m20251128_member_relations_vector_stage_2 = + T.pack + [r| +UPDATE group_members +SET member_relations_vector = ( + SELECT migrate_relations_vector(idx, direction, intro_status) + FROM ( + SELECT m.index_in_group AS idx, 0 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.to_group_member_id + WHERE i.re_group_member_id = group_members.group_member_id + UNION ALL + SELECT m.index_in_group AS idx, 1 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.re_group_member_id + WHERE i.to_group_member_id = group_members.group_member_id + ) AS relations +) +WHERE member_relations_vector IS NULL; +|] + +-- TODO [relations vector] re-create group_member_intros +down_m20251128_member_relations_vector_stage_2 :: Text +down_m20251128_member_relations_vector_stage_2 = + T.pack + [r| + +|] diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql index 712099d7c9..567aca0144 100644 --- a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql +++ b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql @@ -34,6 +34,41 @@ $$; +CREATE FUNCTION test_chat_schema.migrate_relations_vector_step(state bytea, idx bigint, direction integer, intro_status text) RETURNS bytea + LANGUAGE plpgsql IMMUTABLE + AS $$ +DECLARE + new_len INT; + result BYTEA; + status INT; + byte_val INT; +BEGIN + IF idx < 0 THEN + RETURN state; + END IF; + IF intro_status = 're-con' THEN + IF direction = 0 THEN status := 2; ELSE status := 3; END IF; + ELSIF intro_status = 'to-con' THEN + IF direction = 0 THEN status := 3; ELSE status := 2; END IF; + ELSIF intro_status = 'con' THEN + status := 4; + ELSE + status := 1; + END IF; + byte_val := (direction * 8) + status; + new_len := GREATEST(length(state), idx + 1); + IF new_len > length(state) THEN + result := state || (SELECT string_agg('\x00'::BYTEA, ''::BYTEA) FROM generate_series(1, new_len - length(state))); + ELSE + result := state; + END IF; + result := set_byte(result, idx::INT, byte_val); + RETURN result; +END; +$$; + + + CREATE FUNCTION test_chat_schema.on_group_members_delete_update_summary() RETURNS trigger LANGUAGE plpgsql AS $$ @@ -85,6 +120,45 @@ END; $$; + +CREATE FUNCTION test_chat_schema.set_member_vector_new_relation(v bytea, idx bigint, direction integer, status integer) RETURNS bytea + LANGUAGE plpgsql IMMUTABLE + AS $$ +DECLARE + new_len INT; + result BYTEA; + byte_val INT; + old_byte INT; +BEGIN + IF idx < 0 THEN + RETURN v; + END IF; + IF idx < length(v) THEN + old_byte := get_byte(v, idx::INT); + ELSE + old_byte := 0; + END IF; + byte_val := (old_byte & x'F0'::INT) | (direction * 8) | status; + new_len := GREATEST(length(v), idx + 1); + IF new_len > length(v) THEN + result := v || (SELECT string_agg('\x00'::BYTEA, ''::BYTEA) FROM generate_series(1, new_len - length(v))); + ELSE + result := v; + END IF; + result := set_byte(result, idx::INT, byte_val); + RETURN result; +END; +$$; + + + +CREATE AGGREGATE test_chat_schema.migrate_relations_vector(bigint, integer, text) ( + SFUNC = test_chat_schema.migrate_relations_vector_step, + STYPE = bytea, + INITCOND = '' +); + + SET default_table_access_method = heap; diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs index 13ada872b2..0358ae621d 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations.hs +++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs @@ -145,6 +145,7 @@ import Simplex.Chat.Store.SQLite.Migrations.M20250922_remove_unused_connections import Simplex.Chat.Store.SQLite.Migrations.M20251007_connections_sync import Simplex.Chat.Store.SQLite.Migrations.M20251017_chat_tags_cascade import Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector +-- import Simplex.Chat.Store.SQLite.Migrations.M20251128_member_relations_vector_stage_2 import Simplex.Messaging.Agent.Store.Shared (Migration (..)) schemaMigrations :: [(String, Query, Maybe Query)] @@ -290,6 +291,7 @@ schemaMigrations = ("20251007_connections_sync", m20251007_connections_sync, Just down_m20251007_connections_sync), ("20251017_chat_tags_cascade", m20251017_chat_tags_cascade, Just down_m20251017_chat_tags_cascade), ("20251117_member_relations_vector", m20251117_member_relations_vector, Just down_m20251117_member_relations_vector) + -- ("20251128_member_relations_vector_stage_2", m20251128_member_relations_vector_stage_2, Just down_m20251128_member_relations_vector_stage_2) ] -- | The list of migrations in ascending order by date diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs index bf5308bcfd..3e4b4157f0 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs +++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20251117_member_relations_vector.hs @@ -1,9 +1,77 @@ +{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes #-} module Simplex.Chat.Store.SQLite.Migrations.M20251117_member_relations_vector where +import qualified Data.ByteString as B import Database.SQLite.Simple (Query) import Database.SQLite.Simple.QQ (sql) +import Database.SQLite3 (funcArgBlob, funcArgInt64, funcArgText, funcResultBlob) +import Database.SQLite3.Bindings +import Foreign.C.Types +import Foreign.Ptr +import Simplex.Chat.Types.MemberRelations (IntroductionDirection (..), MemberRelation (..), fromIntroDirInt, fromRelationInt, setNewRelation, setNewRelations) +import Simplex.Messaging.Agent.Store.SQLite.Util (SQLiteFunc, SQLiteFuncFinal, mkSQLiteAggFinal, mkSQLiteAggStep, mkSQLiteFunc) + +-- This module defines custom aggregate function migrate_relations_vector(idx, direction, intro_status). +-- It is passed via DBOpts and registered on DB open. +-- Used in live migration and stage 2 migration (M20251128_member_relations_vector_stage_2). +-- +-- Vector byte encoding: 4 reserved | 1 direction | 3 status +-- Direction: 0 = IDSubjectIntroduced, 1 = IDReferencedIntroduced +-- Status values: 0 = MRNew, 1 = MRIntroduced, 2 = MRSubjectConnected, 3 = MRReferencedConnected, 4 = MRConnected +-- +-- The aggregate transforms intro_status into relation status: +-- - intro_status 'new'/'sent'/'rcv'/'fwd': MRIntroduced (1) +-- - intro_status 're-con': if direction=0 then MRSubjectConnected (2), else MRReferencedConnected (3) +-- - intro_status 'to-con': if direction=0 then MRReferencedConnected (3), else MRSubjectConnected (2) +-- - intro_status 'con': MRConnected (4) +-- +-- The final function builds the vector using setNewRelations. + +foreign export ccall "simplex_member_relations_step" sqliteMemberRelationsStep :: SQLiteFunc + +foreign import ccall "&simplex_member_relations_step" sqliteMemberRelationsStepPtr :: FunPtr SQLiteFunc + +foreign export ccall "simplex_member_relations_final" sqliteMemberRelationsFinal :: SQLiteFuncFinal + +foreign import ccall "&simplex_member_relations_final" sqliteMemberRelationsFinalPtr :: FunPtr SQLiteFuncFinal + +-- Step function for migrate_relations_vector aggregate. +-- Accumulates (idx, direction, relation) tuples. +sqliteMemberRelationsStep :: SQLiteFunc +sqliteMemberRelationsStep = mkSQLiteAggStep [] $ \_ args acc -> do + idx <- funcArgInt64 args 0 + direction <- fromIntroDirInt . fromIntegral <$> funcArgInt64 args 1 + introStatus <- funcArgText args 2 + let relation = introStatusToRelation direction introStatus + pure $ (idx, (direction, relation)) : acc + where + introStatusToRelation dir status = case status of + "re-con" -> if dir == IDSubjectIntroduced then MRSubjectConnected else MRReferencedConnected + "to-con" -> if dir == IDSubjectIntroduced then MRReferencedConnected else MRSubjectConnected + "con" -> MRConnected + _ -> MRIntroduced -- 'new', 'sent', 'rcv', 'fwd' + +-- Final function for migrate_relations_vector aggregate. +-- Builds the vector from accumulated tuples using setNewRelations. +sqliteMemberRelationsFinal :: SQLiteFuncFinal +sqliteMemberRelationsFinal = mkSQLiteAggFinal [] $ \cxt acc -> funcResultBlob cxt $ setNewRelations acc B.empty + +-- Non-aggregate function set_member_vector_new_relation(vector, idx, direction, status). +-- Sets a new relation in the vector and returns the updated vector. + +foreign export ccall "simplex_set_member_vector_new_relation" sqliteSetMemberVectorNewRelation :: SQLiteFunc + +foreign import ccall "&simplex_set_member_vector_new_relation" sqliteSetMemberVectorNewRelationPtr :: FunPtr SQLiteFunc + +sqliteSetMemberVectorNewRelation :: SQLiteFunc +sqliteSetMemberVectorNewRelation = mkSQLiteFunc $ \cxt args -> do + v <- funcArgBlob args 0 + idx <- funcArgInt64 args 1 + direction <- fromIntroDirInt . fromIntegral <$> funcArgInt64 args 2 + status <- fromRelationInt . fromIntegral <$> funcArgInt64 args 3 + funcResultBlob cxt $ setNewRelation idx direction status v m20251117_member_relations_vector :: Query m20251117_member_relations_vector = @@ -46,6 +114,18 @@ SET member_index = COALESCE(( FROM group_members WHERE group_members.group_id = g.group_id ), 0); + +UPDATE group_members +SET member_relations_vector = x'' +WHERE group_id IN ( + SELECT mu.group_id + FROM group_members mu + WHERE mu.member_category = 'user' + AND ( + mu.member_role NOT IN (CAST('admin' AS BLOB), CAST('owner' AS BLOB)) + OR mu.member_status IN ('removed', 'left', 'deleted') + ) +); |] down_m20251117_member_relations_vector :: Query diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20251128_member_relations_vector_stage_2.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20251128_member_relations_vector_stage_2.hs new file mode 100644 index 0000000000..f510a50410 --- /dev/null +++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20251128_member_relations_vector_stage_2.hs @@ -0,0 +1,42 @@ +{-# LANGUAGE QuasiQuotes #-} + +module Simplex.Chat.Store.SQLite.Migrations.M20251128_member_relations_vector_stage_2 where + +import Database.SQLite.Simple (Query) +import Database.SQLite.Simple.QQ (sql) + +-- Build member_relations_vector for all members that don't have it yet. +-- Uses custom aggregate function migrate_relations_vector defined in M20251117_member_relations_vector. +-- +-- Query returns (idx, direction, intro_status) for each introduction: +-- - direction 0 (IDSubjectIntroduced): current member (subject) is re_group_member_id, was introduced to referenced member +-- - direction 1 (IDReferencedIntroduced): current member (subject) is to_group_member_id, referenced member was introduced to it + +-- TODO [relations vector] drop group_member_intros in the end of migration +m20251128_member_relations_vector_stage_2 :: Query +m20251128_member_relations_vector_stage_2 = + [sql| +UPDATE group_members +SET member_relations_vector = ( + SELECT migrate_relations_vector(idx, direction, intro_status) + FROM ( + SELECT m.index_in_group AS idx, 0 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.to_group_member_id + WHERE i.re_group_member_id = group_members.group_member_id + UNION ALL + SELECT m.index_in_group AS idx, 1 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.re_group_member_id + WHERE i.to_group_member_id = group_members.group_member_id + ) +) +WHERE member_relations_vector IS NULL; +|] + +-- TODO [relations vector] re-create group_member_intros +down_m20251128_member_relations_vector_stage_2 :: Query +down_m20251128_member_relations_vector_stage_2 = + [sql| + +|] diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt index 9156b56fcb..c46f6a5e7d 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt +++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt @@ -24,10 +24,10 @@ SEARCH contact_requests USING INTEGER PRIMARY KEY (rowid=?) Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -76,10 +76,10 @@ SEARCH groups USING INTEGER PRIMARY KEY (rowid=?) Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, sent_inv_queue_info, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -260,9 +260,9 @@ SEARCH users USING INTEGER PRIMARY KEY (rowid=?) Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -293,10 +293,10 @@ SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (conta Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, member_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -327,10 +327,10 @@ SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (conta Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, member_welcome_shared_msg_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -492,9 +492,9 @@ SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?) Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -525,10 +525,10 @@ SEARCH contacts USING COVERING INDEX idx_contacts_contact_group_member_id (conta Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -989,19 +989,12 @@ Query: Plan: -Query: - INSERT INTO group_member_intros - (re_group_member_id, to_group_member_id, intro_status, intro_chat_protocol_version, created_at, updated_at) - VALUES (?,?,?,?,?,?) - -Plan: - Query: INSERT INTO group_members - (group_id, index_in_group, member_id, member_role, member_category, member_status, member_restriction, invited_by, invited_by_group_member_id, + (group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, member_restriction, invited_by, invited_by_group_member_id, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -1191,24 +1184,6 @@ SEARCH c USING INDEX idx_connections_via_contact_uri_hash (user_id=? AND via_con SEARCH ct USING INTEGER PRIMARY KEY (rowid=?) SEARCH cp USING INTEGER PRIMARY KEY (rowid=?) -Query: - SELECT 1 - FROM group_member_intros - WHERE - ( - (re_group_member_id = ? AND to_group_member_id = ?) OR - (re_group_member_id = ? AND to_group_member_id = ?) - ) - AND intro_status NOT IN (?,?,?) - LIMIT 1 - -Plan: -MULTI-INDEX OR -INDEX 1 -SEARCH group_member_intros USING INDEX sqlite_autoindex_group_member_intros_1 (re_group_member_id=? AND to_group_member_id=?) -INDEX 2 -SEARCH group_member_intros USING INDEX sqlite_autoindex_group_member_intros_1 (re_group_member_id=? AND to_group_member_id=?) - Query: SELECT 1 FROM users WHERE (user_id = ? AND local_display_name = ?) @@ -1455,28 +1430,6 @@ Plan: SEARCH g USING INTEGER PRIMARY KEY (rowid=?) SEARCH i USING INTEGER PRIMARY KEY (rowid=?) -Query: - SELECT i.re_group_member_id - FROM group_member_intros i - JOIN group_members m ON m.group_member_id = i.re_group_member_id - WHERE i.to_group_member_id = ? AND i.intro_status NOT IN (?,?,?) - AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?) - -Plan: -SEARCH i USING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) -SEARCH m USING INTEGER PRIMARY KEY (rowid=?) - -Query: - SELECT i.to_group_member_id - FROM group_member_intros i - JOIN group_members m ON m.group_member_id = i.to_group_member_id - WHERE i.re_group_member_id = ? AND i.intro_status NOT IN (?,?,?) - AND (m.contact_id IS NULL OR m.contact_id != ?) AND m.member_role IN (?,?,?) - -Plan: -SEARCH i USING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) -SEARCH m USING INTEGER PRIMARY KEY (rowid=?) - Query: SELECT member_status FROM group_members @@ -1645,10 +1598,10 @@ SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?) Query: INSERT INTO group_members - ( group_id, index_in_group, member_id, member_role, member_category, member_status, invited_by, + ( group_id, index_in_group, member_id, member_role, member_category, member_status, member_relations_vector, invited_by, user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at, peer_chat_min_version, peer_chat_max_version) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) Plan: SEARCH delivery_jobs USING COVERING INDEX idx_delivery_jobs_single_sender_group_member_id (single_sender_group_member_id=?) @@ -3509,6 +3462,14 @@ Plan: SEARCH f USING INTEGER PRIMARY KEY (rowid=?) SEARCH i USING INTEGER PRIMARY KEY (rowid=?) +Query: + SELECT index_in_group, member_relations_vector + FROM group_members + WHERE local_display_name = ? + +Plan: +SCAN group_members + Query: SELECT m.group_member_id FROM group_members m @@ -3559,14 +3520,6 @@ SEARCH r USING INDEX idx_chat_item_mentions_chat_item_id (chat_item_id=?) SEARCH m USING INDEX sqlite_autoindex_group_members_1 (group_id=? AND member_id=?) LEFT-JOIN SEARCH p USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN -Query: - SELECT re_group_member_id - FROM group_member_intros - WHERE to_group_member_id = ? AND intro_status NOT IN (?,?,?) - AND intro_chat_protocol_version >= ? -Plan: -SEARCH group_member_intros USING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) - Query: SELECT reaction FROM chat_item_reactions @@ -3655,14 +3608,6 @@ Query: Plan: SEARCH protocol_servers USING INDEX idx_smp_servers_user_id (user_id=?) -Query: - SELECT to_group_member_id - FROM group_member_intros - WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?) - AND intro_chat_protocol_version >= ? -Plan: -SEARCH group_member_intros USING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) - Query: SELECT usage_conditions_id, conditions_commit, notified_at, created_at FROM usage_conditions @@ -3782,6 +3727,40 @@ SCAN group_members USING COVERING INDEX idx_group_members_user_id_local_display_ LIST SUBQUERY 2 SCAN group_members USING COVERING INDEX idx_group_members_user_id_local_display_name +Query: + UPDATE group_members + SET + member_relations_vector = ( + SELECT migrate_relations_vector(idx, direction, intro_status) + FROM ( + SELECT m.index_in_group AS idx, 0 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.to_group_member_id + WHERE i.re_group_member_id = group_members.group_member_id + UNION ALL + SELECT m.index_in_group AS idx, 1 AS direction, i.intro_status + FROM group_member_intros i + JOIN group_members m ON m.group_member_id = i.re_group_member_id + WHERE i.to_group_member_id = group_members.group_member_id + ) AS relations + ), + updated_at = ? + WHERE group_member_id = ? + AND member_relations_vector IS NULL + +Plan: +SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) +CORRELATED SCALAR SUBQUERY 3 +CO-ROUTINE relations +COMPOUND QUERY +LEFT-MOST SUBQUERY +SEARCH i USING INDEX idx_group_member_intros_re_group_member_id (re_group_member_id=?) +SEARCH m USING INTEGER PRIMARY KEY (rowid=?) +UNION ALL +SEARCH i USING INDEX idx_group_member_intros_to_group_member_id (to_group_member_id=?) +SEARCH m USING INTEGER PRIMARY KEY (rowid=?) +SCAN relations + Query: UPDATE group_members SET contact_id = ?, local_display_name = ?, contact_profile_id = ?, updated_at = ? @@ -3790,6 +3769,14 @@ Query: Plan: SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) +Query: + UPDATE group_members + SET member_relations_vector = ? + WHERE local_display_name = ? + +Plan: +SCAN group_members + Query: UPDATE groups SET member_index = member_index + 1 @@ -4739,12 +4726,12 @@ Plan: SEARCH contacts USING INTEGER PRIMARY KEY (rowid=?) Query: - UPDATE group_member_intros - SET intro_status = ?, updated_at = ? - WHERE group_member_intro_id = ? + UPDATE group_members + SET member_relations_vector = ?, updated_at = ? + WHERE group_member_id = ? Plan: -SEARCH group_member_intros USING INTEGER PRIMARY KEY (rowid=?) +SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) Query: UPDATE group_members @@ -5133,6 +5120,44 @@ SEARCH m USING INTEGER PRIMARY KEY (rowid=?) SEARCH p USING INTEGER PRIMARY KEY (rowid=?) SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JOIN +Query: + SELECT + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, + m.created_at, m.updated_at, + m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, + c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id, + c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.user_contact_link_id, + c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter, + c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version + FROM group_members m + JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) + LEFT JOIN connections c ON c.group_member_id = m.group_member_id + WHERE m.group_id = ? AND m.index_in_group = ? +Plan: +SEARCH m USING INDEX idx_group_members_group_id_index_in_group (group_id=? AND index_in_group=?) +SEARCH p USING INTEGER PRIMARY KEY (rowid=?) +SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JOIN + +Query: + SELECT + m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, + m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, + m.created_at, m.updated_at, + m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, + c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id, + c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.user_contact_link_id, + c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter, + c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version + FROM group_members m + JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) + LEFT JOIN connections c ON c.group_member_id = m.group_member_id + WHERE m.group_id = ? AND m.index_in_group = ? AND (m.member_role IN (?,?,?) OR m.group_member_id = ?) +Plan: +SEARCH m USING INDEX idx_group_members_group_id_index_in_group (group_id=? AND index_in_group=?) +SEARCH p USING INTEGER PRIMARY KEY (rowid=?) +SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JOIN + Query: SELECT m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, @@ -5209,25 +5234,6 @@ SEARCH m USING INDEX idx_group_members_group_id (user_id=? AND group_id=?) SEARCH p USING INTEGER PRIMARY KEY (rowid=?) SEARCH c USING INDEX idx_connections_group_member_id (group_member_id=?) LEFT-JOIN -Query: - SELECT - m.group_member_id, m.group_id, m.index_in_group, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction, - m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences, - m.created_at, m.updated_at, - m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts, - c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id, - c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.user_contact_link_id, - c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter, c.quota_err_counter, - c.conn_chat_version, c.peer_chat_min_version, c.peer_chat_max_version - FROM group_members m - JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id) - LEFT JOIN connections c ON c.group_member_id = m.group_member_id - WHERE m.user_id = ? AND m.group_id = ? AND (m.contact_id IS NULL OR m.contact_id != ?) AND index_in_group < ? -Plan: -SEARCH m USING INDEX idx_group_members_group_id_index_in_group (group_id=? AND index_in_group Word8 +toIntroDirInt = \case + IDSubjectIntroduced -> 0 + IDReferencedIntroduced -> 1 + +fromIntroDirInt :: Word8 -> IntroductionDirection +fromIntroDirInt = \case + 0 -> IDSubjectIntroduced + 1 -> IDReferencedIntroduced + _ -> IDSubjectIntroduced + data MemberRelation = MRNew | MRIntroduced - | MRConnected - deriving (Eq, Show) + | MRSubjectConnected -- Subject member notified about connection to referenced member + | MRReferencedConnected -- Referenced member notified about connection to subject member + | MRConnected -- Both members notified about connection + deriving (Eq, Ord, Show) toRelationInt :: MemberRelation -> Word8 toRelationInt = \case MRNew -> 0 MRIntroduced -> 1 - MRConnected -> 2 + MRSubjectConnected -> 2 + MRReferencedConnected -> 3 + MRConnected -> 4 fromRelationInt :: Word8 -> MemberRelation fromRelationInt = \case 0 -> MRNew 1 -> MRIntroduced - 2 -> MRConnected + 2 -> MRSubjectConnected + 3 -> MRReferencedConnected + 4 -> MRConnected _ -> MRNew +-- Bit layout: 4 reserved | 1 direction | 3 status + -- | Get the relation status of a member at a given index from the relations vector. -- Returns 'MRNew' if the vector is not long enough (lazy initialization). getRelation :: Int64 -> ByteString -> MemberRelation -getRelation i v - | i < 0 || fromIntegral i >= B.length v = MRNew - | otherwise = fromRelationInt $ (v `B.index` fromIntegral i) .&. relationMask +getRelation i v = snd $ getRelation' i v +-- | Get both direction and status of a member at a given index from the relations vector. +-- Returns (IDSubjectIntroduced, MRNew) if the vector is not long enough (lazy initialization). +getRelation' :: Int64 -> ByteString -> (IntroductionDirection, MemberRelation) +getRelation' i v + | i < 0 || fromIntegral i >= B.length v = (IDSubjectIntroduced, MRNew) + | otherwise = + let b = v `B.index` fromIntegral i + in (fromIntroDirInt $ (b .&. directionMask) `shiftR` 3, fromRelationInt $ b .&. statusMask) + +-- | Get the indexes of members with the given relation status from the relations vector. +getRelationsIndexes :: MemberRelation -> ByteString -> [Int64] +getRelationsIndexes r v = [i | i <- [0 .. fromIntegral (B.length v) - 1], getRelation i v == r] -- | Set the relation status of a member at a given index in the relations vector. --- Expands the vector lazily if needed (padding with zeros for 'MRNew' relation). +-- Preserves the introduction direction. Expands the vector lazily if needed. setRelation :: Int64 -> MemberRelation -> ByteString -> ByteString setRelation i r v | i >= 0 = setRelations [(i, r)] v | otherwise = v --- | Set multiple relations at once. --- Expands the vector lazily if needed (padding with zeros for 'MRNew' relation). +-- | Set multiple relation statuses at once. +-- Preserves the introduction direction. Expands the vector lazily if needed. setRelations :: [(Int64, MemberRelation)] -> ByteString -> ByteString -setRelations [] v = v -setRelations relations v = +setRelations = setRelations_ $ \r b -> (b .&. complement statusMask) .|. toRelationInt r + +-- | Set relation to connected state based on passed status and current status. +-- newStatus should be MRSubjectConnected or MRReferencedConnected, otherwise returns vector unchanged. +-- Logic: +-- - if newStatus is complementary to oldStatus -> set MRConnected +-- - if newStatus > oldStatus (by enum order) -> set newStatus +-- - otherwise don't update +setRelationConnected :: Int64 -> MemberRelation -> ByteString -> ByteString +setRelationConnected i newStatus v + | newStatus /= MRSubjectConnected && newStatus /= MRReferencedConnected = v + | otherwise = case status' of + Nothing -> v + Just s -> setRelation i s v + where + oldStatus = getRelation i v + status' = case (oldStatus, newStatus) of + -- complementary statuses -> MRConnected + (MRSubjectConnected, MRReferencedConnected) -> Just MRConnected + (MRReferencedConnected, MRSubjectConnected) -> Just MRConnected + -- newStatus > oldStatus -> set newStatus + _ | newStatus > oldStatus -> Just newStatus + | otherwise -> Nothing + +-- | Set a new relation with both direction and status at a given index. +-- Expands the vector lazily if needed. +setNewRelation :: Int64 -> IntroductionDirection -> MemberRelation -> ByteString -> ByteString +setNewRelation i dir r v + | i >= 0 = setNewRelations [(i, (dir, r))] v + | otherwise = v + +-- | Set multiple new relations with both direction and status at once. +-- Expands the vector lazily if needed. +setNewRelations :: [(Int64, (IntroductionDirection, MemberRelation))] -> ByteString -> ByteString +setNewRelations = setRelations_ $ \(dir, r) b -> (b .&. relationMask) .|. (toIntroDirInt dir `shiftL` 3) .|. toRelationInt r + where + relationMask = complement (statusMask .|. directionMask) + +setRelations_ :: (r -> Word8 -> Word8) -> [(Int64, r)] -> ByteString -> ByteString +setRelations_ _ [] v = v +setRelations_ updateByte relations v = let (fp, off, len) = toForeignPtr v newLen = max len $ fromIntegral $ maximum (map fst relations) + 1 in unsafeCreate newLen $ \ptr -> do withForeignPtr fp $ \vPtr -> copyBytes ptr (vPtr `plusPtr` off) len when (newLen > len) $ fillBytes (ptr `plusPtr` len) 0 (newLen - len) - forM_ relations $ \(ix, r) -> when (ix >= 0) $ do + forM_ relations $ \(ix, r) -> when (ix >= 0) $ let i = fromIntegral ix - b <- peekByteOff ptr i - let b' = (b .&. complement relationMask) .|. toRelationInt r - pokeByteOff ptr i b' + in pokeByteOff ptr i . updateByte r =<< peekByteOff ptr i -relationMask :: Word8 -relationMask = 0x07 -- reserving 3 bits +statusMask :: Word8 +statusMask = 0x07 -- bits 0-2 + +directionMask :: Word8 +directionMask = 0x08 -- bit 3 diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index c16f76148f..f4a995adfe 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -24,7 +24,6 @@ import Data.Function (on) import Data.Int (Int64) import Data.List (groupBy, intercalate, intersperse, sortOn) import Data.List.NonEmpty (NonEmpty (..)) -import qualified Data.List.NonEmpty as L import Data.Map.Strict (Map) import qualified Data.Map.Strict as M import Data.Maybe (fromMaybe, isJust, isNothing, mapMaybe) diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index 4c5efa26b6..42562d8e16 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -18,6 +18,7 @@ import Control.Concurrent (threadDelay) import Control.Concurrent.Async (concurrently_) import Control.Monad (forM_, void, when) import Data.Bifunctor (second) +import Data.Maybe (fromMaybe) import qualified Data.ByteString.Char8 as B import Data.Int (Int64) import Data.List (intercalate, isInfixOf) @@ -30,10 +31,12 @@ import Simplex.Chat.Messages (CIMention (..), CIMentionMember (..), ChatItemId) import Simplex.Chat.Options import Simplex.Chat.Protocol (MsgMention (..), MsgContent (..), msgContentText) import Simplex.Chat.Types +import Simplex.Chat.Types.MemberRelations (MemberRelation (..), setRelation) import Simplex.Chat.Types.Shared (GroupMemberRole (..), GroupAcceptance (..)) import Simplex.Messaging.Agent.Env.SQLite import Simplex.Messaging.Agent.RetryInterval import qualified Simplex.Messaging.Agent.Store.DB as DB +import Simplex.Messaging.Agent.Store.DB (Binary (..)) import Simplex.Messaging.Encoding.String import Simplex.Messaging.Server.Env.STM hiding (subscriptions) import Simplex.Messaging.Transport @@ -1769,6 +1772,7 @@ testGroupDelayedModeration ps = do -- and forwarding client doesn't check compatibility) void $ withCCTransaction alice $ \db -> DB.execute_ db "UPDATE group_member_intros SET intro_status='con'" + updateGroupForwardingVectors alice "bob" "cath" MRConnected cath #> "#team hi" -- message is pending for bob alice <# "#team cath> hi" @@ -1815,6 +1819,7 @@ testGroupDelayedModerationFullDelete ps = do -- and forwarding client doesn't check compatibility) void $ withCCTransaction alice $ \db -> DB.execute_ db "UPDATE group_member_intros SET intro_status='con'" + updateGroupForwardingVectors alice "bob" "cath" MRConnected cath #> "#team hi" -- message is pending for bob alice <# "#team cath> hi" @@ -5018,7 +5023,7 @@ testGroupMsgForwardReport = setupGroupForwarding :: TestCC -> TestCC -> TestCC -> IO () setupGroupForwarding host invitee1 invitee2 = do - threadDelay 1000000 -- delay so intro_status doesn't get overwritten to connected + threadDelay 1000000 -- delay so member relations don't get overwritten to connected invitee1Name <- userName invitee1 invitee2Name <- userName invitee2 @@ -5050,15 +5055,60 @@ setupGroupForwarding host invitee1 invitee2 = do |] (invitee1Name, invitee2Name) + setupGroupForwardingVectors host invitee1 invitee2 + +setupGroupForwardingVectors :: TestCC -> TestCC -> TestCC -> IO () +setupGroupForwardingVectors host invitee1 invitee2 = do + invitee1Name <- userName invitee1 + invitee2Name <- userName invitee2 + updateGroupForwardingVectors host invitee1Name invitee2Name MRIntroduced + +updateGroupForwardingVectors :: TestCC -> String -> String -> MemberRelation -> IO () +updateGroupForwardingVectors host invitee1Name invitee2Name relation = do + void $ withCCTransaction host $ \db -> do + [(invitee1Index, invitee1Vec)] <- DB.query db + [sql| + SELECT index_in_group, member_relations_vector + FROM group_members + WHERE local_display_name = ? + |] + (Only invitee1Name) + [(invitee2Index, invitee2Vec)] <- DB.query db + [sql| + SELECT index_in_group, member_relations_vector + FROM group_members + WHERE local_display_name = ? + |] + (Only invitee2Name) + + let invitee1Vec' = setRelation invitee2Index relation (fromMaybe B.empty invitee1Vec) + DB.execute db + [sql| + UPDATE group_members + SET member_relations_vector = ? + WHERE local_display_name = ? + |] + (Binary invitee1Vec', invitee1Name) + + let invitee2Vec' = setRelation invitee1Index relation (fromMaybe B.empty invitee2Vec) + DB.execute db + [sql| + UPDATE group_members + SET member_relations_vector = ? + WHERE local_display_name = ? + |] + (Binary invitee2Vec', invitee2Name) + testGroupMsgForwardDeduplicate :: HasCallStack => TestParams -> IO () testGroupMsgForwardDeduplicate = testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do createGroup3 "team" alice bob cath - threadDelay 1000000 -- delay so intro_status doesn't get overwritten to connected + threadDelay 1000000 -- delay so member relations don't get overwritten to connected void $ withCCTransaction alice $ \db -> DB.execute_ db "UPDATE group_member_intros SET intro_status='fwd'" + setupGroupForwardingVectors alice bob cath bob #> "#team hi there" alice <# "#team bob> hi there" diff --git a/tests/MemberRelationsTests.hs b/tests/MemberRelationsTests.hs index 968dcbec43..c1afbd7f6a 100644 --- a/tests/MemberRelationsTests.hs +++ b/tests/MemberRelationsTests.hs @@ -29,21 +29,23 @@ memberRelationsTests = do getRelation 0 vec `shouldBe` MRIntroduced it "reads multiple relations" $ do - let vec = B.pack [0, 0, 1, 2] + let vec = B.pack [0, 0, 1, 2, 3, 4] getRelation 0 vec `shouldBe` MRNew getRelation 1 vec `shouldBe` MRNew getRelation 2 vec `shouldBe` MRIntroduced - getRelation 3 vec `shouldBe` MRConnected + getRelation 3 vec `shouldBe` MRSubjectConnected + getRelation 4 vec `shouldBe` MRReferencedConnected + getRelation 5 vec `shouldBe` MRConnected it "reads multiple relations 2" $ do let vec = B.pack [1, 1, 0, 0, 2, 2, 0, 0] getRelation 0 vec `shouldBe` MRIntroduced getRelation 1 vec `shouldBe` MRIntroduced - getRelation 4 vec `shouldBe` MRConnected - getRelation 5 vec `shouldBe` MRConnected + getRelation 4 vec `shouldBe` MRSubjectConnected + getRelation 5 vec `shouldBe` MRSubjectConnected it "ignore reserved bits" $ do - let vec = B.pack [0xF9] -- 11111001 + let vec = B.pack [0xF1] -- reserved=1111, direction=0, status=001 getRelation 0 vec `shouldBe` MRIntroduced describe "setRelation" $ do @@ -56,9 +58,9 @@ memberRelationsTests = do vec `shouldBe` B.empty it "expands vector to required length" $ do - let vec = setRelation 5 MRConnected B.empty + let vec = setRelation 5 MRSubjectConnected B.empty B.length vec `shouldBe` 6 - getRelation 5 vec `shouldBe` MRConnected + getRelation 5 vec `shouldBe` MRSubjectConnected -- Other positions should be MRNew (0) getRelation 0 vec `shouldBe` MRNew getRelation 10 vec `shouldBe` MRNew @@ -69,21 +71,21 @@ memberRelationsTests = do let vec1 = setRelation 0 MRIntroduced B.empty let vec2 = setRelation 1 MRIntroduced vec1 -- Update: [01][10][00][00] - let vec3 = setRelation 1 MRConnected vec2 + let vec3 = setRelation 1 MRSubjectConnected vec2 getRelation 0 vec3 `shouldBe` MRIntroduced - getRelation 1 vec3 `shouldBe` MRConnected + getRelation 1 vec3 `shouldBe` MRSubjectConnected it "updates relation in specific byte of multi-byte vector" $ do let vec1 = setRelation 0 MRIntroduced B.empty - let vec2 = setRelation 10 MRConnected vec1 + let vec2 = setRelation 10 MRSubjectConnected vec1 B.length vec2 `shouldBe` 11 getRelation 0 vec2 `shouldBe` MRIntroduced - getRelation 10 vec2 `shouldBe` MRConnected + getRelation 10 vec2 `shouldBe` MRSubjectConnected forM_ [1..9] $ \i -> getRelation i vec2 `shouldBe` MRNew it "handles setting relation at last position in byte" $ do - let vec = setRelation 3 MRConnected B.empty - getRelation 3 vec `shouldBe` MRConnected + let vec = setRelation 3 MRSubjectConnected B.empty + getRelation 3 vec `shouldBe` MRSubjectConnected it "preserves vector when setting same value" $ do let vec1 = setRelation 0 MRIntroduced B.empty @@ -91,12 +93,24 @@ memberRelationsTests = do vec2 `shouldBe` vec1 getRelation 0 vec2 `shouldBe` MRIntroduced - it "preserves reserved bits" $ do - let v = B.pack [0xF8] -- 11111000 + it "preserves reserved bits and direction" $ do + let v = B.pack [0xF8] -- reserved=1111, direction=1, status=000 getRelation 0 v `shouldBe` MRNew - let v' = setRelation 0 MRIntroduced v - getRelation 0 v' `shouldBe` MRIntroduced - B.unpack v' `shouldBe` [0xF9] -- 11111001 + let v' = setRelation 0 MRConnected v + getRelation 0 v' `shouldBe` MRConnected + B.unpack v' `shouldBe` [0xFC] -- reserved=1111, direction=1, status=100 + + describe "setNewRelation" $ do + it "sets new relation with direction" $ do + let vec = setNewRelation 0 IDReferencedIntroduced MRSubjectConnected B.empty + getRelation' 0 vec `shouldBe` (IDReferencedIntroduced, MRSubjectConnected) + B.unpack vec `shouldBe` [0x0A] -- direction=1, status=010 + + it "preserves reserved bits" $ do + let v = B.pack [0xF0] -- reserved=1111, direction=0, status=000 + let v' = setNewRelation 0 IDReferencedIntroduced MRConnected v + getRelation 0 v' `shouldBe` MRConnected + B.unpack v' `shouldBe` [0xFC] -- reserved=1111, direction=1, status=100 describe "setRelations" $ do it "returns same vector for empty list" $ do @@ -104,106 +118,183 @@ memberRelationsTests = do setRelations [] vec `shouldBe` vec it "sets multiple relations in empty vector" $ do - let updates = [(0, MRIntroduced), (1, MRConnected), (2, MRIntroduced)] + let updates = [(0, MRIntroduced), (1, MRSubjectConnected), (2, MRReferencedConnected), (3, MRConnected)] let vec = setRelations updates B.empty getRelation 0 vec `shouldBe` MRIntroduced - getRelation 1 vec `shouldBe` MRConnected - getRelation 2 vec `shouldBe` MRIntroduced - getRelation 3 vec `shouldBe` MRNew -- Unset position + getRelation 1 vec `shouldBe` MRSubjectConnected + getRelation 2 vec `shouldBe` MRReferencedConnected + getRelation 3 vec `shouldBe` MRConnected + getRelation 4 vec `shouldBe` MRNew -- Unset position it "sets multiple relations 1" $ do - let updates = [(0, MRIntroduced), (1, MRConnected), (2, MRConnected), (3, MRIntroduced)] + let updates = [(0, MRIntroduced), (1, MRSubjectConnected), (2, MRSubjectConnected), (3, MRIntroduced)] let vec = setRelations updates B.empty B.length vec `shouldBe` 4 getRelation 0 vec `shouldBe` MRIntroduced - getRelation 1 vec `shouldBe` MRConnected - getRelation 2 vec `shouldBe` MRConnected + getRelation 1 vec `shouldBe` MRSubjectConnected + getRelation 2 vec `shouldBe` MRSubjectConnected getRelation 3 vec `shouldBe` MRIntroduced it "sets multiple relations 2" $ do - let updates = [(0, MRIntroduced), (5, MRConnected), (10, MRIntroduced)] + let updates = [(0, MRIntroduced), (5, MRSubjectConnected), (10, MRIntroduced)] let vec = setRelations updates B.empty B.length vec `shouldBe` 11 getRelation 0 vec `shouldBe` MRIntroduced - getRelation 5 vec `shouldBe` MRConnected + getRelation 5 vec `shouldBe` MRSubjectConnected getRelation 10 vec `shouldBe` MRIntroduced getRelation 7 vec `shouldBe` MRNew -- Unset position between it "handles sparse updates (few indices in large range)" $ do -- Sparse: 3 updates in large group - let updates = [(0, MRIntroduced), (100, MRConnected), (5000, MRIntroduced)] + let updates = [(0, MRIntroduced), (100, MRSubjectConnected), (5000, MRIntroduced)] let vec = setRelations updates B.empty getRelation 0 vec `shouldBe` MRIntroduced - getRelation 100 vec `shouldBe` MRConnected + getRelation 100 vec `shouldBe` MRSubjectConnected getRelation 5000 vec `shouldBe` MRIntroduced getRelation 50 vec `shouldBe` MRNew -- Untouched position it "handles dense updates (many consecutive indices)" $ do -- Dense: many consecutive updates - let updates = [(i, if even i then MRIntroduced else MRConnected) | i <- [0 .. 99]] + let updates = [(i, if even i then MRIntroduced else MRSubjectConnected) | i <- [0 .. 99]] let vec = setRelations updates B.empty - all (\i -> getRelation i vec == (if even i then MRIntroduced else MRConnected)) [0 .. 99] `shouldBe` True + all (\i -> getRelation i vec == (if even i then MRIntroduced else MRSubjectConnected)) [0 .. 99] `shouldBe` True it "handles unsorted input correctly" $ do - let updates = [(10, MRConnected), (2, MRIntroduced), (5, MRConnected), (0, MRIntroduced)] + let updates = [(10, MRSubjectConnected), (2, MRIntroduced), (5, MRSubjectConnected), (0, MRIntroduced)] let vec = setRelations updates B.empty getRelation 0 vec `shouldBe` MRIntroduced getRelation 2 vec `shouldBe` MRIntroduced - getRelation 5 vec `shouldBe` MRConnected - getRelation 10 vec `shouldBe` MRConnected + getRelation 5 vec `shouldBe` MRSubjectConnected + getRelation 10 vec `shouldBe` MRSubjectConnected it "handles duplicate indices (last one wins)" $ do - let updates = [(0, MRIntroduced), (0, MRConnected), (0, MRIntroduced)] + let updates = [(0, MRIntroduced), (0, MRSubjectConnected), (0, MRIntroduced)] let vec = setRelations updates B.empty getRelation 0 vec `shouldBe` MRIntroduced it "preserves existing relations not in update list" $ do - let vec1 = setRelation 0 MRConnected B.empty + let vec1 = setRelation 0 MRSubjectConnected B.empty let vec2 = setRelation 5 MRIntroduced vec1 - let updates = [(10, MRConnected)] + let updates = [(10, MRSubjectConnected)] let vec3 = setRelations updates vec2 - getRelation 0 vec3 `shouldBe` MRConnected + getRelation 0 vec3 `shouldBe` MRSubjectConnected getRelation 5 vec3 `shouldBe` MRIntroduced - getRelation 10 vec3 `shouldBe` MRConnected + getRelation 10 vec3 `shouldBe` MRSubjectConnected + + describe "setNewRelations" $ do + it "sets multiple new relations with direction" $ do + let updates = [(0, (IDSubjectIntroduced, MRIntroduced)), (1, (IDReferencedIntroduced, MRSubjectConnected))] + let vec = setNewRelations updates B.empty + getRelation 0 vec `shouldBe` MRIntroduced + getRelation 1 vec `shouldBe` MRSubjectConnected + B.unpack vec `shouldBe` [0x01, 0x0A] -- [dir=0,status=001], [dir=1,status=010] describe "edge cases and invariants" $ do it "round-trip: set then get returns same value" $ do - let vec1 = setRelation 42 MRConnected B.empty - getRelation 42 vec1 `shouldBe` MRConnected + let vec1 = setRelation 42 MRSubjectConnected B.empty + getRelation 42 vec1 `shouldBe` MRSubjectConnected it "multiple round-trips preserve values" $ do let vec1 = setRelation 0 MRIntroduced B.empty - let vec2 = setRelation 1 MRConnected vec1 - let vec3 = setRelation 2 MRIntroduced vec2 - getRelation 0 vec3 `shouldBe` MRIntroduced - getRelation 1 vec3 `shouldBe` MRConnected - getRelation 2 vec3 `shouldBe` MRIntroduced + let vec2 = setRelation 1 MRSubjectConnected vec1 + let vec3 = setRelation 2 MRReferencedConnected vec2 + let vec4 = setRelation 3 MRConnected vec3 + getRelation 0 vec4 `shouldBe` MRIntroduced + getRelation 1 vec4 `shouldBe` MRSubjectConnected + getRelation 2 vec4 `shouldBe` MRReferencedConnected + getRelation 3 vec4 `shouldBe` MRConnected it "setRelations equivalent to multiple setRelation calls" $ do - let updates = [(0, MRIntroduced), (5, MRConnected), (10, MRIntroduced)] + let updates = [(0, MRIntroduced), (5, MRSubjectConnected), (10, MRConnected)] let vecBatch = setRelations updates B.empty - let vecSeq = setRelation 10 MRIntroduced $ setRelation 5 MRConnected $ setRelation 0 MRIntroduced B.empty + let vecSeq = setRelation 10 MRConnected $ setRelation 5 MRSubjectConnected $ setRelation 0 MRIntroduced B.empty vecBatch `shouldBe` vecSeq getRelation 0 vecBatch `shouldBe` getRelation 0 vecSeq getRelation 5 vecBatch `shouldBe` getRelation 5 vecSeq getRelation 10 vecBatch `shouldBe` getRelation 10 vecSeq it "handles large group size (10000 members)" $ do - let updates = [(0, MRIntroduced), (5000, MRConnected), (9999, MRIntroduced)] + let updates = [(0, MRIntroduced), (5000, MRSubjectConnected), (9999, MRIntroduced)] let vec = setRelations updates B.empty B.length vec `shouldBe` 10000 getRelation 0 vec `shouldBe` MRIntroduced - getRelation 5000 vec `shouldBe` MRConnected + getRelation 5000 vec `shouldBe` MRSubjectConnected getRelation 9999 vec `shouldBe` MRIntroduced it "all status values can be stored and retrieved" $ do let vec1 = setRelation 0 MRNew B.empty let vec2 = setRelation 1 MRIntroduced vec1 - let vec3 = setRelation 2 MRConnected vec2 - getRelation 0 vec3 `shouldBe` MRNew - getRelation 1 vec3 `shouldBe` MRIntroduced - getRelation 2 vec3 `shouldBe` MRConnected + let vec3 = setRelation 2 MRSubjectConnected vec2 + let vec4 = setRelation 3 MRReferencedConnected vec3 + let vec5 = setRelation 4 MRConnected vec4 + getRelation 0 vec5 `shouldBe` MRNew + getRelation 1 vec5 `shouldBe` MRIntroduced + getRelation 2 vec5 `shouldBe` MRSubjectConnected + getRelation 3 vec5 `shouldBe` MRReferencedConnected + getRelation 4 vec5 `shouldBe` MRConnected it "vector length is minimal (lazy expansion)" $ do - let vec = setRelation 3 MRConnected B.empty + let vec = setRelation 3 MRSubjectConnected B.empty B.length vec `shouldBe` 4 + + it "setRelation preserves existing direction" $ do + let vec1 = setNewRelation 0 IDReferencedIntroduced MRIntroduced B.empty + let vec2 = setRelation 0 MRConnected vec1 + getRelation 0 vec2 `shouldBe` MRConnected + B.unpack vec2 `shouldBe` [0x0C] -- direction=1 preserved, status=100 + + describe "setRelationConnected" $ do + it "MRSubjectConnected on MRIntroduced -> MRSubjectConnected" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelationConnected 0 MRSubjectConnected vec1 + getRelation 0 vec2 `shouldBe` MRSubjectConnected + + it "MRReferencedConnected on MRIntroduced -> MRReferencedConnected" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelationConnected 0 MRReferencedConnected vec1 + getRelation 0 vec2 `shouldBe` MRReferencedConnected + + it "MRSubjectConnected on MRReferencedConnected -> MRConnected (complementary)" $ do + let vec1 = setRelation 0 MRReferencedConnected B.empty + let vec2 = setRelationConnected 0 MRSubjectConnected vec1 + getRelation 0 vec2 `shouldBe` MRConnected + + it "MRReferencedConnected on MRSubjectConnected -> MRConnected (complementary)" $ do + let vec1 = setRelation 0 MRSubjectConnected B.empty + let vec2 = setRelationConnected 0 MRReferencedConnected vec1 + getRelation 0 vec2 `shouldBe` MRConnected + + it "MRSubjectConnected on MRSubjectConnected -> no change" $ do + let vec1 = setRelation 0 MRSubjectConnected B.empty + let vec2 = setRelationConnected 0 MRSubjectConnected vec1 + vec2 `shouldBe` vec1 + + it "MRReferencedConnected on MRReferencedConnected -> no change" $ do + let vec1 = setRelation 0 MRReferencedConnected B.empty + let vec2 = setRelationConnected 0 MRReferencedConnected vec1 + vec2 `shouldBe` vec1 + + it "MRSubjectConnected on MRConnected -> no change" $ do + let vec1 = setRelation 0 MRConnected B.empty + let vec2 = setRelationConnected 0 MRSubjectConnected vec1 + vec2 `shouldBe` vec1 + + it "MRReferencedConnected on MRConnected -> no change" $ do + let vec1 = setRelation 0 MRConnected B.empty + let vec2 = setRelationConnected 0 MRReferencedConnected vec1 + vec2 `shouldBe` vec1 + + it "invalid status (MRConnected) -> no change" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelationConnected 0 MRConnected vec1 + vec2 `shouldBe` vec1 + + it "invalid status (MRNew) -> no change" $ do + let vec1 = setRelation 0 MRIntroduced B.empty + let vec2 = setRelationConnected 0 MRNew vec1 + vec2 `shouldBe` vec1 + + it "setRelationConnected preserves direction when updating" $ do + let vec1 = setNewRelation 0 IDReferencedIntroduced MRIntroduced B.empty + let vec2 = setRelationConnected 0 MRSubjectConnected vec1 + getRelation' 0 vec2 `shouldBe` (IDReferencedIntroduced, MRSubjectConnected) diff --git a/tests/SchemaDump.hs b/tests/SchemaDump.hs index b1b7dbc264..8a716ddf11 100644 --- a/tests/SchemaDump.hs +++ b/tests/SchemaDump.hs @@ -18,6 +18,7 @@ import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.IO as T import Database.SQLite.Simple (Query (..)) +import Simplex.Chat.Options.SQLite (chatDBFunctions) import Simplex.Chat.Store (createChatStore) import qualified Simplex.Chat.Store as Store import Simplex.Messaging.Agent.Env.SQLite (createAgentStore) @@ -63,7 +64,7 @@ testVerifySchemaDump :: IO () testVerifySchemaDump = withTmpFiles $ do savedSchema <- ifM (doesFileExist appSchema) (readFile appSchema) (pure "") savedSchema `deepseq` pure () - void $ createChatStore (DBOpts testDB "" False True TQOff) (MigrationConfig MCError Nothing) + void $ createChatStore (DBOpts testDB chatDBFunctions "" False True TQOff) (MigrationConfig MCError Nothing) getSchema testDB appSchema `shouldReturn` savedSchema removeFile testDB @@ -71,14 +72,14 @@ testVerifyLintFKeyIndexes :: IO () testVerifyLintFKeyIndexes = withTmpFiles $ do savedLint <- ifM (doesFileExist appLint) (readFile appLint) (pure "") savedLint `deepseq` pure () - void $ createChatStore (DBOpts testDB "" False True TQOff) (MigrationConfig MCError Nothing) + void $ createChatStore (DBOpts testDB chatDBFunctions "" False True TQOff) (MigrationConfig MCError Nothing) getLintFKeyIndexes testDB "tests/tmp/chat_lint.sql" `shouldReturn` savedLint removeFile testDB testSchemaMigrations :: IO () testSchemaMigrations = withTmpFiles $ do let noDownMigrations = dropWhileEnd (\Migration {down} -> isJust down) Store.migrations - Right st <- createDBStore (DBOpts testDB "" False True TQOff) noDownMigrations (MigrationConfig MCError Nothing) + Right st <- createDBStore (DBOpts testDB chatDBFunctions "" False True TQOff) noDownMigrations (MigrationConfig MCError Nothing) mapM_ (testDownMigration st) $ drop (length noDownMigrations) Store.migrations closeDBStore st removeFile testDB @@ -152,7 +153,7 @@ saveQueryPlans = it "verify and overwrite query plans" $ \TestParams {chatQueryS updatePlans appChatQueryPlans chatQueryStats - (createChatStore (DBOpts testDB "" False True TQOff) (MigrationConfig MCError Nothing)) + (createChatStore (DBOpts testDB chatDBFunctions "" False True TQOff) (MigrationConfig MCError Nothing)) (\db -> do DB.execute_ db "CREATE TABLE IF NOT EXISTS temp_conn_ids (conn_id BLOB)" DB.execute_ db "CREATE TABLE IF NOT EXISTS temp_delete_members (contact_profile_id INTEGER, member_profile_id INTEGER, local_display_name TEXT)" @@ -161,7 +162,7 @@ saveQueryPlans = it "verify and overwrite query plans" $ \TestParams {chatQueryS updatePlans appAgentQueryPlans agentQueryStats - (createAgentStore (DBOpts testAgentDB "" False True TQOff) (MigrationConfig MCError Nothing)) + (createAgentStore (DBOpts testAgentDB [] "" False True TQOff) (MigrationConfig MCError Nothing)) (const $ pure ()) chatSavedPlans' == chatSavedPlans `shouldBe` True agentSavedPlans' == agentSavedPlans `shouldBe` True From c5a69a49500d60bc66a0de30dad65c36857418fa Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:30:53 +0000 Subject: [PATCH 22/32] scripts/build-android: make build reproducible (#6493) * scripts/build-android: attempt to make it reproducible * scripts/build-android: set epoch to 1764547200 --- scripts/android/build-android.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/android/build-android.sh b/scripts/android/build-android.sh index 97190ec103..90d6092385 100755 --- a/scripts/android/build-android.sh +++ b/scripts/android/build-android.sh @@ -138,10 +138,15 @@ build() { mkdir -p "$android_tmp_folder" unzip -oqd "$android_tmp_folder" "$android_apk_output" + # Determenistic build + find "$android_tmp_folder" -type f -exec chmod 644 {} + + find "$android_tmp_folder" -type d -exec chmod 755 {} + + find "$android_tmp_folder" -exec touch -h -d '@1764547200' {} + + ( cd "$android_tmp_folder" && \ - zip -rq5 "$tmp/$android_apk_output_final" . && \ - zip -rq0 "$tmp/$android_apk_output_final" resources.arsc res + find . -type f -print0 | sort -z | xargs -0 zip -X -rq5 "$tmp/$android_apk_output_final" && \ + find res resources.arsc -type f -print0 | sort -z | xargs -0 zip -X -rq0 "$tmp/$android_apk_output_final" ) zipalign -p -f 4 "$tmp/$android_apk_output_final" "$PWD/$android_apk_output_final" From 267e680698abb01469a4e581ed38ccfd38891fe7 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:50:26 +0000 Subject: [PATCH 23/32] nix: make android library reproducible (#6486) * nix: make android aarch64 library reproducible * src/Operators: embed PRIVACY.md without full paths * nix: make android library reproducible * Update src/Simplex/Chat/Operators.hs Co-authored-by: Evgeny * nix: remove unnecessary flags and apply changes to armv7a * nix: strip libraries from debug symbols * nix: strip before timestamp normalization * nix: set epoch to 1764547200 --------- Co-authored-by: Evgeny --- flake.nix | 50 ++++++++++++++++++++++++++++------- src/Simplex/Chat/Operators.hs | 2 +- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index a68b42e2f1..c130e1a1fd 100644 --- a/flake.nix +++ b/flake.nix @@ -41,14 +41,24 @@ }; sha256map = import ./scripts/nix/sha256map.nix; modules = [ - ({ pkgs, lib, ...}: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) { - # This patch adds `dl` as an extra-library to direct-sqlciper, which is needed - # on pretty much all unix platforms, but then blows up on windows m( - packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ]; - }) - ({ pkgs,lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) { - packages.simplex-chat.components.library.ghcOptions = [ "-pie" ]; - })] ++ extra-modules; + ({ pkgs, lib, config, ... }: + { + # Override ghcOptions for ALL packages + ghcOptions = lib.mkDefault [ + "-j1" + ]; + } + ) + + ({ pkgs, lib, ...}: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) { + # This patch adds `dl` as an extra-library to direct-sqlciper, which is needed + # on pretty much all unix platforms, but then blows up on windows m( + packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ]; + }) + + ({ pkgs,lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) { + packages.simplex-chat.components.library.ghcOptions = [ "-pie" ]; + })] ++ extra-modules; }; in # by defualt we don't need to pass extra-modules. let drv = pkgs': drv' { extra-modules = []; inherit pkgs'; }; in @@ -368,6 +378,7 @@ "-threaded" # "-debug" "-optl-lffi" + "-j1" ] # This is fairly idiotic. LLD will strip out foreign exported # symbols (a GHC bug? Codegen bug?). So we need to pass `-u ` @@ -433,7 +444,16 @@ done ${pkgs.tree}/bin/tree $out/_pkg - (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-armv7a-android-libsimplex.zip *) + + # Strip from debug symbols + find "$out/_pkg" -type f -name "*.so" -exec ${android32Pkgs.stdenv.cc.targetPrefix}strip --strip-unneeded {} + + + # Normalize permissions + timestamps + find "$out/_pkg" -type f -exec chmod 644 {} + + find "$out/_pkg" -type d -exec chmod 755 {} + + find "$out/_pkg" -exec touch -h -d '@1764547200' {} + + + (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 -X $out/pkg-armv7a-android-libsimplex.zip *) rm -fR $out/_pkg mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.zip)\"" \ @@ -477,6 +497,7 @@ # "-debug" "-optl-lffi" "-optl-Wl,-z,max-page-size=16384" + "-j1" ] # This is fairly idiotic. LLD will strip out foreign exported # symbols (a GHC bug? Codegen bug?). So we need to pass `-u ` @@ -542,7 +563,16 @@ done ${pkgs.tree}/bin/tree $out/_pkg - (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-aarch64-android-libsimplex.zip *) + + # Strip from debug symbols + find "$out/_pkg" -type f -name "*.so" -exec ${androidPkgs.stdenv.cc.targetPrefix}strip --strip-unneeded {} + + + # Normalize permissions + timestamps + find "$out/_pkg" -type f -exec chmod 644 {} + + find "$out/_pkg" -type d -exec chmod 755 {} + + find "$out/_pkg" -exec touch -h -d '@1764547200' {} + + + (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 -X $out/pkg-aarch64-android-libsimplex.zip *) rm -fR $out/_pkg mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.zip)\"" \ diff --git a/src/Simplex/Chat/Operators.hs b/src/Simplex/Chat/Operators.hs index 24baa37e4e..08c7b84087 100644 --- a/src/Simplex/Chat/Operators.hs +++ b/src/Simplex/Chat/Operators.hs @@ -63,7 +63,7 @@ previousConditionsCommit = "a5061f3147165a05979d6ace33960aced2d6ac03" usageConditionsText :: Text usageConditionsText = - $( let s = $(embedFile =<< makeRelativeToProject "PRIVACY.md") + $( let s = $(embedFile "PRIVACY.md") in [|stripFrontMatter $(lift (safeDecodeUtf8 s))|] ) From 8089a8c7ef9843cd303820b0ae1d5b5d70543608 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Wed, 10 Dec 2025 09:51:03 +0000 Subject: [PATCH 24/32] desktop: fix linking mobile and connecting after onboarding. Also fixes other cases when core controller changes in android/desktop. (#6489) --- .../chat/simplex/common/model/CryptoFile.kt | 4 +- .../chat/simplex/common/model/SimpleXAPI.kt | 37 ++++++++++++++----- .../chat/simplex/common/platform/Core.kt | 5 ++- .../chat/simplex/common/ui/theme/Theme.kt | 3 +- .../common/views/chatlist/UserPicker.kt | 2 +- .../common/views/database/DatabaseView.kt | 3 +- .../common/views/localauth/LocalAuthView.kt | 4 +- .../common/views/migration/MigrateToDevice.kt | 2 +- 8 files changed, 40 insertions(+), 20 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/CryptoFile.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/CryptoFile.kt index 28b46f592d..6ef56a9124 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/CryptoFile.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/CryptoFile.kt @@ -21,7 +21,7 @@ sealed class WriteFileResult { * */ fun writeCryptoFile(path: String, data: ByteArray): CryptoFileArgs { - val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized") + val ctrl = ChatController.getChatCtrl() ?: throw Exception("Controller is not initialized") val buffer = ByteBuffer.allocateDirect(data.size) buffer.put(data) buffer.rewind() @@ -44,7 +44,7 @@ fun readCryptoFile(path: String, cryptoArgs: CryptoFileArgs): ByteArray { } fun encryptCryptoFile(fromPath: String, toPath: String): CryptoFileArgs { - val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized") + val ctrl = ChatController.getChatCtrl() ?: throw Exception("Controller is not initialized") val str = chatEncryptFile(ctrl, fromPath, toPath) val d = json.decodeFromString(WriteFileResult.serializer(), str) return when (d) { 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 09aae9a7d3..6a80e50285 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 @@ -482,17 +482,26 @@ class AppPreferences { private const val MESSAGE_TIMEOUT: Int = 300_000_000 object ChatController { - var ctrl: ChatCtrl? = -1 + private var chatCtrl: ChatCtrl? = -1 val appPrefs: AppPreferences by lazy { AppPreferences() } val messagesChannel: Channel = Channel() val chatModel = ChatModel - private var receiverStarted = false + private var receiverJob: Job? = null var lastMsgReceivedTimestamp: Long = System.currentTimeMillis() private set - fun hasChatCtrl() = ctrl != -1L && ctrl != null + fun hasChatCtrl() = chatCtrl != -1L && chatCtrl != null + + fun getChatCtrl(): ChatCtrl? = chatCtrl + + fun setChatCtrl(ctrl: ChatCtrl?) { + val wasRunning = receiverJob != null + stopReceiver() + chatCtrl = ctrl + if (wasRunning && ctrl != null) startReceiver() + } suspend fun getAgentSubsTotal(rh: Long?): Pair? { val userId = currentUserId("getAgentSubsTotal") @@ -639,17 +648,16 @@ object ChatController { private fun startReceiver() { Log.d(TAG, "ChatController startReceiver") - if (receiverStarted) return - receiverStarted = true - CoroutineScope(Dispatchers.IO).launch { + if (receiverJob != null || chatCtrl == null) return + receiverJob = CoroutineScope(Dispatchers.IO).launch { var releaseLock: (() -> Unit) = {} - while (true) { + while (isActive) { /** Global [ctrl] can be null. It's needed for having the same [ChatModel] that already made in [ChatController] without the need * to change it everywhere in code after changing a database. * Since it can be changed in background thread, making this check to prevent NullPointerException */ - val ctrl = ctrl + val ctrl = chatCtrl if (ctrl == null) { - receiverStarted = false + stopReceiver() break } try { @@ -689,6 +697,15 @@ object ChatController { } } + private fun stopReceiver() { + Log.d(TAG, "ChatController stopReceiver") + val job = receiverJob + if (job != null) { + receiverJob = null + job.cancel() + } + } + private suspend fun sendCmdWithRetry(rhId: Long?, cmd: CC, inProgress: MutableState? = null, retryNum: Int = 0): API? { val r = sendCmd(rhId, cmd, retryNum = retryNum) val alert = if (r is API.Error) retryableNetworkErrorAlert(r.err) else null @@ -773,7 +790,7 @@ object ChatController { } suspend fun sendCmd(rhId: Long?, cmd: CC, otherCtrl: ChatCtrl? = null, retryNum: Int = 0, log: Boolean = true): API { - val ctrl = otherCtrl ?: ctrl ?: throw Exception("Controller is not initialized") + val ctrl = otherCtrl ?: chatCtrl ?: throw Exception("Controller is not initialized") return withContext(Dispatchers.IO) { val c = cmd.cmdString diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt index 959e4749dc..d0ce703033 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt @@ -56,6 +56,7 @@ fun initChatControllerOnStart() { } suspend fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: () -> CompletableDeferred = { CompletableDeferred(true) }) { + Log.d(TAG, "initChatController") try { if (chatModel.ctrlInitInProgress.value) return chatModel.ctrlInitInProgress.value = true @@ -92,7 +93,7 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat val ctrl = if (res is DBMigrationResult.OK) { migrated[1] as Long } else null - chatController.ctrl = ctrl + chatController.setChatCtrl(ctrl) chatModel.chatDbEncrypted.value = dbKey != "" chatModel.chatDbStatus.value = res if (res != DBMigrationResult.OK) { @@ -206,7 +207,7 @@ fun chatInitControllerRemovingDatabases() { }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) } val ctrl = migrated[1] as Long - chatController.ctrl = ctrl + chatController.setChatCtrl(ctrl) // We need only controller, not databases File(dbPath + "_chat.db").delete() File(dbPath + "_agent.db").delete() diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt index 01e19ea478..df9af7fbf6 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt @@ -804,7 +804,8 @@ fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) { LocalAppColors provides rememberedAppColors, LocalAppWallpaper provides rememberedWallpaper, LocalDensity provides density, - content = content) + content = content + ) } ) } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt index 13351a2111..ed74e083e7 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt @@ -131,7 +131,7 @@ fun UserPicker( } LaunchedEffect(Unit) { // Controller.ctrl can be null when self-destructing activates - if (controller.ctrl != null && controller.ctrl != -1L) { + if (controller.hasChatCtrl()) { withBGApi { controller.reloadRemoteHosts() } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt index 4a911fa6f0..d55d89f26b 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt @@ -366,6 +366,7 @@ fun startChat( chatDbChanged: MutableState, progressIndicator: MutableState? = null ) { + Log.d(TAG, "startChat") withLongRunningApi { try { progressIndicator?.value = true @@ -532,7 +533,7 @@ fun deleteChatDatabaseFilesAndState() { appPrefs.newDatabaseInitialized.set(false) chatModel.desktopOnboardingRandomPassword.value = false controller.appPrefs.storeDBPassphrase.set(true) - controller.ctrl = null + controller.setChatCtrl(null) // Clear sensitive data on screen just in case ModalManager will fail to prevent hiding its modals while database encrypts itself chatModel.chatId.value = null diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt index 8021a605db..f86edb0388 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt @@ -33,7 +33,7 @@ fun LocalAuthView(m: ChatModel, authRequest: LocalAuthRequest) { } } else { val r: LAResult = if (passcode.value == authRequest.password) { - if (authRequest.selfDestruct && sdPassword != null && controller.ctrl == -1L) { + if (authRequest.selfDestruct && sdPassword != null && controller.getChatCtrl() == -1L) { initChatControllerOnStart() } LAResult.Success @@ -58,7 +58,7 @@ private fun deleteStorageAndRestart(m: ChatModel, password: String, completed: ( if (m.chatRunning.value == true) { stopChatAsync(m) } - val ctrl = m.controller.ctrl + val ctrl = m.controller.getChatCtrl() if (ctrl != null && ctrl != -1L) { /** * The following sequence can bring a user here: diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt index d74846f8a3..6199621c39 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt @@ -633,7 +633,7 @@ private fun MutableState.startDownloading( private fun MutableState.importArchive(archivePath: String, netCfg: NetCfg, networkProxy: NetworkProxy?) { withLongRunningApi { try { - if (ChatController.ctrl == null || ChatController.ctrl == -1L) { + if (!ChatController.hasChatCtrl()) { chatInitControllerRemovingDatabases() } controller.apiDeleteStorage() From 5bb52c1e6ebaf8fa95a688ea44f1fcee64e41d61 Mon Sep 17 00:00:00 2001 From: Vitaly Kanevsky <127240146+rkswqt@users.noreply.github.com> Date: Wed, 10 Dec 2025 19:40:18 +0200 Subject: [PATCH 25/32] website: fix typo (#5933) --- docs/FAQ.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index a24f9f9c56..401f025d9c 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -79,7 +79,7 @@ When "Incognito Mode” is turned on, your currently chosen profile name and ima ### How do invitations work? -It is quite a complex process, but fortunately all of this happens in the background, so it's simply to use. +It is quite a complex process, but fortunately all of this happens in the background, so it's simple to use. Whenever somebody connects to you via your address, they basically ask your client whether they want to establish connection. After that, you can either agree or disagree. If interested, please read more: [Addresses and invitations](./guide/making-connections.md). @@ -126,7 +126,7 @@ You can also revoke the files you send. If the recipients did not yet receive th This is different from most other messengers that allow deleting messages from the recipients' devices without any agreement with the recipients. We believe that allowing deleting information from your device to your contacts is a very wrong design decision for several reasons: -1) it violates your data sovereignty as the device owner - once your are in possession of any information, you have the rights to retain it, and any deletion should be agreed with you. And security and privacy is not possible if users don't have sovereignty over their devices. +1) it violates your data sovereignty as the device owner - once you are in possession of any information, you have the rights to retain it, and any deletion should be agreed with you. And security and privacy is not possible if users don't have sovereignty over their devices. 2) it may be a business communication, and either your organization policy or a compliance requirement is that every message you receive must be preserved for some time. 3) the message can contain a legally binding promise, effectively a contract between you and your contact, in which case you both need to keep it. 4) the messages may contain threat or abuse and you may want to keep them as a proof. From f29a50f6fe310eb578b7236daca3c02dc5d28d0b Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Wed, 10 Dec 2025 17:45:55 +0000 Subject: [PATCH 26/32] core: 6.4.8.0 --- simplex-chat.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 75ddceac5e..c66c7b51ee 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: simplex-chat -version: 6.4.7.1 +version: 6.4.8.0 category: Web, System, Services, Cryptography homepage: https://github.com/simplex-chat/simplex-chat#readme author: simplex.chat From 8cd33f77fc28c93d55813b3197eabff2210e9961 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Wed, 10 Dec 2025 18:32:05 +0000 Subject: [PATCH 27/32] ios: update core library --- apps/ios/SimpleX.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index ce4785c7ab..99b9d2fa56 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -178,8 +178,8 @@ 64C3B0212A0D359700E19930 /* CustomTimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C3B0202A0D359700E19930 /* CustomTimePicker.swift */; }; 64C8299D2D54AEEE006B9E89 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C829982D54AEED006B9E89 /* libgmp.a */; }; 64C8299E2D54AEEE006B9E89 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C829992D54AEEE006B9E89 /* libffi.a */; }; - 64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a */; }; - 64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a */; }; + 64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a */; }; + 64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a */; }; 64C829A12D54AEEE006B9E89 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C8299C2D54AEEE006B9E89 /* libgmpxx.a */; }; 64D0C2C029F9688300B38D5F /* UserAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2BF29F9688300B38D5F /* UserAddressView.swift */; }; 64D0C2C229FA57AB00B38D5F /* UserAddressLearnMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2C129FA57AB00B38D5F /* UserAddressLearnMore.swift */; }; @@ -545,8 +545,8 @@ 64C3B0202A0D359700E19930 /* CustomTimePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTimePicker.swift; sourceTree = ""; }; 64C829982D54AEED006B9E89 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = ""; }; 64C829992D54AEEE006B9E89 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = ""; }; - 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a"; sourceTree = ""; }; - 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a"; sourceTree = ""; }; + 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a"; sourceTree = ""; }; + 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a"; sourceTree = ""; }; 64C8299C2D54AEEE006B9E89 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = ""; }; 64D0C2BF29F9688300B38D5F /* UserAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAddressView.swift; sourceTree = ""; }; 64D0C2C129FA57AB00B38D5F /* UserAddressLearnMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAddressLearnMore.swift; sourceTree = ""; }; @@ -708,8 +708,8 @@ 64C8299D2D54AEEE006B9E89 /* libgmp.a in Frameworks */, 64C8299E2D54AEEE006B9E89 /* libffi.a in Frameworks */, 64C829A12D54AEEE006B9E89 /* libgmpxx.a in Frameworks */, - 64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a in Frameworks */, - 64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a in Frameworks */, + 64C8299F2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a in Frameworks */, + 64C829A02D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a in Frameworks */, CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -795,8 +795,8 @@ 64C829992D54AEEE006B9E89 /* libffi.a */, 64C829982D54AEED006B9E89 /* libgmp.a */, 64C8299C2D54AEEE006B9E89 /* libgmpxx.a */, - 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW-ghc9.6.3.a */, - 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.7.1-A5UtRanLEGiKe0gro2y2nW.a */, + 64C8299A2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW-ghc9.6.3.a */, + 64C8299B2D54AEEE006B9E89 /* libHSsimplex-chat-6.4.8.0-EN6xWtYjnbH1vySqqRtbFW.a */, ); path = Libraries; sourceTree = ""; From 90851143c40440844b13fa32d641a233eae11b8f Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Wed, 10 Dec 2025 18:43:21 +0000 Subject: [PATCH 28/32] ios: 6.4.8 (build 314) --- apps/ios/SimpleX.xcodeproj/project.pbxproj | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index 99b9d2fa56..654eaf783c 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -2003,7 +2003,7 @@ CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES; CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; @@ -2028,7 +2028,7 @@ "@executable_path/Frameworks", ); LLVM_LTO = YES_THIN; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; OTHER_LDFLAGS = "-Wl,-stack_size,0x1000000"; PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app; PRODUCT_NAME = SimpleX; @@ -2053,7 +2053,7 @@ CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES; CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; @@ -2078,7 +2078,7 @@ "@executable_path/Frameworks", ); LLVM_LTO = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; OTHER_LDFLAGS = "-Wl,-stack_size,0x1000000"; PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app; PRODUCT_NAME = SimpleX; @@ -2095,11 +2095,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -2115,11 +2115,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -2140,7 +2140,7 @@ CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; GCC_OPTIMIZATION_LEVEL = s; @@ -2155,7 +2155,7 @@ "@executable_path/../../Frameworks", ); LLVM_LTO = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2177,7 +2177,7 @@ CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; ENABLE_CODE_COVERAGE = NO; @@ -2192,7 +2192,7 @@ "@executable_path/../../Frameworks", ); LLVM_LTO = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2214,7 +2214,7 @@ CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES; CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5NN7GUYB6T; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2240,7 +2240,7 @@ "$(PROJECT_DIR)/Libraries/sim", ); LLVM_LTO = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; @@ -2265,7 +2265,7 @@ CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES; CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5NN7GUYB6T; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2291,7 +2291,7 @@ "$(PROJECT_DIR)/Libraries/sim", ); LLVM_LTO = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; @@ -2316,7 +2316,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -2331,7 +2331,7 @@ "@executable_path/../../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -2350,7 +2350,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 311; + CURRENT_PROJECT_VERSION = 314; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -2365,7 +2365,7 @@ "@executable_path/../../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 6.4.7; + MARKETING_VERSION = 6.4.8; PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; From 453d4fe227737a0b76faa21433dd1a168c3d97ea Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Wed, 10 Dec 2025 20:11:47 +0000 Subject: [PATCH 29/32] v6.4.8: android 328, desktop 125 --- apps/multiplatform/gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties index 36bcd4f02a..49060b7ad5 100644 --- a/apps/multiplatform/gradle.properties +++ b/apps/multiplatform/gradle.properties @@ -24,13 +24,13 @@ android.nonTransitiveRClass=true kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.jvm.target=11 -android.version_name=6.4.7 -android.version_code=325 +android.version_name=6.4.8 +android.version_code=328 android.bundle=false -desktop.version_name=6.4.7 -desktop.version_code=123 +desktop.version_name=6.4.8 +desktop.version_code=125 kotlin.version=2.1.20 gradle.plugin.version=8.7.0 From 86a053729b9396f0f85fd822993042a3bfa73631 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Thu, 11 Dec 2025 09:04:24 +0000 Subject: [PATCH 30/32] flatpak: update metainfo (#6501) --- .../flatpak/chat.simplex.simplex.metainfo.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/flatpak/chat.simplex.simplex.metainfo.xml b/scripts/flatpak/chat.simplex.simplex.metainfo.xml index 950cb42ea2..4f5f5d395c 100644 --- a/scripts/flatpak/chat.simplex.simplex.metainfo.xml +++ b/scripts/flatpak/chat.simplex.simplex.metainfo.xml @@ -38,6 +38,27 @@ + + https://simplex.chat/blog/20250729-simplex-chat-v6-4-1-welcome-contacts-protect-groups-app-security.html + +

    New in v6.4.8:

    +
      +
    • fix stuck message reception and other events after passphrase change (e.g., during desktop app initial start)
      • +
    +

    New in v6.4-6.4.7:

    +
      +
    • new UX to connect.
      • +
    • review new group members.
      • +
    • chat with group admins.
      • +
    • new UI languages: Catalan, Indonesian, Romanian and Vietnamese.
      • +
    • Linux app builds for aarch64 CPUs
      • +
    • UI support for bot commands.
      • +
    • support markdown hyperlinks, such as [click here](https://example.com).
      • +
    • option to remove tracking parameters from the links.
      • +
    • better information about network errors.
      • +
    +     +     https://simplex.chat/blog/20250729-simplex-chat-v6-4-1-welcome-contacts-protect-groups-app-security.html From caef0120031677144dcdd70aff1530d7022ccf05 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Thu, 11 Dec 2025 17:29:31 +0000 Subject: [PATCH 31/32] core: fix support chat deletion (#6271) --- src/Simplex/Chat/Library/Commands.hs | 8 +- src/Simplex/Chat/Library/Internal.hs | 32 +++-- src/Simplex/Chat/Library/Subscriber.hs | 30 ++--- src/Simplex/Chat/Store/Groups.hs | 11 +- src/Simplex/Chat/Store/Messages.hs | 2 +- .../SQLite/Migrations/chat_query_plans.txt | 2 +- tests/ChatClient.hs | 3 + tests/ChatTests/Groups.hs | 125 +++++++++++++++++- 8 files changed, 177 insertions(+), 36 deletions(-) diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index 7f4ee238b1..f7891cae3a 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -2347,7 +2347,13 @@ processChatCommand vr nm = \case (gInfo, m) <- withFastStore $ \db -> (,) <$> getGroupInfo db vr user groupId <*> getGroupMemberById db vr user gmId when (isNothing $ supportChat m) $ throwCmdError "member has no support chat" when (memberPending m) $ throwCmdError "member is pending" - (gInfo', m') <- withFastStore' $ \db -> deleteGroupMemberSupportChat db user gInfo m + (gInfo', m') <- withFastStore' $ \db -> do + gInfo' <- + if gmRequiresAttention m + then decreaseGroupMembersRequireAttention db user gInfo + else pure gInfo + m' <- deleteGroupMemberSupportChat db m + pure (gInfo', m') pure $ CRMemberSupportChatDeleted user gInfo' m' APIMembersRole groupId memberIds newRole -> withUser $ \user -> withGroupLock "memberRole" groupId $ do diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 523224c76d..9ee00b0dc5 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -1677,19 +1677,35 @@ deleteMemberConnection' GroupMember {activeConn} waitDelivery = do withStore' $ \db -> updateConnectionStatus db conn ConnDeleted deleteOrUpdateMemberRecord :: User -> GroupInfo -> GroupMember -> CM GroupInfo -deleteOrUpdateMemberRecord user gInfo member = - withStore' $ \db -> deleteOrUpdateMemberRecordIO db user gInfo member +deleteOrUpdateMemberRecord user gInfo m = + withStore' $ \db -> deleteOrUpdateMemberRecordIO db user gInfo m deleteOrUpdateMemberRecordIO :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO GroupInfo -deleteOrUpdateMemberRecordIO db user@User {userId} gInfo member = do +deleteOrUpdateMemberRecordIO db user@User {userId} gInfo m = do + (gInfo', m') <- deleteSupportChatIfExists db user gInfo m + checkGroupMemberHasItems db user m' >>= \case + Just _ -> updateGroupMemberStatus db userId m' GSMemRemoved + Nothing -> deleteGroupMember db user m' + pure gInfo' + +updateMemberRecordDeleted :: User -> GroupInfo -> GroupMember -> GroupMemberStatus -> CM GroupInfo +updateMemberRecordDeleted user@User {userId} gInfo m newStatus = + withStore' $ \db -> do + (gInfo', m') <- deleteSupportChatIfExists db user gInfo m + updateGroupMemberStatus db userId m' newStatus + pure gInfo' + +deleteSupportChatIfExists :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO (GroupInfo, GroupMember) +deleteSupportChatIfExists db user gInfo m = do gInfo' <- - if gmRequiresAttention member + if gmRequiresAttention m then decreaseGroupMembersRequireAttention db user gInfo else pure gInfo - checkGroupMemberHasItems db user member >>= \case - Just _ -> updateGroupMemberStatus db userId member GSMemRemoved - Nothing -> deleteGroupMember db user member - pure gInfo' + m' <- + if isJust (supportChat m) + then deleteGroupMemberSupportChat db m + else pure m + pure (gInfo', m') sendDirectContactMessages :: MsgEncodingI e => User -> Contact -> NonEmpty (ChatMsgEvent e) -> CM [Either ChatError SndMessage] sendDirectContactMessages user ct events = do diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 27f3a4f61c..c1fc1e917f 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -2735,7 +2735,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = withStore' $ \db -> updateGroupMemberStatus db userId membership GSMemRemoved let membership' = membership {memberStatus = GSMemRemoved} when withMessages $ deleteMessages gInfo membership' SMDSnd - deleteMemberItem RGEUserDeleted + deleteMemberItem gInfo RGEUserDeleted toView $ CEvtDeletedMemberUser user gInfo {membership = membership'} m withMessages pure $ Just DJSGroup {jobSpec = DJRelayRemoved} else @@ -2746,29 +2746,33 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = Right deletedMember@GroupMember {groupMemberId, memberProfile, memberStatus} -> checkRole deletedMember $ do -- ? prohibit deleting member if it's the sender - sender should use x.grp.leave - if isUserGrpFwdRelay gInfo && not forwarded + let shouldForward = isUserGrpFwdRelay gInfo && not forwarded + if shouldForward then do -- Special case: forward before deleting connection. - -- It allows us to avoid adding logic in forwardMsgs to circumvent member filtering. forwardToMember deletedMember deleteMemberConnection' deletedMember True else deleteMemberConnection deletedMember - -- undeleted "member connected" chat item will prevent deletion of member record - gInfo' <- deleteOrUpdateMemberRecord user gInfo deletedMember + let deliveryScope = memberEventDeliveryScope deletedMember + gInfo' <- case deliveryScope of + -- Keep member record if it's support scope - it will be required for forwarding inside that scope. + Just (DJSMemberSupport _) | shouldForward -> updateMemberRecordDeleted user gInfo deletedMember GSMemRemoved + -- Undeleted "member connected" chat item will prevent deletion of member record. + _ -> deleteOrUpdateMemberRecord user gInfo deletedMember let wasDeleted = memberStatus == GSMemRemoved || memberStatus == GSMemLeft deletedMember' = deletedMember {memberStatus = GSMemRemoved} when withMessages $ deleteMessages gInfo' deletedMember' SMDRcv - unless wasDeleted $ deleteMemberItem $ RGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) + unless wasDeleted $ deleteMemberItem gInfo' $ RGEMemberDeleted groupMemberId (fromLocalProfile memberProfile) toView $ CEvtDeletedMember user gInfo' m deletedMember' withMessages - pure $ memberEventDeliveryScope deletedMember + pure deliveryScope where checkRole GroupMember {memberRole} a | senderRole < GRAdmin || senderRole < memberRole = messageError "x.grp.mem.del with insufficient member permissions" $> Nothing | otherwise = a - deleteMemberItem gEvent = do - (gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m - (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m') msg brokerTs (CIRcvGroupEvent gEvent) + deleteMemberItem gi gEvent = do + (gi', m', scopeInfo) <- mkGroupChatScope gi m + (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gi' scopeInfo m') msg brokerTs (CIRcvGroupEvent gEvent) groupMsgToView cInfo ci deleteMessages :: MsgDirectionI d => GroupInfo -> GroupMember -> SMsgDirection d -> CM () deleteMessages gInfo' delMem msgDir @@ -2791,11 +2795,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = xGrpLeave gInfo m msg brokerTs = do deleteMemberConnection m -- member record is not deleted to allow creation of "member left" chat item - gInfo' <- withStore' $ \db -> do - updateGroupMemberStatus db userId m GSMemLeft - if gmRequiresAttention m - then decreaseGroupMembersRequireAttention db user gInfo - else pure gInfo + gInfo' <- updateMemberRecordDeleted user gInfo m GSMemLeft (gInfo'', m', scopeInfo) <- mkGroupChatScope gInfo' m (ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo'' scopeInfo m') msg brokerTs (CIRcvGroupEvent RGEMemberLeft) groupMsgToView cInfo ci diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs index 44dcd3c7f9..9219094cbc 100644 --- a/src/Simplex/Chat/Store/Groups.hs +++ b/src/Simplex/Chat/Store/Groups.hs @@ -1415,9 +1415,8 @@ updateGroupMemberAccepted db User {userId} m@GroupMember {groupMemberId} status (status, role, currentTs, userId, groupMemberId) pure m {memberStatus = status, memberRole = role, updatedAt = currentTs} -deleteGroupMemberSupportChat :: DB.Connection -> User -> GroupInfo -> GroupMember -> IO (GroupInfo, GroupMember) -deleteGroupMemberSupportChat db user g m@GroupMember {groupMemberId} = do - let requiredAttention = gmRequiresAttention m +deleteGroupMemberSupportChat :: DB.Connection -> GroupMember -> IO GroupMember +deleteGroupMemberSupportChat db m@GroupMember {groupMemberId} = do currentTs <- getCurrentTime DB.execute db @@ -1439,11 +1438,7 @@ deleteGroupMemberSupportChat db user g m@GroupMember {groupMemberId} = do WHERE group_member_id = ? |] (currentTs, groupMemberId) - let m' = m {supportChat = Nothing, updatedAt = currentTs} - g' <- if requiredAttention - then decreaseGroupMembersRequireAttention db user g - else pure g - pure (g', m') + pure m {supportChat = Nothing, updatedAt = currentTs} updateGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> IO GroupInfo updateGroupMembersRequireAttention db user g member member' diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs index d7dd0fde01..72101c37e3 100644 --- a/src/Simplex/Chat/Store/Messages.hs +++ b/src/Simplex/Chat/Store/Messages.hs @@ -1645,7 +1645,7 @@ getGroupUnreadCount_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatSco getGroupUnreadCount_ db user g scopeInfo_ contentFilter = head <$> queryUnreadGroupItems db user g scopeInfo_ contentFilter baseQuery "" where - baseQuery = "SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL " + baseQuery = "SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? " getGroupReportsCount_ :: DB.Connection -> User -> GroupInfo -> Bool -> IO Int getGroupReportsCount_ db User {userId} GroupInfo {groupId} archived = diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt index c46f6a5e7d..91f2ea3899 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt +++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt @@ -6113,7 +6113,7 @@ Query: SELECT COUNT(1) FROM groups WHERE user_id = ? AND chat_item_ttl > 0 Plan: SEARCH groups USING INDEX idx_groups_chat_ts (user_id=?) -Query: SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? +Query: SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? Plan: SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_stats_all (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_status=?) diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs index 8fd8a5976d..d0b186dd94 100644 --- a/tests/ChatClient.hs +++ b/tests/ChatClient.hs @@ -479,6 +479,9 @@ testChat3 = testChatCfgOpts3 testCfg testOpts testChatCfg3 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO () testChatCfg3 cfg = testChatCfgOpts3 cfg testOpts +testChatOpts3 :: HasCallStack => ChatOpts -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO () +testChatOpts3 = testChatCfgOpts3 testCfg + testChatCfgOpts3 :: HasCallStack => ChatConfig -> ChatOpts -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> TestParams -> IO () testChatCfgOpts3 cfg opts p1 p2 p3 test = testChatN cfg opts [p1, p2, p3] test_ where diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index 42562d8e16..b0f4fc99dc 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -224,11 +224,15 @@ chatGroupTests = do it "should forward file inside support scope" testScopedSupportForwardFile it "should forward member removal in support scope in review (x.grp.mem.del)" testScopedSupportForwardMemberRemoval it "should forward admin removal in support scope in review (x.grp.mem.del, relay forwards it was removed)" testScopedSupportForwardAdminRemoval + it "should forward pending member leaving in support scope in review (x.grp.leave)" testScopedSupportForwardLeave it "should forward group deletion in support scope in review (x.grp.del)" testScopedSupportForwardGroupDeletion it "should send messages to admins and members" testSupportCLISendCommand it "should correctly maintain unread stats for support chats on reading chat items" testScopedSupportUnreadStatsOnRead it "should correctly maintain unread stats for support chats on deleting chat items" testScopedSupportUnreadStatsOnDelete it "should correct member attention stat for support chat on opening it" testScopedSupportUnreadStatsCorrectOnOpen + it "should remove support chat with member when member is removed" testScopedSupportMemberRemoved + it "should remove support chat with member when user removes member" testScopedSupportUserRemovesMember + it "should remove support chat with member when member leaves" testScopedSupportMemberLeaves -- TODO [channels fwd] enable tests (requires communicating useRelays to members) -- TODO [channels fwd] add tests for channels -- TODO - tests with multiple relays (all relays should deliver messages, members should deduplicate) @@ -7864,9 +7868,9 @@ testScopedSupportForwardMemberRemoval = alice ##> "#team (support: eve) hi" alice <## "bad chat command: support member not current or pending" bob ##> "#team (support: eve) hi" - bob <## "bad chat command: support member not current or pending" + bob <##. "chat db error: SEGroupMemberNameNotFound" dan ##> "#team (support: eve) hi" - dan <## "bad chat command: support member not current or pending" + dan <##. "chat db error: SEGroupMemberNameNotFound" eve ##> "/groups" eve <## "#team (you are removed, delete local copy: /d #team)" @@ -7972,6 +7976,30 @@ testScopedSupportForwardAdminRemoval = alice ##> "/groups" alice <## "#team (you are removed, delete local copy: /d #team)" +testScopedSupportForwardLeave :: HasCallStack => TestParams -> IO () +testScopedSupportForwardLeave = + testChat5 aliceProfile bobProfile cathProfile danProfile eveProfile $ + \alice bob cath dan eve -> do + createGroup4 "team" alice (bob, GRAdmin) (cath, GRMember) (dan, GRModerator) + setupReviewForward alice bob cath dan eve + + -- eve leaves group, bob and dan receive member leave message + eve ##> "/leave #team" + eve <## "#team: you left the group" + eve <## "use /d #team to delete the group" + alice <## "#team: eve left the group" + bob <## "#team: eve left the group" + dan <## "#team: eve left the group" + + alice ##> "#team (support: eve) hi" + alice <## "bad chat command: support member not current or pending" + bob ##> "#team (support: eve) hi" + bob <##. "bad chat command: support member not current or pending" + dan ##> "#team (support: eve) hi" + dan <##. "bad chat command: support member not current or pending" + eve ##> "/groups" + eve <## "#team (you left, delete local copy: /d #team)" + testScopedSupportForwardGroupDeletion :: HasCallStack => TestParams -> IO () testScopedSupportForwardGroupDeletion = testChat5 aliceProfile bobProfile cathProfile danProfile eveProfile $ @@ -8300,6 +8328,99 @@ testScopedSupportUnreadStatsCorrectOnOpen = { markRead = False } +testScopedSupportMemberRemoved :: HasCallStack => TestParams -> IO () +testScopedSupportMemberRemoved = + testChatOpts3 opts aliceProfile bobProfile cathProfile $ \alice bob cath -> do + createGroup3' "team" alice (bob, GRMember) (cath, GRAdmin) + + bob #> "#team (support) 1" + [alice, cath] *<# "#team (support: bob) bob> 1" + + bob #> "#team (support) 2" + [alice, cath] *<# "#team (support: bob) bob> 2" + + alice ##> "/member support chats #team" + alice <## "members require attention: 1" + alice <## "bob (Bob) (id 2): unread: 2, require attention: 2, mentions: 0" + + cath ##> "/rm team bob" + concurrentlyN_ + [ cath <## "#team: you removed bob from the group", + do + bob <## "#team: cath removed you from the group" + bob <## "use /d #team to delete the group", + alice <## "#team: cath removed bob from the group" + ] + + alice ##> "/member support chats #team" + alice <## "members require attention: 0" + where + opts = + testOpts + { markRead = False + } + +testScopedSupportUserRemovesMember :: HasCallStack => TestParams -> IO () +testScopedSupportUserRemovesMember = + testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> do + createGroup2' "team" alice (bob, GRMember) True + + bob #> "#team (support) 1" + alice <# "#team (support: bob) bob> 1" + + bob #> "#team (support) 2" + alice <# "#team (support: bob) bob> 2" + + alice ##> "/member support chats #team" + alice <## "members require attention: 1" + alice <## "bob (Bob) (id 2): unread: 2, require attention: 2, mentions: 0" + + alice ##> "/rm team bob" + concurrentlyN_ + [ alice <## "#team: you removed bob from the group", + do + bob <## "#team: alice removed you from the group" + bob <## "use /d #team to delete the group" + ] + + alice ##> "/member support chats #team" + alice <## "members require attention: 0" + where + opts = + testOpts + { markRead = False + } + +testScopedSupportMemberLeaves :: HasCallStack => TestParams -> IO () +testScopedSupportMemberLeaves = + testChatOpts2 opts aliceProfile bobProfile $ \alice bob -> do + createGroup2' "team" alice (bob, GRMember) True + + bob #> "#team (support) 1" + alice <# "#team (support: bob) bob> 1" + + bob #> "#team (support) 2" + alice <# "#team (support: bob) bob> 2" + + alice ##> "/member support chats #team" + alice <## "members require attention: 1" + alice <## "bob (Bob) (id 2): unread: 2, require attention: 2, mentions: 0" + + bob ##> "/l team" + concurrentlyN_ + [ do + bob <## "#team: you left the group" + bob <## "use /d #team to delete the group", + alice <## "#team: bob left the group" + ] + + alice ##> "/member support chats #team" + alice <## "members require attention: 0" + where + opts = + testOpts + { markRead = False + } testChannelsRelayDeliver :: HasCallStack => TestParams -> IO () testChannelsRelayDeliver = testChat5 aliceProfile bobProfile cathProfile danProfile eveProfile $ \alice bob cath dan eve -> do From 13bce0821c9bc9c0a76dec131925b0e6daabbe36 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Thu, 11 Dec 2025 17:50:05 +0000 Subject: [PATCH 32/32] core: 6.5.0.5 --- cabal.project | 2 +- scripts/nix/sha256map.nix | 2 +- simplex-chat.cabal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index 9f8d821a2e..1f331bdf74 100644 --- a/cabal.project +++ b/cabal.project @@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 92a9579e6958026e42a45e32c0e62fca243b4b0f + tag: 2ca440dd2dfd494ff2bb40cc0409d08069d02e04 source-repository-package type: git diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 406ef76cc5..61ede61996 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."92a9579e6958026e42a45e32c0e62fca243b4b0f" = "0hacyi4hsbca55l4n2n4pcsmsfvh2jaw681j6106y5mkillmb3fv"; + "https://github.com/simplex-chat/simplexmq.git"."2ca440dd2dfd494ff2bb40cc0409d08069d02e04" = "1jc1a9vh59l0l5hxlin1spv03afrgmmiml5xnakhbi4rk67n0wwr"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl"; diff --git a/simplex-chat.cabal b/simplex-chat.cabal index bc49fc0b45..b630c2ef65 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: simplex-chat -version: 6.5.0.4 +version: 6.5.0.5 category: Web, System, Services, Cryptography homepage: https://github.com/simplex-chat/simplex-chat#readme author: simplex.chat