Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-21 15:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

also include self contact in memberlist, otherwise fetching self avatar

Browse Source 
does not work.
This commit is contained in:
Simon Laux
2026-05-20 22:09:38 +02:00
parent 2e37e8dc0f
commit 20adc6408c
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
deltachat-rpc-server/npm-package/package.json
View File

@@ -1,19 +1,21 @@
{ {
"license": "MPL-2.0", "license": "MPL-2.0",
"main": "index.js", "main": "index.js",
"name": "@deltachat/stdio-rpc-server", "name": "@deltachat/stdio-rpc-server",
"optionalDependencies": {}, "optionalDependencies": {
"peerDependencies": { "@deltachat/stdio-rpc-server-linux-x64": "file:/home/work/Coding/DeltaChat/core/deltachat-rpc-server/npm-package/platform_package/x86_64-unknown-linux-gnu"
"@deltachat/jsonrpc-client": "*" },
}, "peerDependencies": {
"repository": { "@deltachat/jsonrpc-client": "file:/home/work/Coding/DeltaChat/core/deltachat-jsonrpc/typescript"
"type": "git", },
"url": "https://github.com/chatmail/core.git" "repository": {
}, "type": "git",
"scripts": { "url": "https://github.com/chatmail/core.git"
"prepack": "node scripts/update_optional_dependencies_and_version.js" },
}, "scripts": {
"type": "module", "prepack": "node scripts/update_optional_dependencies_and_version.js"
"types": "index.d.ts", },
"version": "2.50.0-dev" "type": "module",
"types": "index.d.ts",
"version": "2.50.0-dev"
} }

12
src/webxdc.rs
View File

@@ -1022,19 +1022,27 @@ impl Message {
// We could do the following to increase privacy: // We could do the following to increase privacy:
// - remove displayname (not that big of a deal in reality) // - remove displayname (not that big of a deal in reality)
// - only show people in the list that send an status update before in the group (would decrease usefulness, but would still bring enough benefit, if only as internal function to match avatars) // - only show people in the list that send an status update before in the group (would decrease usefulness, but would still bring enough benefit, if only as internal function to match avatars)
let contacts = chat::get_chat_contacts(context, self.get_chat_id()).await?; let mut contacts = chat::get_chat_contacts(context, self.get_chat_id()).await?;
let mut memberlist = Vec::with_capacity(contacts.len()); let mut memberlist = Vec::with_capacity(contacts.len());
// DM chats don't include self contact
// also webxdc may still need it even when you were removed from a group,
// so we re-add the self contact here.
if !contacts.contains(&ContactId::SELF) {
contacts.push(ContactId::SELF);
}
for contact_id in contacts { for contact_id in contacts {
let contact = contact::Contact::get_by_id(context, contact_id).await?; let contact = contact::Contact::get_by_id(context, contact_id).await?;
if let Some(fingerprint) = contact.fingerprint() { if let Some(fingerprint) = contact.fingerprint() {
memberlist.push((contact, self.get_webxdc_user_id(&fingerprint.hex()))); memberlist.push((contact, self.get_webxdc_user_id(&fingerprint.hex())));
} else if contact_id == ContactId::SELF {
memberlist.push((contact, self.get_webxdc_self_addr(context).await?));
} }
} }
Ok(memberlist) Ok(memberlist)
} }
/// Returns webxdc memberlist, each member is a tuple (hashed user id/addr, display_name) /// Returns webxdc memberlist, each member is a tuple (hashed user id/addr, display_name)
/// Only includes members that have a known public key in the database and does not include self contact. /// Only includes members that have a known public key in the database and it also includes self contact.
pub async fn get_webxdc_memberlist(&self, context: &Context) -> Result<Vec<(String, String)>> { pub async fn get_webxdc_memberlist(&self, context: &Context) -> Result<Vec<(String, String)>> {
// We could do the following to increase privacy: // We could do the following to increase privacy:
// - remove displayname (not that big of a deal in reality) // - remove displayname (not that big of a deal in reality)