adam/mc-webui
1
0
Fork 0
mirror of https://github.com/MarekWo/mc-webui.git synced 2026-08-10 02:32:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: contact delete by pubkey, cache contacts as pending, cache delete button

Browse Source 
1. Delete button now sends public_key instead of name to avoid matching
   wrong contacts when multiple share similar names.
2. _on_advertisement adds cache-only contacts to mc.pending_contacts when
   manual approval is enabled, so they appear in the pending list after
   advertising (even if meshcore fires ADVERTISEMENT instead of NEW_CONTACT).
3. Added Delete button for cache-only contacts with dedicated
   /api/contacts/cached/delete endpoint and hard_delete_contact DB method.
4. approve_contact/reject_contact now handle DB-only pending contacts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-03-18 07:59:49 +01:00
parent eb19f3cf76
commit f66e95ffa0
5 changed files with 131 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/static/js/contacts.js
+17 -6
View File
@@ -2193,6 +2193,15 @@ function createExistingContactCard(contact, index) {
actionsDiv.appendChild(deleteBtn);
}
// Delete button for cache-only contacts
if (contact.on_device === false) {
const deleteCacheBtn = document.createElement('button');
deleteCacheBtn.className = 'btn btn-sm btn-outline-danger';
deleteCacheBtn.innerHTML = '<i class="bi bi-trash"></i> <span class="btn-label">Delete</span>';
deleteCacheBtn.onclick = () => showDeleteModal(contact);
actionsDiv.appendChild(deleteCacheBtn);
}
// Ignore/Block/Unignore/Unblock buttons
if (contact.is_blocked) {
const unblockBtn = document.createElement('button');
@@ -2317,17 +2326,19 @@ async function confirmDelete() {
}
try {
// Use contact name for deletion (meshcli remove_contact only works with name)
const selector = contactToDelete.name;
// Use different endpoint for cache-only vs device contacts
const isCacheOnly = contactToDelete.on_device === false;
const url = isCacheOnly ? '/api/contacts/cached/delete' : '/api/contacts/delete';
const body = isCacheOnly
? { public_key: contactToDelete.public_key }
: { selector: contactToDelete.public_key };
const response = await fetch('/api/contacts/delete', {
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
selector: selector
})
body: JSON.stringify(body)
});
const data = await response.json();