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

fix reading posts without signature

Browse Source
This commit is contained in:
zefie
2022-10-14 11:57:54 -04:00
parent 097c908590
commit f23c8e6b9b
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
zefie_wtvp_minisrv/ServiceVault/wtv-news/news.js
View File

@@ -336,16 +336,18 @@ wtv-expire-all: wtv-news:/news?group=${group}&article=`;
var attachments = null; var attachments = null;
var signature_index = null; var signature_index = null;
if (message.attachments) attachments = message.attachments; if (message.attachments) attachments = message.attachments;
Object.keys(attachments).forEach((k) => { if (attachments) {
if (attachments[k].filename == "wtv_signature.html" && attachments[k].content_type.match(/text\/html/)) { if (Object.keys(attachments).length > 0) {
signature = attachments[k].data; Object.keys(attachments).forEach((k) => {
signature_index = k; if (attachments[k].filename == "wtv_signature.html" && attachments[k].content_type.match(/text\/html/)) {
return false; signature = attachments[k].data;
signature_index = k;
return false;
}
});
attachments.splice(signature_index, 1);
} }
}); }
attachments.splice(signature_index, 1);
console.log(signature)
if (signature) message_colors = session_data.mailstore.getSignatureColors(signature); if (signature) message_colors = session_data.mailstore.getSignatureColors(signature);
data = `<head> data = `<head>
@@ -639,6 +641,7 @@ ${wtvshared.htmlEntitize(message_body, true)}
}).catch((e) => { }).catch((e) => {
// no such article // no such article
var post_unavailable_file = this.wtvshared.getAbsolutePath(this.minisrv_config.config.ServiceDeps + '/wtv-news/post-unavailable.html'); var post_unavailable_file = this.wtvshared.getAbsolutePath(this.minisrv_config.config.ServiceDeps + '/wtv-news/post-unavailable.html');
console.log(e);
if (fs.existsSync(post_unavailable_file)) { if (fs.existsSync(post_unavailable_file)) {
headers = "200 OK\nContent-type: text/html"; headers = "200 OK\nContent-type: text/html";
data = fs.readFileSync(post_unavailable_file).toString('ascii').replace("${group}", group).replace("${minisrv_config.config.service_logo}", minisrv_config.config.service_logo).replace("${message_colors.bgcolor}",session_data.mailstore.defaultColors.bgcolor); data = fs.readFileSync(post_unavailable_file).toString('ascii').replace("${group}", group).replace("${minisrv_config.config.service_logo}", minisrv_config.config.service_logo).replace("${message_colors.bgcolor}",session_data.mailstore.defaultColors.bgcolor);