From fd08694c885cc2d87e84b8cec836d064f830d854 Mon Sep 17 00:00:00 2001 From: Sukhamjot Singh Date: Tue, 22 Mar 2022 00:10:28 +0530 Subject: [PATCH] added spam --- webui-src/app/mail/mail_resolver.js | 5 +++++ webui-src/app/mail/mail_spam.js | 27 +++++++++++++++++++++++++++ webui-src/app/mail/mail_util.js | 5 +++-- webui-src/app/theme.css | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 webui-src/app/mail/mail_spam.js diff --git a/webui-src/app/mail/mail_resolver.js b/webui-src/app/mail/mail_resolver.js index aa50617..aa9701e 100644 --- a/webui-src/app/mail/mail_resolver.js +++ b/webui-src/app/mail/mail_resolver.js @@ -13,6 +13,7 @@ const Messages = { trash: [], starred: [], system: [], + spam: [], load() { rs.rsJsonApiRequest('/rsMsgs/getMessageSummaries', {}, (data) => { Messages.all = data.msgList; @@ -37,6 +38,9 @@ const Messages = { Messages.system = Messages.all.filter( (msg) => (msg.msgflags & util.RS_MSG_SYSTEM) ); + Messages.spam = Messages.all.filter( + (msg) => (msg.msgflags & util.RS_MSG_SPAM) + ); }); }, }; @@ -51,6 +55,7 @@ const sections = { const sectionsquickview = { starred: require('mail/mail_starred'), system: require('mail/mail_system'), + spam: require('mail/mail_spam'), }; const tagselect = { showval: 'Tags', diff --git a/webui-src/app/mail/mail_spam.js b/webui-src/app/mail/mail_spam.js new file mode 100644 index 0000000..26a1f5f --- /dev/null +++ b/webui-src/app/mail/mail_spam.js @@ -0,0 +1,27 @@ +const m = require('mithril'); +const util = require('mail/mail_util'); + +const Layout = () => { + return { + view: (v) => [ + m('.widget', [ + m('h3', 'Spam'), + m('hr'), + m( + util.Table, + m( + 'tbody', + v.attrs.list.map((msg) => + m(util.MessageSummary, { + details: msg, + category: 'spam', + }) + ) + ) + ), + ]), + ], + }; +}; + +module.exports = Layout; diff --git a/webui-src/app/mail/mail_util.js b/webui-src/app/mail/mail_util.js index 18998b8..1d45034 100644 --- a/webui-src/app/mail/mail_util.js +++ b/webui-src/app/mail/mail_util.js @@ -11,7 +11,7 @@ const RS_MSG_TRASH = 0x000020; const RS_MSG_NEW = 0x10; const RS_MSG_UNREAD_BY_USER = 0x40; const RS_MSG_STAR = 0x200; - +const RS_MSG_SPAM = 0x040000; const RS_MSG_USER_REQUEST = 0x000400; const RS_MSG_FRIEND_RECOMMENDATION = 0x000800; const RS_MSG_PUBLISH_KEY = 0x020000; @@ -221,5 +221,6 @@ module.exports = { RS_MSG_UNREAD_BY_USER, RS_MSG_STAR, RS_MSG_TRASH, - RS_MSG_SYSTEM + RS_MSG_SYSTEM, + RS_MSG_SPAM }; diff --git a/webui-src/app/theme.css b/webui-src/app/theme.css index 0adbff2..2c0a71e 100644 --- a/webui-src/app/theme.css +++ b/webui-src/app/theme.css @@ -444,7 +444,7 @@ a.tab-menu-item { /* Content adjacent to sidebar */ .node-panel { position: relative; - bottom: 100px; + bottom: 140px; margin-left: 200px; animation: fadein 0.5s; }