lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

more handling

dependabot/npm_and_yarn/ini-1.3.7
Evan Feenstra 4 years ago
parent
a51164f36b
commit
4a69ceb11e
6 changed files with 94 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      dist/src/builtin/loop.js
  2. 2
      dist/src/builtin/loop.js.map
  3. 8
      dist/src/network/intercept.js
  4. 2
      dist/src/network/intercept.js.map
  5. 16
      src/builtin/loop.ts
  6. 8
      src/network/intercept.ts

13
dist/src/builtin/loop.js
View File

@ -134,7 +134,7 @@ function init() {
console.log("LOOPBOT stdout:", stdout);
if (stdout) {
console.log('=> LOOPBOT stdout', stdout);
if (stdout.startsWith('CONTINUE SWAP?')) {
if (stdout.includes('CONTINUE SWAP?')) {
childProcess.stdin.write('y\n');
}
if (stdout.startsWith('Swap initiated')) {
@ -147,15 +147,21 @@ function init() {
}
}
});
childProcess.stderr.on('data', function (data) {
console.log("STDERR:", data.toString());
});
childProcess.on('error', (error) => {
console.log(error.toString());
console.log("error", error.toString());
});
childProcess.on('close', (code) => {
console.log("CHILD PROCESS closed", code);
});
}
catch (e) {
console.log('LoopBot error', e);
}
return; // return here
}
else {
const cmd = arr[1];
const isAdmin = message.member.roles.find(role => role.name === 'Admin');
if (isAdmin && cmd.startsWith('setchan=')) {
@ -192,6 +198,7 @@ function init() {
message.channel.send({ embed: embed2 });
return;
}
} // end else
}));
}
exports.init = init;

2
dist/src/builtin/loop.js.map
View File

File diff suppressed because one or more lines are too long

8
dist/src/network/intercept.js
View File

