From bcf127a44ef84cf25fe69546f88a4960ceb81ce5 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Tue, 1 Sep 2020 17:04:28 -0700 Subject: [PATCH] network interceptors to test msgs as bots commands, new SQL BotMember table, new fields on ChatMember and Bot, new msg types bot_install, bot_cmd, bot_res --- api/controllers/bots.ts | 31 +++++++++++++++++++++ api/models/ts/bot.ts | 3 +++ api/models/ts/botMember.ts | 21 +++++++++++++++ api/models/ts/chatMember.ts | 12 +++++++++ api/network/intercept.ts | 30 +++++++++++++++++++++ api/network/receive.ts | 5 ++++ api/network/send.ts | 7 ++++- api/utils/setup.ts | 17 ++++++++++++ config/constants.json | 6 ++++- dist/api/controllers/bots.js | 40 ++++++++++++++++++++++++++++ dist/api/controllers/bots.js.map | 1 + dist/api/models/ts/bot.js | 4 +++ dist/api/models/ts/bot.js.map | 2 +- dist/api/models/ts/botMember.js | 39 +++++++++++++++++++++++++++ dist/api/models/ts/botMember.js.map | 1 + dist/api/models/ts/chatMember.js | 16 +++++++++++ dist/api/models/ts/chatMember.js.map | 2 +- dist/api/network/intercept.js | 16 +++++++++++ dist/api/network/intercept.js.map | 1 + dist/api/network/receive.js | 5 ++++ dist/api/network/receive.js.map | 2 +- dist/api/network/send.js | 10 ++++++- dist/api/network/send.js.map | 2 +- dist/api/utils/setup.js | 16 +++++++++++ dist/api/utils/setup.js.map | 2 +- dist/config/constants.json | 6 ++++- 26 files changed, 288 insertions(+), 9 deletions(-) create mode 100644 api/controllers/bots.ts create mode 100644 api/models/ts/botMember.ts create mode 100644 api/network/intercept.ts create mode 100644 dist/api/controllers/bots.js create mode 100644 dist/api/controllers/bots.js.map create mode 100644 dist/api/models/ts/botMember.js create mode 100644 dist/api/models/ts/botMember.js.map create mode 100644 dist/api/network/intercept.js create mode 100644 dist/api/network/intercept.js.map diff --git a/api/controllers/bots.ts b/api/controllers/bots.ts new file mode 100644 index 0000000..363ced1 --- /dev/null +++ b/api/controllers/bots.ts @@ -0,0 +1,31 @@ +import * as path from 'path' + +const constants = require(path.join(__dirname, '../../config/constants.json')) + +/* intercept */ + +export const installBot = async (req,res) => { + // need bot uuid and maker pubkey + // send bot_install to bot maker + // mqtt sub to the bot uuid (dont need this actually) + + // generate ChatMember with bot=true + // bot_maker_pubkey, bot_uuid, bot_prefix +} + +export async function receiveBotInstall(payload) { + console.log('=> receiveBotInstall') + // const dat = payload.content || payload + // const sender_pub_key = dat.sender.pub_key + // const tribe_uuid = dat.chat.uuid + + // verify tribe ownership (verify signed timestamp) + + // create BotMember for publishing to mqtt +} + +// type BotResType = 'install' | 'message' | 'broadcast' | 'keysend' + +export async function receiveBotRes(payload) { + console.log(constants.message_types.bot_res) +} diff --git a/api/models/ts/bot.ts b/api/models/ts/bot.ts index 841a8c6..e287a8e 100644 --- a/api/models/ts/bot.ts +++ b/api/models/ts/bot.ts @@ -19,6 +19,9 @@ export default class Bot extends Model { @Column secret: string + @Column + webhook: string + @Column createdAt: Date diff --git a/api/models/ts/botMember.ts b/api/models/ts/botMember.ts new file mode 100644 index 0000000..e0297fa --- /dev/null +++ b/api/models/ts/botMember.ts @@ -0,0 +1,21 @@ +import { Table, Column, Model } from 'sequelize-typescript'; + +@Table({tableName: 'sphinx_bot_members', underscored: true}) +export default class BotMember extends Model { + + @Column + memberPubkey: string + + @Column + tribeUuid: string + + @Column + msgCount: number + + @Column + createdAt: Date + + @Column + updatedAt: Date + +} \ No newline at end of file diff --git a/api/models/ts/chatMember.ts b/api/models/ts/chatMember.ts index 4a6ea79..14d2f7e 100644 --- a/api/models/ts/chatMember.ts +++ b/api/models/ts/chatMember.ts @@ -26,4 +26,16 @@ export default class ChatMember extends Model { @Column status: number + @Column + bot: boolean + + @Column + botPrefix: string + + @Column + botMakerPubkey: string + + @Column + botUuid: string + } \ No newline at end of file diff --git a/api/network/intercept.ts b/api/network/intercept.ts new file mode 100644 index 0000000..bba74ff --- /dev/null +++ b/api/network/intercept.ts @@ -0,0 +1,30 @@ + +/* + process if bot message + AND return true if it is, and forward to bot +*/ + +export interface Msg { + type: number, + message: { + content: string + }, + chat: { + uuid: string + }, + sender: { + pub_key: string, + alias: string, + } +} + +// msg.message.content +export function isBotMsg(msg:Msg, sentByMe:boolean){ + return false + + // check if bot msg + // check my ChatMembers to see if its here + // OR check my Bots if im the maker + + // process it "bot_cmd" +} diff --git a/api/network/receive.ts b/api/network/receive.ts index efb064b..29a3110 100644 --- a/api/network/receive.ts +++ b/api/network/receive.ts @@ -11,6 +11,7 @@ import {modifyPayloadAndSaveMediaKey,purchaseFromOriginalSender,sendFinalMemeIfF import {decryptMessage,encryptTribeBroadcast} from '../utils/msg' import { Op } from 'sequelize' import * as timers from '../utils/timers' +import * as intercept from './intercept' /* delete type: @@ -130,6 +131,10 @@ async function doTheAction(data){ /* decrypt and re-encrypt with phone's pubkey for storage */ const chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}}) const pld = await decryptMessage(data, chat) + const isBotMsg = intercept.isBotMsg(pld, false) + if(isBotMsg===true) { + return // DO NOT FORWARD TO TRIBE, forwarded to bot instead + } const me = await models.Contact.findOne({where:{isOwner:true}}) payload = await encryptTribeBroadcast(pld, me, true) // true=isTribeOwner if(ogContent) payload.message.remoteContent = JSON.stringify({'chat':ogContent}) // this is the key diff --git a/api/network/send.ts b/api/network/send.ts index b3e8593..377b0ff 100644 --- a/api/network/send.ts +++ b/api/network/send.ts @@ -6,6 +6,7 @@ import * as path from 'path' import * as tribes from '../utils/tribes' import {tribeOwnerAutoConfirmation} from '../controllers/confirmations' import {typesToForward} from './receive' +import * as intercept from './intercept' const constants = require(path.join(__dirname,'../../config/constants.json')) @@ -48,6 +49,10 @@ export async function sendMessage(params) { networkType = 'mqtt' // broadcast to all // decrypt message.content and message.mediaKey w groupKey msg = await decryptMessage(msg, chat) + const isBotMsg = intercept.isBotMsg(msg, true) + if(isBotMsg===true) { + return // DO NOT FORWARD TO TRIBE, forwarded to bot instead + } // post last_active to tribes server tribes.putActivity(chat.uuid, chat.host) } else { @@ -163,7 +168,7 @@ export function newmsg(type, chat, sender, message){ message: message, sender: { pub_key: sender.publicKey, - ...includeAlias && {alias: sender.alias}, + alias: includeAlias ? sender.alias : '', // ...includePhotoUrl && {photo_url: sender.photoUrl}, // ...sender.contactKey && {contact_key: sender.contactKey} } diff --git a/api/utils/setup.ts b/api/utils/setup.ts index 824d511..1c5c480 100644 --- a/api/utils/setup.ts +++ b/api/utils/setup.ts @@ -31,6 +31,23 @@ async function setVersion(){ } async function migrate(){ + addTableColumn('sphinx_chat_members', 'bot', 'BOOLEAN') + addTableColumn('sphinx_chat_members', 'bot_prefix') + addTableColumn('sphinx_chat_members', 'bot_maker_pubkey') + addTableColumn('sphinx_chat_members', 'bot_uuid') + + addTableColumn('sphinx_bots', 'webhook') + + try{ + await sequelize.query(` + CREATE TABLE sphinx_bot_members ( + member_pubkey TEXT, + tribe_uuid TEXT, + msg_count BIGINT, + created_at DATETIME, + updated_at DATETIME + )`) + } catch(e){} try{ await sequelize.query(` diff --git a/config/constants.json b/config/constants.json index 47d7a81..4ed9b2b 100644 --- a/config/constants.json +++ b/config/constants.json @@ -47,7 +47,11 @@ "repayment": 18, "member_request": 19, "member_approve": 20, - "member_reject": 21 + "member_reject": 21, + "tribe_delete": 22, + "bot_install": 23, + "bot_cmd": 24, + "bot_res": 25 }, "payment_errors": { "timeout": "Timed Out", diff --git a/dist/api/controllers/bots.js b/dist/api/controllers/bots.js new file mode 100644 index 0000000..40aa257 --- /dev/null +++ b/dist/api/controllers/bots.js @@ -0,0 +1,40 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const path = require("path"); +const constants = require(path.join(__dirname, '../../config/constants.json')); +/* intercept */ +exports.installBot = (req, res) => __awaiter(void 0, void 0, void 0, function* () { + // need bot uuid and maker pubkey + // send bot_install to bot maker + // mqtt sub to the bot uuid (dont need this actually) + // generate ChatMember with bot=true + // bot_maker_pubkey, bot_uuid, bot_prefix +}); +function receiveBotInstall(payload) { + return __awaiter(this, void 0, void 0, function* () { + console.log('=> receiveBotInstall'); + // const dat = payload.content || payload + // const sender_pub_key = dat.sender.pub_key + // const tribe_uuid = dat.chat.uuid + // verify tribe ownership (verify signed timestamp) + // create BotMember for publishing to mqtt + }); +} +exports.receiveBotInstall = receiveBotInstall; +// type BotResType = 'install' | 'message' | 'broadcast' | 'keysend' +function receiveBotRes(payload) { + return __awaiter(this, void 0, void 0, function* () { + console.log(constants.message_types.bot_res); + }); +} +exports.receiveBotRes = receiveBotRes; +//# sourceMappingURL=bots.js.map \ No newline at end of file diff --git a/dist/api/controllers/bots.js.map b/dist/api/controllers/bots.js.map new file mode 100644 index 0000000..8b6b4e2 --- /dev/null +++ b/dist/api/controllers/bots.js.map @@ -0,0 +1 @@ +{"version":3,"file":"bots.js","sourceRoot":"","sources":["../../../api/controllers/bots.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC,CAAA;AAE9E,eAAe;AAEF,QAAA,UAAU,GAAG,CAAO,GAAG,EAAC,GAAG,EAAE,EAAE;IAC1C,iCAAiC;IACjC,gCAAgC;IAChC,qDAAqD;IAErD,oCAAoC;IACpC,yCAAyC;AAC3C,CAAC,CAAA,CAAA;AAED,SAAsB,iBAAiB,CAAC,OAAO;;QAC7C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACnC,yCAAyC;QACzC,4CAA4C;QAC5C,mCAAmC;QAEnC,mDAAmD;QAEnD,0CAA0C;IAC5C,CAAC;CAAA;AATD,8CASC;AAED,oEAAoE;AAEpE,SAAsB,aAAa,CAAC,OAAO;;QACzC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAC9C,CAAC;CAAA;AAFD,sCAEC"} \ No newline at end of file diff --git a/dist/api/models/ts/bot.js b/dist/api/models/ts/bot.js index 23c56e6..dae35b9 100644 --- a/dist/api/models/ts/bot.js +++ b/dist/api/models/ts/bot.js @@ -32,6 +32,10 @@ __decorate([ sequelize_typescript_1.Column, __metadata("design:type", String) ], Bot.prototype, "secret", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], Bot.prototype, "webhook", void 0); __decorate([ sequelize_typescript_1.Column, __metadata("design:type", Date) diff --git a/dist/api/models/ts/bot.js.map b/dist/api/models/ts/bot.js.map index 6278f0a..8eeba22 100644 --- a/dist/api/models/ts/bot.js.map +++ b/dist/api/models/ts/bot.js.map @@ -1 +1 @@ -{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../../../api/models/ts/bot.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,GAAG,GAAxB,MAAqB,GAAI,SAAQ,4BAAU;CAwB1C,CAAA;AAjBC;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;KACb,CAAC;;+BACQ;AAGV;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;mCACV;AAGd;IADC,6BAAM;;iCACK;AAGZ;IADC,6BAAM;;mCACO;AAGd;IADC,6BAAM;8BACI,IAAI;sCAAA;AAGf;IADC,6BAAM;8BACI,IAAI;sCAAA;AAtBI,GAAG;IADvB,4BAAK,CAAC,EAAC,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GAChC,GAAG,CAwBvB;kBAxBoB,GAAG"} \ No newline at end of file +{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../../../api/models/ts/bot.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,GAAG,GAAxB,MAAqB,GAAI,SAAQ,4BAAU;CA2B1C,CAAA;AApBC;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;KACb,CAAC;;+BACQ;AAGV;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;mCACV;AAGd;IADC,6BAAM;;iCACK;AAGZ;IADC,6BAAM;;mCACO;AAGd;IADC,6BAAM;;oCACQ;AAGf;IADC,6BAAM;8BACI,IAAI;sCAAA;AAGf;IADC,6BAAM;8BACI,IAAI;sCAAA;AAzBI,GAAG;IADvB,4BAAK,CAAC,EAAC,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GAChC,GAAG,CA2BvB;kBA3BoB,GAAG"} \ No newline at end of file diff --git a/dist/api/models/ts/botMember.js b/dist/api/models/ts/botMember.js new file mode 100644 index 0000000..49123ce --- /dev/null +++ b/dist/api/models/ts/botMember.js @@ -0,0 +1,39 @@ +"use strict"; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const sequelize_typescript_1 = require("sequelize-typescript"); +let BotMember = class BotMember extends sequelize_typescript_1.Model { +}; +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], BotMember.prototype, "memberPubkey", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], BotMember.prototype, "tribeUuid", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Number) +], BotMember.prototype, "msgCount", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], BotMember.prototype, "createdAt", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], BotMember.prototype, "updatedAt", void 0); +BotMember = __decorate([ + sequelize_typescript_1.Table({ tableName: 'sphinx_bot_members', underscored: true }) +], BotMember); +exports.default = BotMember; +//# sourceMappingURL=botMember.js.map \ No newline at end of file diff --git a/dist/api/models/ts/botMember.js.map b/dist/api/models/ts/botMember.js.map new file mode 100644 index 0000000..67c93c6 --- /dev/null +++ b/dist/api/models/ts/botMember.js.map @@ -0,0 +1 @@ +{"version":3,"file":"botMember.js","sourceRoot":"","sources":["../../../../api/models/ts/botMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4D;AAG5D,IAAqB,SAAS,GAA9B,MAAqB,SAAU,SAAQ,4BAAgB;CAiBtD,CAAA;AAdC;IADC,6BAAM;;+CACa;AAGpB;IADC,6BAAM;;4CACU;AAGjB;IADC,6BAAM;;2CACS;AAGhB;IADC,6BAAM;8BACI,IAAI;4CAAA;AAGf;IADC,6BAAM;8BACI,IAAI;4CAAA;AAfI,SAAS;IAD7B,4BAAK,CAAC,EAAC,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACvC,SAAS,CAiB7B;kBAjBoB,SAAS"} \ No newline at end of file diff --git a/dist/api/models/ts/chatMember.js b/dist/api/models/ts/chatMember.js index 1de5afe..4f82e37 100644 --- a/dist/api/models/ts/chatMember.js +++ b/dist/api/models/ts/chatMember.js @@ -40,6 +40,22 @@ __decorate([ sequelize_typescript_1.Column, __metadata("design:type", Number) ], ChatMember.prototype, "status", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Boolean) +], ChatMember.prototype, "bot", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], ChatMember.prototype, "botPrefix", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], ChatMember.prototype, "botMakerPubkey", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], ChatMember.prototype, "botUuid", void 0); ChatMember = __decorate([ sequelize_typescript_1.Table({ tableName: 'sphinx_chat_members', underscored: true, indexes: [ { unique: true, fields: ['chat_id', 'contact_id'] } diff --git a/dist/api/models/ts/chatMember.js.map b/dist/api/models/ts/chatMember.js.map index dbbad65..1459bed 100644 --- a/dist/api/models/ts/chatMember.js.map +++ b/dist/api/models/ts/chatMember.js.map @@ -1 +1 @@ -{"version":3,"file":"chatMember.js","sourceRoot":"","sources":["../../../../api/models/ts/chatMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4D;AAK5D,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,4BAAiB;CAuBxD,CAAA;AApBC;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;6CACU;AAGjB;IADC,6BAAM;;wCACK;AAGZ;IADC,6BAAM;;8CACW;AAGlB;IADC,6BAAM;;iDACc;AAGrB;IADC,6BAAM;8BACK,IAAI;8CAAA;AAGhB;IADC,6BAAM;;0CACO;AArBK,UAAU;IAH9B,4BAAK,CAAC,EAAC,SAAS,EAAE,qBAAqB,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAC;YACnE,EAAC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,SAAS,EAAC,YAAY,CAAC,EAAC;SAC/C,EAAC,CAAC;GACkB,UAAU,CAuB9B;kBAvBoB,UAAU"} \ No newline at end of file +{"version":3,"file":"chatMember.js","sourceRoot":"","sources":["../../../../api/models/ts/chatMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4D;AAK5D,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,4BAAiB;CAmCxD,CAAA;AAhCC;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;6CACU;AAGjB;IADC,6BAAM;;wCACK;AAGZ;IADC,6BAAM;;8CACW;AAGlB;IADC,6BAAM;;iDACc;AAGrB;IADC,6BAAM;8BACK,IAAI;8CAAA;AAGhB;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;uCACK;AAGZ;IADC,6BAAM;;6CACU;AAGjB;IADC,6BAAM;;kDACe;AAGtB;IADC,6BAAM;;2CACQ;AAjCI,UAAU;IAH9B,4BAAK,CAAC,EAAC,SAAS,EAAE,qBAAqB,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAC;YACnE,EAAC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,SAAS,EAAC,YAAY,CAAC,EAAC;SAC/C,EAAC,CAAC;GACkB,UAAU,CAmC9B;kBAnCoB,UAAU"} \ No newline at end of file diff --git a/dist/api/network/intercept.js b/dist/api/network/intercept.js new file mode 100644 index 0000000..be49c3a --- /dev/null +++ b/dist/api/network/intercept.js @@ -0,0 +1,16 @@ +"use strict"; +/* + process if bot message + AND return true if it is, and forward to bot +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +// msg.message.content +function isBotMsg(msg, sentByMe) { + return false; + // check if bot msg + // check my ChatMembers to see if its here + // OR check my Bots if im the maker + // process it "bot_cmd" +} +exports.isBotMsg = isBotMsg; +//# sourceMappingURL=intercept.js.map \ No newline at end of file diff --git a/dist/api/network/intercept.js.map b/dist/api/network/intercept.js.map new file mode 100644 index 0000000..4dfd1d3 --- /dev/null +++ b/dist/api/network/intercept.js.map @@ -0,0 +1 @@ +{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":";AACA;;;EAGE;;AAgBF,sBAAsB;AACtB,SAAgB,QAAQ,CAAC,GAAO,EAAE,QAAgB;IAChD,OAAO,KAAK,CAAA;IAEZ,mBAAmB;IACnB,0CAA0C;IAC1C,mCAAmC;IAEnC,uBAAuB;AACzB,CAAC;AARD,4BAQC"} \ No newline at end of file diff --git a/dist/api/network/receive.js b/dist/api/network/receive.js index 54804ce..3eee253 100644 --- a/dist/api/network/receive.js +++ b/dist/api/network/receive.js @@ -22,6 +22,7 @@ const modify_1 = require("./modify"); const msg_1 = require("../utils/msg"); const sequelize_1 = require("sequelize"); const timers = require("../utils/timers"); +const intercept = require("./intercept"); /* delete type: owner needs to check that the delete is the one who made the msg @@ -149,6 +150,10 @@ function doTheAction(data) { /* decrypt and re-encrypt with phone's pubkey for storage */ const chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } }); const pld = yield msg_1.decryptMessage(data, chat); + const isBotMsg = intercept.isBotMsg(pld, false); + if (isBotMsg === true) { + return; // DO NOT FORWARD TO TRIBE, forwarded to bot instead + } const me = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); payload = yield msg_1.encryptTribeBroadcast(pld, me, true); // true=isTribeOwner if (ogContent) diff --git a/dist/api/network/receive.js.map b/dist/api/network/receive.js.map index 8517949..b8617e8 100644 --- a/dist/api/network/receive.js.map +++ b/dist/api/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/network/send.js b/dist/api/network/send.js index 6edc97e..e765de1 100644 --- a/dist/api/network/send.js +++ b/dist/api/network/send.js @@ -17,6 +17,7 @@ const path = require("path"); const tribes = require("../utils/tribes"); const confirmations_1 = require("../controllers/confirmations"); const receive_1 = require("./receive"); +const intercept = require("./intercept"); const constants = require(path.join(__dirname, '../../config/constants.json')); const MIN_SATS = 3; function sendMessage(params) { @@ -53,6 +54,10 @@ function sendMessage(params) { networkType = 'mqtt'; // broadcast to all // decrypt message.content and message.mediaKey w groupKey msg = yield msg_1.decryptMessage(msg, chat); + const isBotMsg = intercept.isBotMsg(msg, true); + if (isBotMsg === true) { + return; // DO NOT FORWARD TO TRIBE, forwarded to bot instead + } // post last_active to tribes server tribes.putActivity(chat.uuid, chat.host); } @@ -162,7 +167,10 @@ function newmsg(type, chat, sender, message) { type: type, chat: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), (chat.type || chat.type === 0) && { type: chat.type }), chat.members && { members: chat.members }), (includeGroupKey && chat.groupKey) && { groupKey: chat.groupKey }), (includeGroupKey && chat.host) && { host: chat.host }), message: message, - sender: Object.assign({ pub_key: sender.publicKey }, includeAlias && { alias: sender.alias }) + sender: { + pub_key: sender.publicKey, + alias: includeAlias ? sender.alias : '', + } }; } exports.newmsg = newmsg; diff --git a/dist/api/network/send.js.map b/dist/api/network/send.js.map index fff3ae9..3d1622e 100644 --- a/dist/api/network/send.js.map +++ b/dist/api/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../api/network/send.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkC;AAClC,0CAAyC;AACzC,0CAAyC;AACzC,sCAA+D;AAC/D,6BAA4B;AAC5B,0CAAyC;AACzC,gEAAuE;AACvE,uCAAwC;AAExC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,6BAA6B,CAAC,CAAC,CAAA;AAI7E,MAAM,QAAQ,GAAG,CAAC,CAAC;AAEnB,SAAsB,WAAW,CAAC,MAAM;;QACvC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAAA;QACpF,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAE7C,oCAAoC;QAEpC,4BAA4B;QAC5B,IAAG,CAAC,CAAC,MAAM,IAAE,MAAM,CAAC,SAAS,CAAC,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAC7B,OAAM;SACN;QAED,IAAI,UAAU,GAAG,CAAC,OAAO,IAAI,CAAC,UAAU,KAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;QAC1G,IAAG,UAAU,CAAC,MAAM,KAAG,CAAC,EAAE;YACzB,IAAI,UAAU,CAAC,CAAC,CAAC,KAAG,CAAC,EAAE;gBACtB,IAAG,OAAO;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAM,CAAC,uDAAuD;aAC9D;SACD;QAED,IAAI,WAAW,GAAe,SAAS,CAAA;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QACtD,IAAI,YAAY,GAAG,KAAK,CAAA;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;QAC1B,IAAG,OAAO,EAAE;YACX,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAA;YACzC,YAAY,GAAG,MAAM,CAAC,SAAS,KAAG,gBAAgB,CAAA;YAClD,IAAG,IAAI,KAAG,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE;gBAC/C,4BAA4B;gBAC5B,IAAG,CAAC,YAAY;oBAAE,OAAM,CAAC,yCAAyC;aAClE;YACD,IAAG,YAAY,EAAC;gBACf,WAAW,GAAG,MAAM,CAAA,CAAC,mBAAmB;gBACxC,0DAA0D;gBAC1D,GAAG,GAAG,MAAM,oBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;gBACrC,oCAAoC;gBACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;aACxC;iBAAM;gBACN,+BAA+B;gBAC/B,MAAM,UAAU,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,EAAC,SAAS,EAAC,gBAAgB,EAAC,EAAC,CAAC,CAAA;gBACtF,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;aAC9C;SACD;QAED,IAAI,GAAG,GAAO,IAAI,CAAA;QAClB,IAAI,EAAE,GAAO,IAAI,CAAA;QACjB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAC,UAAU,CAAC,CAAA;QACxC,MAAM,YAAY,CAAC,UAAU,EAAE,CAAM,SAAS,EAAC,EAAE;YAChD,IAAI,SAAS,IAAI,CAAC,EAAE,EAAE,oBAAoB;gBACzC,OAAM;aACN;YAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAC1E,IAAG,CAAC,OAAO,EAAC;gBACX,OAAM,CAAC,yCAAyC;aAChD;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAA;YACjC,IAAG,OAAO,KAAG,UAAU,EAAE;gBACxB,OAAM,CAAC,8DAA8D;aACrE;YACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;YAElD,IAAI,SAAS,GAAG,WAAW,KAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YACpE,0DAA0D;YAC1D,IAAG,YAAY,IAAI,UAAU,CAAC,MAAM,KAAG,CAAC,IAAI,MAAM,IAAI,MAAM,GAAC,QAAQ,EAAE;gBACtE,SAAS,GAAG,EAAE,CAAA,CAAC,mBAAmB;aAClC;YAED,MAAM,CAAC,GAAG,MAAM,wBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;YAC9D,MAAM,IAAI,GAAG;gBACZ,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,CAAC;gBACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,IAAE,CAAC,CAAC,EAAE,QAAQ,CAAC;aACpC,CAAA;YAED,IAAI;gBACH,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;gBAC5C,GAAG,GAAG,CAAC,CAAA;aACP;YAAC,OAAO,CAAC,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;gBAC/B,EAAE,GAAG,CAAC,CAAA;aACN;YACD,iBAAiB;QAClB,CAAC,CAAA,CAAC,CAAA;QACF,IAAG,GAAG,EAAC;YACN,IAAG,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAA;SACxB;aAAM;YACN,IAAG,OAAO;gBAAE,OAAO,CAAC,EAAE,CAAC,CAAA;SACvB;IACF,CAAC;CAAA;AAzFD,kCAyFC;AAED,SAAgB,WAAW,CAAC,IAAI,EAAE,SAAiB,EAAE,gBAAyB;IAC7E,qCAAqC;IACrC,OAAO,IAAI,OAAO,CAAC,UAAe,OAAO,EAAE,MAAM;;YAChD,IAAG,CAAC,IAAI,IAAI,OAAO,IAAI,KAAG,QAAQ,EAAE;gBACnC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;aAC3B;YACD,IAAG,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,OAAO,MAAM,CAAC,gBAAgB,CAAC,CAAA;aAC/B;YACD,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAE,EAAE,CAAC,CAAA;YACxC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;YAExB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,GAAG,IAAI,GAAG,GAAG,CAAA;YAEjB,0CAA0C;YAC1C,IAAI;gBACH,IAAG,SAAS,EAAE;oBACb,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE;wBACrC,IAAG,CAAC,gBAAgB,EAAC;4BACpB,IAAG,SAAS;gCAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;yBAC3C;oBACF,CAAC,CAAC,CAAA;iBACF;qBAAM;oBACN,MAAM,GAAG,CAAC,cAAc,iCAAK,IAAI,KAAC,IAAI,IAAE,CAAA;iBACxC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAA;aACb;YAAC,OAAM,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAA;aACT;QACF,CAAC;KAAA,CAAC,CAAA;AACH,CAAC;AA/BD,kCA+BC;AAED,SAAS,kBAAkB,CAAC,IAAI;IAC/B,IAAG,wBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC;QACrC,IAAG,IAAI,CAAC,IAAI,KAAG,SAAS,CAAC,aAAa,CAAC,MAAM,EAAC;YAC7C,OAAM,CAAC,+BAA+B;SACtC;QACD,0CAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC3D;AACF,CAAC;AAED,SAAgB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;IACjD,MAAM,eAAe,GAAG,IAAI,KAAG,SAAS,CAAC,aAAa,CAAC,YAAY,IAAI,IAAI,KAAG,SAAS,CAAC,aAAa,CAAC,YAAY,CAAA;IAClH,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACrF,4EAA4E;IAC5E,OAAO;QACN,IAAI,EAAE,IAAI;QACV,IAAI,0EACH,IAAI,EAAE,IAAI,CAAC,IAAI,IACZ,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAChC,CAAC,IAAI,CAAC,IAAI,IAAE,IAAI,CAAC,IAAI,KAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GACjD,IAAI,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GACzC,CAAC,eAAe,IAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,GAC/D,CAAC,eAAe,IAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CACtD;QACD,OAAO,EAAE,OAAO;QAChB,MAAM,kBACL,OAAO,EAAE,MAAM,CAAC,SAAS,IACtB,YAAY,IAAI,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAGxC;KACD,CAAA;AACF,CAAC;AAtBD,wBAsBC;AAED,SAAe,YAAY,CAAC,KAAK,EAAE,QAAQ;;QAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAChD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC7C;IACF,CAAC;CAAA;AACD,6BAA6B;AAC7B,0DAA0D;AAC1D,IAAI;AAEJ,oCAAoC;AACpC,iGAAiG;AACjG,IAAI;AACJ,oCAAoC;AACpC,yFAAyF;AACzF,IAAI"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../api/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/utils/setup.js b/dist/api/utils/setup.js index 684ac46..8b9198e 100644 --- a/dist/api/utils/setup.js +++ b/dist/api/utils/setup.js @@ -44,6 +44,22 @@ function setVersion() { } function migrate() { return __awaiter(this, void 0, void 0, function* () { + addTableColumn('sphinx_chat_members', 'bot', 'BOOLEAN'); + addTableColumn('sphinx_chat_members', 'bot_prefix'); + addTableColumn('sphinx_chat_members', 'bot_maker_pubkey'); + addTableColumn('sphinx_chat_members', 'bot_uuid'); + addTableColumn('sphinx_bots', 'webhook'); + try { + yield models_1.sequelize.query(` + CREATE TABLE sphinx_bot_members ( + member_pubkey TEXT, + tribe_uuid TEXT, + msg_count BIGINT, + created_at DATETIME, + updated_at DATETIME + )`); + } + catch (e) { } try { yield models_1.sequelize.query(` CREATE TABLE sphinx_bots ( diff --git a/dist/api/utils/setup.js.map b/dist/api/utils/setup.js.map index 98d53e2..add7933 100644 --- a/dist/api/utils/setup.js.map +++ b/dist/api/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/config/constants.json b/dist/config/constants.json index e07a2c1..7893277 100644 --- a/dist/config/constants.json +++ b/dist/config/constants.json @@ -47,7 +47,11 @@ "repayment": 18, "member_request": 19, "member_approve": 20, - "member_reject": 21 + "member_reject": 21, + "tribe_delete": 22, + "bot_install": 23, + "bot_cmd": 24, + "bot_res": 25 }, "payment_errors": { "timeout": "Timed Out",