zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add delete message function

Browse Source
This commit is contained in:
zefie
2022-02-10 13:01:47 -05:00
parent fe821095aa
commit 4e6893ab02
2 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
View File

@@ -30,6 +30,13 @@ if (!intro_seen && !request_headers.query.intro_seen) {
'noback': true, 'noback': true,
}).getURL(); }).getURL();
if (request_headers.query.message_delete) {
ssid_sessions[socket.ssid].mailstore.deleteMessage(messageid);
headers = `300 OK
wtv-expire: wtv-mail:/listmail
Location: wtv-mail:/listmail`;
} else {
headers = `200 OK headers = `200 OK
Content-type: text/html`; Content-type: text/html`;
@@ -239,7 +246,7 @@ From:
Date: Date:
<td> <td>
<td> <td>
${strftime("%a, %b %e, %Y, %I:%M %P",new Date(message.date * 1000))} (UTC) ${strftime("%a, %b %e, %Y, %I:%M %P", new Date(message.date * 1000))} (UTC)
<tr> <tr>
<td valign=top> <td valign=top>
To: To:
@@ -271,4 +278,5 @@ ${(message.signature) ? '<embed src="wtv-mail:/get-signature?message_id=${messag
`; `;
} }
} }
}
} }

49
zefie_wtvp_minisrv/WTVMail.js
View File

@@ -85,7 +85,7 @@ class WTVMail {
} }
getMailboxById(mailboxid) { getMailboxById(mailboxid) {
return (mailboxid < this.mailboxes.length - 1) ? this.mailboxes[mailboxid] : false; return (mailboxid < this.mailboxes.length) ? this.mailboxes[mailboxid] : false;
} }
getMailboxByName(mailbox_name) { getMailboxByName(mailbox_name) {
@@ -375,31 +375,36 @@ class WTVMail {
return "Unknown error"; return "Unknown error";
} }
getMessageMailboxId(messageid) { getMessageMailboxName(messageid) {
// returns the mailbox id of which the message was found for the current user // returns the mailbox id of which the message was found for the current user
var self = this; var self = this;
var mailboxid = false; var mailbox_name = false;
if (this.checkMessageIdSanity(messageid)) { if (this.checkMessageIdSanity(messageid)) {
if (this.mailstoreExists()) { if (this.mailstoreExists()) {
this.fs.readdirSync(this.mailstore_dir).every(mailbox => { this.fs.readdirSync(this.mailstore_dir).every(mailbox => {
if (mailboxid) return false; if (mailbox_name) return false;
self.fs.readdirSync(self.mailstore_dir + mailbox).every(file => { self.fs.readdirSync(self.mailstore_dir + mailbox).every(file => {
var regexSearch = messageid + self.msgFileExt; var regexSearch = messageid + self.msgFileExt;
var re = new RegExp(regexSearch, "ig"); var re = new RegExp(regexSearch, "ig");
if (!file.match(re)) return true; if (!file.match(re)) return true;
mailboxid = mailbox; mailbox_name = mailbox;
return false; return false;
}); });
return true; return true;
}); });
} }
} }
return mailboxid; return mailbox_name;
}
getMessageMailboxID(messageid) {
var mailbox_name = this.getMessageMailboxName(messageid);
if (!mailbox_name) return false;
return this.getMailboxByName(mailbox_name);
} }
getMessageByID(messageid) { getMessageByID(messageid) {
var mailbox_name = this.getMessageMailboxId(messageid); var mailbox_name = this.getMessageMailboxName(messageid);
console.log(mailbox_name);
if (!mailbox_name) return false; if (!mailbox_name) return false;
var mailboxid = this.mailboxes.findIndex((value) => value == mailbox_name); var mailboxid = this.mailboxes.findIndex((value) => value == mailbox_name);
@@ -410,33 +415,39 @@ class WTVMail {
moveMailMessage(messageid, dest_mailbox_id) { moveMailMessage(messageid, dest_mailbox_id) {
// returns true if successful, false if failed. // returns true if successful, false if failed.
var currentMailbox = getMessageMailboxId(messageid); var currentMailbox = this.getMessageMailboxID(messageid);
// Same mailbox // Same mailbox
if (dest_mailbox_id == currentMailbox) return false; if (dest_mailbox_id == currentMailbox) return false;
// Invalid destination mailbox ID // Invalid destination mailbox ID
if (dest_mailbox_id > (mailboxes.length - 1) || dest_mailbox_id < 0) return false; if (dest_mailbox_id > (this.mailboxes.length - 1) || dest_mailbox_id < 0) return false;
if (!this.mailboxExists(dest_mailbox_id)) this.createMailbox(dest_mailbox_id);
var currentMailFile = getMailboxStoreDir(currentMailbox) + this.path.sep + messageid + this.msgFileExt; var currentMailStoreDir = this.getMailboxStoreDir(currentMailbox);
var destMailFile = getMailboxStoreDir(dest_mailbox_id) + this.path.sep + messageid + this.msgFileExt; if (!currentMailStoreDir) return false;
var destMailStoreDir = this.getMailboxStoreDir(dest_mailbox_id);
if (!destMailStoreDir) return false;
var currentMailFile = currentMailStoreDir + this.path.sep + messageid + this.msgFileExt;
var destMailFile = destMailStoreDir + this.path.sep + messageid + this.msgFileExt;
// File exists // File exists
if (fs.existsSync(destMailFile)) return false; if (this.fs.existsSync(destMailFile)) return false;
return fs.rename(currentMailFile, destMailFile); return this.fs.renameSync(currentMailFile, destMailFile);
} }
deleteMessage(messageid) { deleteMessage(messageid) {
var currentMailbox = getMessageMailboxId(messageid); var currentMailbox = this.getMessageMailboxName(messageid);
var trashMailbox = getMailboxByName(this.trashMailboxName); var trashMailbox = this.getMailboxByName(this.trashMailboxName);
if (currentMailbox != trashMailbox) { if (currentMailbox != trashMailbox) {
// if not in the trash, move it to trash // if not in the trash, move it to trash
return moveMailMessage(messageid, trashMailbox); return this.moveMailMessage(messageid, trashMailbox);
} else { } else {
// if its already in the trash, delete it forever // if its already in the trash, delete it forever
var currentMailFile = getMailboxStoreDir(trashMailbox) + this.path.sep + messageid + this.msgFileExt; var currentMailFile = this.getMailboxStoreDir(trashMailbox) + this.path.sep + messageid + this.msgFileExt;
if (this.fs.fileExistsSync(currentMailFile)) if (this.fs.fileExistsSync(currentMailFile))
return this.fs.unlink(currentMailFile); return this.fs.unlink(currentMailFile);
else else