cmds func fin v1

This commit is contained in:
Jay
2018-07-02 23:02:48 +08:00
parent d6f1b81796
commit d7c64b3c65
4 changed files with 33 additions and 5 deletions
+6 -1
View File
@@ -375,10 +375,15 @@ const delTwitch = async (txt = '', source = {}, db) => {
}
}
const hello = async () => {
return 'Hello World'
}
module.exports = {
addgroup: run.bind(null, addGroup),
addpage: run.bind(null, addPage),
delpage: run.bind(null, delPage),
addtwitch: run.bind(null, addTwitch),
deltwitch: run.bind(null, delTwitch)
deltwitch: run.bind(null, delTwitch),
hello: run.bind(null, hello)
}
+6 -3
View File
@@ -15,11 +15,14 @@ const parseCMD = async (text = '', source = {}) => {
try {
let result = await db.query({
text: `select "message" from "public"."commands" where "cmd" = $1`,
values: [cmd]
text: `select "message", "group" from "public"."commands" where "cmd" = $1 and ("group" = '' or "group" = $2)`,
values: [cmd, source.groupId]
})
if (result.rowCount > 0) {
let content = result.rows[0].message
let obj = result.rows.filter(t => t.group === source.groupId)
if (obj.length === 0) obj = result.rows[0]
else obj = obj[0]
let content = obj.message
let m = content.match(/{{(.+?)}}/g)
if (m !== null && m.length > 0) {
for (let i = 0; i < m.length; i++) {