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

fix install bot payload, only owner can install bots

push-params
Evan Feenstra 4 years ago
parent
316966d83b
commit
851b090508
6 changed files with 62 additions and 23 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. 2
      api/bots/mother.ts
  2. 38
      api/controllers/bots.ts
  3. 2
      dist/api/bots/mother.js
  4. 2
      dist/api/bots/mother.js.map
  5. 39
      dist/api/controllers/bots.js
  6. 2
      dist/api/controllers/bots.js.map

2
api/bots/mother.ts
View File

@ -90,7 +90,7 @@ export function init() {
uuid: message.channel.id
}})
if(!chat) return
installBot(chat.id, bot)
installBot(chat, bot)
} else {
const embed = new Sphinx.MessageEmbed()
.setAuthor('MotherBot')

38
api/controllers/bots.ts
View File

@ -65,7 +65,15 @@ export const deleteBot = async (req, res) => {
}
}
export async function installBot(chatId:number, bot_json) {
export async function installBot(chat, bot_json) {
const chatId = chat && chat.id
const chat_uuid = chat && chat.uuid
if(!chatId || !chat_uuid) return console.log('no chat id in installBot')
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const isTribeOwner = owner && owner.publicKey && owner.publicKey === chat && chat.ownerPubkey
if(!isTribeOwner) return console.log('only tribe owner can install bots')
const {uuid,owner_pubkey,unique_name,price_per_use} = bot_json
const chatBot = {
chatId,
@ -76,14 +84,15 @@ export async function installBot(chatId:number, bot_json) {
pricePerUse: price_per_use
}
console.log("installBot INSTALL BOT NOW",chatBot)
const succeeded = await keysendBotInstall(chatBot)
const succeeded = await keysendBotInstall(chatBot, chat_uuid)
if(succeeded) models.ChatBot.create(chatBot)
}
export async function keysendBotInstall(b): Promise<boolean> {
export async function keysendBotInstall(b, chat_uuid:string): Promise<boolean> {
return await botKeysend(
constants.message_types.bot_install,
b.botUuid, b.botMakerPubkey, b.pricePerUse,
chat_uuid
)
}
@ -91,12 +100,12 @@ export async function keysendBotCmd(msg, b): Promise<boolean> {
return await botKeysend(
constants.message_types.bot_cmd,
b.botUuid, b.botMakerPubkey, b.pricePerUse,
msg.message.content,
msg.chat.uuid,
msg.message.content,
)
}
export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content?:string, chat_uuid?:string): Promise<boolean> {
export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, chat_uuid:string, content?:string): Promise<boolean> {
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const MIN_SATS = 3
const destkey = botmaker_pubkey
@ -109,13 +118,12 @@ export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_
sender: {
pub_key: owner.publicKey,
},
chat: {}
chat: {
uuid:chat_uuid
}
},
amt: Math.max(price_per_use || MIN_SATS)
}
if(chat_uuid) {
opts.data.chat = {uuid:chat_uuid}
}
try {
await network.signAndSend(opts)
return true
@ -124,6 +132,18 @@ export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_
}
}
/*
=> receiveBotInstall {
type: 23,
bot_uuid: 'X1_sGR-WM_e29YL5100WA_P_VeYwvEsXfgc2NUhMzLNrNbWy2BVot9bVHnsXyPVmzoHleCYUn8oyUiDzE89Do1acLu6G',
message: { content: '', amount: 3 },
sender: {
pub_key: '037bac010f84ef785ddc3ade66d008d76d90d80eab6e148c00ea4ba102c07f2e53'
},
chat: {}
}
no chat uuid or sender pub key
*/
export async function receiveBotInstall(payload) {
console.log('=> receiveBotInstall',payload)

2
dist/api/bots/mother.js
View File

@ -98,7 +98,7 @@ function init() {
} });
if (!chat)
return;
bots_1.installBot(chat.id, bot);
bots_1.installBot(chat, bot);
}
else {
const embed = new Sphinx.MessageEmbed()

2
dist/api/bots/mother.js.map
View File

File diff suppressed because one or more lines are too long

39
dist/api/controllers/bots.js
View File

@ -74,8 +74,16 @@ exports.deleteBot = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
res_1.failure(res, e);
}
});
function installBot(chatId, bot_json) {
function installBot(chat, bot_json) {
return __awaiter(this, void 0, void 0, function* () {
const chatId = chat && chat.id;
const chat_uuid = chat && chat.uuid;
if (!chatId || !chat_uuid)
return console.log('no chat id in installBot');
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const isTribeOwner = owner && owner.publicKey && owner.publicKey === chat && chat.ownerPubkey;
if (!isTribeOwner)
return console.log('only tribe owner can install bots');
const { uuid, owner_pubkey, unique_name, price_per_use } = bot_json;
const chatBot = {
chatId,
@ -86,25 +94,25 @@ function installBot(chatId, bot_json) {
pricePerUse: price_per_use
};
console.log("installBot INSTALL BOT NOW", chatBot);
const succeeded = yield keysendBotInstall(chatBot);
const succeeded = yield keysendBotInstall(chatBot, chat_uuid);
if (succeeded)
models_1.models.ChatBot.create(chatBot);
});
}
exports.installBot = installBot;
function keysendBotInstall(b) {
function keysendBotInstall(b, chat_uuid) {
return __awaiter(this, void 0, void 0, function* () {
return yield botKeysend(constants.message_types.bot_install, b.botUuid, b.botMakerPubkey, b.pricePerUse);
return yield botKeysend(constants.message_types.bot_install, b.botUuid, b.botMakerPubkey, b.pricePerUse, chat_uuid);
});
}
exports.keysendBotInstall = keysendBotInstall;
function keysendBotCmd(msg, b) {
return __awaiter(this, void 0, void 0, function* () {
return yield botKeysend(constants.message_types.bot_cmd, b.botUuid, b.botMakerPubkey, b.pricePerUse, msg.message.content, msg.chat.uuid);
return yield botKeysend(constants.message_types.bot_cmd, b.botUuid, b.botMakerPubkey, b.pricePerUse, msg.chat.uuid, msg.message.content);
});
}
exports.keysendBotCmd = keysendBotCmd;
function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content, chat_uuid) {
function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, chat_uuid, content) {
return __awaiter(this, void 0, void 0, function* () {
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const MIN_SATS = 3;
@ -118,13 +126,12 @@ function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content,
sender: {
pub_key: owner.publicKey,
},
chat: {}
chat: {
uuid: chat_uuid
}
},
amt: Math.max(price_per_use || MIN_SATS)
};
if (chat_uuid) {
opts.data.chat = { uuid: chat_uuid };
}
try {
yield network.signAndSend(opts);
return true;
@ -135,6 +142,18 @@ function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content,
});
}
exports.botKeysend = botKeysend;
/*
=> receiveBotInstall {
type: 23,
bot_uuid: 'X1_sGR-WM_e29YL5100WA_P_VeYwvEsXfgc2NUhMzLNrNbWy2BVot9bVHnsXyPVmzoHleCYUn8oyUiDzE89Do1acLu6G',
message: { content: '', amount: 3 },
sender: {
pub_key: '037bac010f84ef785ddc3ade66d008d76d90d80eab6e148c00ea4ba102c07f2e53'
},
chat: {}
}
no chat uuid or sender pub key
*/
function receiveBotInstall(payload) {
return __awaiter(this, void 0, void 0, function* () {
console.log('=> receiveBotInstall', payload);

2
dist/api/controllers/bots.js.map
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save