Browse Source

post install msg to bot

push-params
Evan Feenstra 4 years ago
parent
commit
4f788142b4
  1. 11
      api/controllers/bots.ts
  2. 1
      api/utils/setup.ts
  3. 12
      package-lock.json
  4. 2
      package.json

11
api/controllers/bots.ts

@ -170,6 +170,7 @@ export async function receiveBotInstall(payload) {
// NO - send a /guildjoin msg to BOT lib!
// and add routes to lib express with the strings for MSG_TYPE
// and here - postToBotServer /install (also do this for /uninstall)
postToBotServer(payload, bot, SphinxBot.MSG_TYPE.INSTALL)
}
// ONLY FOR BOT MAKER
@ -197,13 +198,19 @@ export async function receiveBotCmd(payload) {
botMember.update({ msgCount: (botMember||0)+1 })
console.log('=> post to remote BOT!!!!! bot owner')
return postToBotServer(payload, bot)
postToBotServer(payload, bot, SphinxBot.MSG_TYPE.MESSAGE)
// forward to the entire Action back over MQTT
}
export async function postToBotServer(msg, bot): Promise<boolean> {
export async function postToBotServer(msg, bot, route:string): Promise<boolean> {
if(!bot) return false
if(!bot.webhook || !bot.secret) return false
let url = bot.webhook
if(url.charAt(url.length-1)==='/') {
url += route
} else {
url += ('/'+route)
}
const r = await fetch(bot.webhook, {
method:'POST',
body:JSON.stringify(

1
api/utils/setup.ts

@ -90,7 +90,6 @@ async function migrate(){
await sequelize.query(`CREATE UNIQUE INDEX chat_member_index ON sphinx_chat_members(chat_id, contact_id);`)
}catch(e){}
addTableColumn('sphinx_chats', 'private', 'BOOLEAN')
addTableColumn('sphinx_chats', 'unlisted', 'BOOLEAN')
addTableColumn('sphinx_chat_members', 'status', 'BIGINT')

12
package-lock.json

@ -1224,9 +1224,9 @@
"integrity": "sha1-h3L80EGOPNLMFxVV1zAHQVBR9LI="
},
"@types/qs": {
"version": "6.9.4",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz",
"integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ=="
"version": "6.9.5",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz",
"integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="
},
"@types/range-parser": {
"version": "1.2.3",
@ -11305,9 +11305,9 @@
}
},
"sphinx-bot": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.11.tgz",
"integrity": "sha512-JPaOdiMSL7/zapelyyFVVGB3eOGolND0S2uOc1eKCHZtRJblNeeOpVUeVY/wsuEpfeOxIJjtJuLfEKrkHksVVw==",
"version": "0.2.12",
"resolved": "https://registry.npmjs.org/sphinx-bot/-/sphinx-bot-0.2.12.tgz",
"integrity": "sha512-9vHYe1Eze5sZ8tYtwWklURGxDCmojbd8dwYZ+magQigZG/uKeeGUEVHD233oqee+y076If74QhZdf2VLH6rnnA==",
"requires": {
"@types/cors": "^2.8.7",
"@types/express": "^4.17.8",

2
package.json

@ -79,7 +79,7 @@
"short-uuid": "^3.1.1",
"sjcl": "^1.0.8",
"socket.io": "^2.3.0",
"sphinx-bot": "^0.2.11",
"sphinx-bot": "^0.2.12",
"tail": "^2.0.3",
"ts-node": "^8.5.4",
"tsc": "^1.20150623.0",

Loading…
Cancel
Save