Hass/message-pusher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

🎉 able to send markdown message now

Browse Source
This commit is contained in:
Song
2021-01-31 16:00:01 +08:00
parent 63e8bd8744
commit 25f120d197
4 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/message.js
+1 -1
View File
@@ -1,6 +1,6 @@
const { pushWeChatMessage } = require('./wechat'); const { pushWeChatMessage } = require('./wechat');
const { pushEmailMessage } = require('./email'); const { pushEmailMessage } = require('./email');
const Message = require('../models/message').Message; const { Message } = require('../models');
async function processMessage(userPrefix, message) { async function processMessage(userPrefix, message) {
if (message.email) { if (message.email) {
common/wechat.js
+2 -1
View File
@@ -45,7 +45,8 @@ async function pushWeChatMessage(userPrefix, message) {
template_id: user.wechatTemplateId, template_id: user.wechatTemplateId,
}; };
if (message.content) { if (message.content) {
request_data.url = `${config.href}${userPrefix}/${message.id}`; request_data.url = `${config.href}message/${message.id}`;
console.debug(`http://localhost:3000/message/${message.id}`);
} }
request_data.data = { text: { value: message.description } }; request_data.data = { text: { value: message.description } };
let requestUrl = `https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=${access_token}`; let requestUrl = `https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=${access_token}`;
routers/message.js
+18 -4
View File
@@ -1,4 +1,6 @@
const express = require('express'); const express = require('express');
const { Message } = require('../models');
const { md2html } = require('../common/utils');
const router = express.Router(); const router = express.Router();
@@ -10,11 +12,23 @@ router.get('/delete/:id', (req, res, next) => {
}); });
}); });
router.get('/:id', (req, res, next) => { router.get('/:id', async (req, res, next) => {
const id = req.params.id; const id = req.params.id;
// TODO: show article try {
req.query.description = req.params.description; let message = await Message.findOne({
res.render('article'); where: {
id: id,
},
});
if (message) {
message.content = md2html(message.content);
res.render('article', {
message,
});
}
} catch (e) {
res.status(404);
}
}); });
module.exports = router; module.exports = router;
views/article.ejs
+20 -32
View File
@@ -1,34 +1,22 @@
<%- include('./partials/header') %> <!DOCTYPE html>
<html lang="zh">
<div class="normal-container"> <head>
<div class="columns is-desktop"> <meta charset="UTF-8"/>
<div class="column"> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<article id="article"> <title><%= message.title %></title>
<%- include('./partials/page-info') %> <meta name="theme-color" content="#ffffff"/>
<%-page.converted_content%> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
<p class="copyright"><strong>Links: <a href="<%-page.link%>"><%-page.link%></a></strong></p> <link rel="stylesheet" href="/public/main.css">
<%- config.copyright %> </head>
<%- config.ad %> <body>
</article> <div class="container" style="max-width: 960px">
</div> <div style="margin: 16px 16px">
<div class="column is-one-fifth-fullhd"> <h1 class="title"><%= message.title %></h1>
<aside class="menu toc"> <h2 class="subtitle"><%- message.description %></h2>
<p class="menu-label"> <article id="article">
Table of Content <%- message.content %>
</p> </article>
<ul class="menu-list" id="toc">
</ul>
</aside>
</div>
</div> </div>
<%- include('./partials/prev-next') %>
<%- include('./partials/comment') %>
</div> </div>
</body>
<script> </html>
(function() {
generateTOC();
})();
</script>
<%- include('./partials/footer') %>