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

publish bot commands on updatetribestats

push-params
Evan Feenstra 4 years ago
parent
abfd5cbbeb
commit
65f730c5ed
6 changed files with 141 additions and 37 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/controllers/chats.ts
  2. 115
      api/utils/tribes.ts
  3. 2
      dist/api/controllers/chats.js
  4. 2
      dist/api/controllers/chats.js.map
  5. 55
      dist/api/utils/tribes.js
  6. 2
      dist/api/utils/tribes.js.map

2
api/controllers/chats.ts
View File

@ -375,6 +375,7 @@ export async function receiveGroupJoin(payload) {
})
replayChatHistory(chat, theSender)
tribes.putstats({
chatId: chat.id,
uuid: chat.uuid,
host: chat.host,
member_count: contactIds.length,
@ -431,6 +432,7 @@ export async function receiveGroupLeave(payload) {
await models.ChatMember.destroy({where:{chatId: chat.id, contactId: sender.id}})
} catch(e) {}
tribes.putstats({
chatId: chat.id,
uuid: chat.uuid,
host: chat.host,
member_count: contactIds.length,

115
api/utils/tribes.ts
View File

@ -49,16 +49,18 @@ export async function connect(onMessage) {
}
}
async function updateTribeStats(myPubkey){
const myTribes = await models.Chat.findAll({where:{
ownerPubkey:myPubkey
}})
await asyncForEach(myTribes, async(tribe)=>{
async function updateTribeStats(myPubkey) {
const myTribes = await models.Chat.findAll({
where: {
ownerPubkey: myPubkey
}
})
await asyncForEach(myTribes, async (tribe) => {
try {
const contactIds = JSON.parse(tribe.contactIds)
const member_count = (contactIds&&contactIds.length)||0
await putstats({uuid:tribe.uuid, host:tribe.host, member_count})
} catch(e) {}
const member_count = (contactIds && contactIds.length) || 0
await putstats({ uuid: tribe.uuid, host: tribe.host, member_count, chatId: tribe.id })
} catch (e) { }
})
console.log(`[tribes] updated stats for ${myTribes.length} tribes`)
}
@ -68,9 +70,9 @@ export function subscribe(topic) {
}
export function publish(topic, msg, cb) {
if (client) client.publish(topic, msg, null, function(err){
if(err) console.log(err)
else if(cb) cb()
if (client) client.publish(topic, msg, null, function (err) {
if (err) console.log(err)
else if (cb) cb()
})
}
@ -86,9 +88,9 @@ export async function declare({ uuid, name, description, tags, img, group_key, h
owner_alias, owner_pubkey,
escrow_amount: escrow_amount || 0,
escrow_millis: escrow_millis || 0,
unlisted: unlisted||false,
private: is_private||false,
app_url: app_url||'',
unlisted: unlisted || false,
private: is_private || false,
app_url: app_url || '',
}),
headers: { 'Content-Type': 'application/json' }
})
@ -108,8 +110,8 @@ export async function declare_bot({ uuid, name, description, tags, img, price_pe
uuid, owner_pubkey,
name, description, tags, img: img || '',
price_per_use: price_per_use || 0,
unlisted: unlisted||false,
deleted: deleted||false,
unlisted: unlisted || false,
deleted: deleted || false,
}),
headers: { 'Content-Type': 'application/json' }
})
@ -134,15 +136,15 @@ export async function edit({ uuid, host, name, description, tags, img, price_per
escrow_amount: escrow_amount || 0,
escrow_millis: escrow_millis || 0,
owner_alias,
unlisted: unlisted||false,
private: is_private||false,
deleted: deleted||false,
app_url: app_url||'',
unlisted: unlisted || false,
private: is_private || false,
deleted: deleted || false,
app_url: app_url || '',
}),
headers: { 'Content-Type': 'application/json' }
})
// const j = await r.json()
} catch(e) {
} catch (e) {
console.log('[tribes] unauthorized to edit')
throw e
}
@ -157,34 +159,87 @@ export async function delete_tribe({ uuid }) {
method: 'DELETE',
})
// const j = await r.json()
} catch(e) {
} catch (e) {
console.log('[tribes] unauthorized to delete')
throw e
}
}
export async function putActivity( uuid:string, host:string ) {
export async function putActivity(uuid: string, host: string) {
try {
const token = await genSignedTimestamp()
await fetch(`https://${host}/tribeactivity/${uuid}?token=` + token, {
method: 'PUT',
headers: { 'Content-Type': 'application/json' }
})
} catch(e) {
} catch (e) {
console.log('[tribes] unauthorized to putActivity')
throw e
}
}
export async function putstats({ uuid, host, member_count }) {
async function makeBotsJSON(tribeID) {
const bots = await models.ChatBot.findAll({
where: {
chatId: tribeID
}
})
if (!bots) return []
if (!bots.length) return []
return bots.map(b => {
const bot = b.dataValues
if (bot.botPrefix === '/loopout') {
return loopoutBotJSON()
}
return <BotJSON>{
prefix: bot.botPrefix,
price: bot.pricePerUse,
commands: null,
}
})
}
interface BotJSON {
prefix: string,
price: number,
commands: BotCommand[] | null,
}
interface BotCommand {
command: string,
price: number,
min_price: number,
max_price: number,
price_index: number,
admin_only: boolean,
}
function loopoutBotJSON(): BotJSON {
return <BotJSON>{
prefix: '/loopout',
price: 0,
commands: [{
command: '*',
price: 0,
min_price: 250000,
max_price: 16777215,
price_index: 2,
admin_only: false
}]
}
}
export async function putstats({ uuid, host, member_count, chatId }) {
if (!uuid) return
const bots = await makeBotsJSON(chatId)
try {
const token = await genSignedTimestamp()
await fetch('https://' + host + '/tribestats?token=' + token, {
method: 'PUT',
body: JSON.stringify({uuid, member_count}),
body: JSON.stringify({
uuid, member_count, bots: JSON.stringify(bots || [])
}),
headers: { 'Content-Type': 'application/json' }
})
} catch(e) {
} catch (e) {
console.log('[tribes] unauthorized to putstats')
throw e
}
@ -221,7 +276,7 @@ function urlBase64(buf) {
}
async function asyncForEach(array, callback) {
for (let index = 0; index < array.length; index++) {
await callback(array[index], index, array);
}
for (let index = 0; index < array.length; index++) {
await callback(array[index], index, array);
}
}

2
dist/api/controllers/chats.js
View File

@ -367,6 +367,7 @@ function receiveGroupJoin(payload) {
});
chatTribes_1.replayChatHistory(chat, theSender);
tribes.putstats({
chatId: chat.id,
uuid: chat.uuid,
host: chat.host,
member_count: contactIds.length,
@ -421,6 +422,7 @@ function receiveGroupLeave(payload) {
}
catch (e) { }
tribes.putstats({
chatId: chat.id,
uuid: chat.uuid,
host: chat.host,
member_count: contactIds.length,

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

File diff suppressed because one or more lines are too long

55
dist/api/utils/tribes.js
View File

@ -64,14 +64,16 @@ function connect(onMessage) {
exports.connect = connect;
function updateTribeStats(myPubkey) {
return __awaiter(this, void 0, void 0, function* () {
const myTribes = yield models_1.models.Chat.findAll({ where: {
const myTribes = yield models_1.models.Chat.findAll({
where: {
ownerPubkey: myPubkey
} });
}
});
yield asyncForEach(myTribes, (tribe) => __awaiter(this, void 0, void 0, function* () {
try {
const contactIds = JSON.parse(tribe.contactIds);
const member_count = (contactIds && contactIds.length) || 0;
yield putstats({ uuid: tribe.uuid, host: tribe.host, member_count });
yield putstats({ uuid: tribe.uuid, host: tribe.host, member_count, chatId: tribe.id });
}
catch (e) { }
}));
@ -209,13 +211,56 @@ function putActivity(uuid, host) {
});
}
exports.putActivity = putActivity;
function putstats({ uuid, host, member_count }) {
function makeBotsJSON(tribeID) {
return __awaiter(this, void 0, void 0, function* () {
const bots = yield models_1.models.ChatBot.findAll({
where: {
chatId: tribeID
}
});
if (!bots)
return [];
if (!bots.length)
return [];
return bots.map(b => {
const bot = b.dataValues;
if (bot.botPrefix === '/loopout') {
return loopoutBotJSON();
}
return {
prefix: bot.botPrefix,
price: bot.pricePerUse,
commands: null,
};
});
});
}
function loopoutBotJSON() {
return {
prefix: '/loopout',
price: 0,
commands: [{
command: '*',
price: 0,
min_price: 250000,
max_price: 16777215,
price_index: 2,
admin_only: false
}]
};
}
function putstats({ uuid, host, member_count, chatId }) {
return __awaiter(this, void 0, void 0, function* () {
if (!uuid)
return;
const bots = yield makeBotsJSON(chatId);
try {
const token = yield genSignedTimestamp();
yield node_fetch_1.default('https://' + host + '/tribestats?token=' + token, {
method: 'PUT',
body: JSON.stringify({ uuid, member_count }),
body: JSON.stringify({
uuid, member_count, bots: JSON.stringify(bots || [])
}),
headers: { 'Content-Type': 'application/json' }
});
}

2
dist/api/utils/tribes.js.map
View File

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