@ -21,31 +21,26 @@ restrictions (be able to toggle, or dont show chat)
// return bool whether to skip forwarding to tribe
function isBotMsg(msg, sentByMe) {
return __awaiter(this, void 0, void 0, function* () {
console.log('=> is bot msg');
const txt = msg.message && msg.message.content;
const msgType = msg.type;
if (msgType === constants_1.default.message_types.bot_res) {
return false; // bot res msg type not for processing
}
console.log('=> is bot msg 2');
const uuid = msg.chat && msg.chat.uuid;
if (!uuid)
return false;
console.log('=> is bot msg 3');
const chat = yield models_1.models.Chat.findOne({
where: { uuid }
});
if (!chat)
return false;
let didEmit = false;
console.log('=> is bot msg 4');
if (txt && txt.startsWith('/bot ')) {
builtin_1.builtinBotEmit(msg);
didEmit = true;
}
if (didEmit)
return didEmit;
console.log('=> is bot msg 5');
const botsInTribe = yield models_1.models.ChatBot.findAll({
where: {
chatId: chat.id
@ -54,7 +49,6 @@ function isBotMsg(msg, sentByMe) {
// console.log('=> botsInTribe', botsInTribe)
if (!(botsInTribe && botsInTribe.length))
return false;
console.log('=> is bot msg 6');
yield asyncForEach(botsInTribe, (botInTribe) => __awaiter(this, void 0, void 0, function* () {
if (botInTribe.msgTypes) {
// console.log('=> botInTribe.msgTypes', botInTribe)
@ -64,7 +58,6 @@ function isBotMsg(msg, sentByMe) {
const isMsgAndHasText = msgType === constants_1.default.message_types.message && txt && txt.startsWith(`${botInTribe.botPrefix} `);
const isNotMsg = msgType !== constants_1.default.message_types.message;
if (isMsgAndHasText || isNotMsg) {
console.log('=> is bot msg emitMessageToBot', msg, botInTribe.dataValues);
didEmit = yield emitMessageToBot(msg, botInTribe.dataValues);
}
}
@ -73,7 +66,6 @@ function isBotMsg(msg, sentByMe) {
}
else { // no message types defined, do all?
if (txt && txt.startsWith(`${botInTribe.botPrefix} `)) {
console.log('=> is bot msg emitMessageToBot2', msg, botInTribe.dataValues);
// console.log('=> botInTribe.msgTypes else', botInTribe.dataValues)
didEmit = yield emitMessageToBot(msg, botInTribe.dataValues);
}

2
dist/src/network/intercept.js.map
View File

@ -1 +1 @@
{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../src/network/intercept.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../src/network/intercept.ts"],"names":[],"mappings":"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"}

16
src/builtin/loop.ts
View File

@ -130,7 +130,7 @@ export function init() {
console.log("LOOPBOT stdout:",stdout)
if(stdout){
console.log('=> LOOPBOT stdout',stdout)
if(stdout.startsWith('CONTINUE SWAP?')) {
if(stdout.includes('CONTINUE SWAP?')) {
childProcess.stdin.write('y\n')
}
if(stdout.startsWith('Swap initiated')) {
@ -143,14 +143,19 @@ export function init() {
}
}
})
childProcess.stderr.on('data', function (data) {
console.log("STDERR:",data.toString())
});
childProcess.on('error', (error) => {
console.log(error.toString());
console.log("error",error.toString());
});
childProcess.on('close', (code) => {
console.log("CHILD PROCESS closed",code)
});
} catch (e) {
console.log('LoopBot error', e)
}
return // return here
}
} else {
const cmd = arr[1]
@ -190,6 +195,9 @@ export function init() {
message.channel.send({ embed: embed2 })
return
}
} // end else
})
}

8
src/network/intercept.ts
View File

@ -12,18 +12,15 @@ restrictions (be able to toggle, or dont show chat)
// return bool whether to skip forwarding to tribe
export async function isBotMsg(msg: Msg, sentByMe: boolean): Promise<boolean> {
console.log('=> is bot msg')
const txt = msg.message && msg.message.content
const msgType = msg.type
if (msgType === constants.message_types.bot_res) {
return false // bot res msg type not for processing
}
console.log('=> is bot msg 2')
const uuid = msg.chat && msg.chat.uuid
if(!uuid) return false
console.log('=> is bot msg 3')
const chat = await models.Chat.findOne({
where: {uuid}
})
@ -31,14 +28,12 @@ export async function isBotMsg(msg: Msg, sentByMe: boolean): Promise<boolean> {
let didEmit = false
console.log('=> is bot msg 4')
if (txt && txt.startsWith('/bot ')) {
builtinBotEmit(msg)
didEmit = true
}
if (didEmit) return didEmit
console.log('=> is bot msg 5')
const botsInTribe = await models.ChatBot.findAll({
where: {
chatId: chat.id
@ -48,7 +43,6 @@ export async function isBotMsg(msg: Msg, sentByMe: boolean): Promise<boolean> {
if (!(botsInTribe && botsInTribe.length)) return false
console.log('=> is bot msg 6')
await asyncForEach(botsInTribe, async botInTribe => {
if (botInTribe.msgTypes) {
// console.log('=> botInTribe.msgTypes', botInTribe)
@ -58,14 +52,12 @@ export async function isBotMsg(msg: Msg, sentByMe: boolean): Promise<boolean> {
const isMsgAndHasText = msgType === constants.message_types.message && txt && txt.startsWith(`${botInTribe.botPrefix} `)
const isNotMsg = msgType !== constants.message_types.message
if (isMsgAndHasText || isNotMsg) {
console.log('=> is bot msg emitMessageToBot',msg,botInTribe.dataValues)
didEmit = await emitMessageToBot(msg, botInTribe.dataValues)
}
}
} catch (e) { }
} else { // no message types defined, do all?
if (txt && txt.startsWith(`${botInTribe.botPrefix} `)) {
console.log('=> is bot msg emitMessageToBot2',msg,botInTribe.dataValues)
// console.log('=> botInTribe.msgTypes else', botInTribe.dataValues)
didEmit = await emitMessageToBot(msg, botInTribe.dataValues)
}

Write Preview
Loading…
Cancel
Save