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

log, fixwelcome

push-params
Evan Feenstra 4 years ago
parent
cf275456d1
commit
a3bf50ea19
9 changed files with 17 additions and 11 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. 7
      dist/src/builtin/welcome.js
  2. 2
      dist/src/builtin/welcome.js.map
  3. 1
      dist/src/controllers/chatTribes.js
  4. 2
      dist/src/controllers/chatTribes.js.map
  5. 3
      dist/src/network/send.js
  6. 2
      dist/src/network/send.js.map
  7. 7
      src/builtin/welcome.ts
  8. 1
      src/controllers/chatTribes.ts
  9. 3
      src/network/send.ts

7
dist/src/builtin/welcome.js
View File

@ -26,14 +26,12 @@ function init() {
const arr = (message.content && message.content.split(' ')) || [];
console.log('message.type', message.type);
const isGroupJoin = message.type === constants.message_types.group_join;
console.log('isGroupJoin', isGroupJoin);
if (arr.length < 2 && !isGroupJoin)
return;
if (arr[0] !== '/welcome' && !isGroupJoin)
return;
const cmd = arr[1];
const isAdmin = message.member.roles.find(role => role.name === 'Admin');
if (!isAdmin)
return;
if (isGroupJoin) {
try {
const chat = yield models_1.models.Chat.findOne({ where: { uuid: message.channel.id } });
@ -59,6 +57,9 @@ function init() {
console.log("WELCOME BOT ERROR", e);
}
}
const isAdmin = message.member.roles.find(role => role.name === 'Admin');
if (!isAdmin)
return;
switch (cmd) {
case 'setmessage':
if (arr.length < 3)

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

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

1
dist/src/controllers/chatTribes.js
View File

@ -414,6 +414,7 @@ function receiveTribeDelete(payload) {
exports.receiveTribeDelete = receiveTribeDelete;
function replayChatHistory(chat, contact) {
return __awaiter(this, void 0, void 0, function* () {
console.log('-> replayHistory');
if (!(chat && chat.id && contact && contact.id)) {
return console.log('[tribes] cant replay history');
}

2
dist/src/controllers/chatTribes.js.map
View File

File diff suppressed because one or more lines are too long

3
dist/src/network/send.js
View File

@ -94,6 +94,7 @@ function sendMessage(params) {
mqttTopic = ''; // FORCE KEYSEND!!!
}
const m = yield msg_1.personalizeMessage(msg, contact, isTribeOwner);
console.log('-> personalized msg', m);
const opts = {
dest: destkey,
data: m,
@ -134,7 +135,7 @@ function signAndSend(opts, mqttTopic, replayingHistory) {
opts.amt = opts.amt || 0;
const sig = yield signer.signAscii(data);
data = data + sig;
// console.log("ACTUALLY SEND", mqttTopic)
console.log("-> ACTUALLY SEND: topic:", mqttTopic);
try {
if (mqttTopic) {
yield tribes.publish(mqttTopic, data, function () {

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

File diff suppressed because one or more lines are too long

7
src/builtin/welcome.ts
View File

@ -19,13 +19,11 @@ export function init() {
const arr = (message.content && message.content.split(' ')) || []
console.log('message.type', message.type)
const isGroupJoin = message.type === constants.message_types.group_join
console.log('isGroupJoin',isGroupJoin)
if (arr.length < 2 && !isGroupJoin) return
if (arr[0] !== '/welcome' && !isGroupJoin) return
const cmd = arr[1]
const isAdmin = message.member.roles.find(role => role.name === 'Admin')
if(!isAdmin) return
if (isGroupJoin) {
try{
const chat = await models.Chat.findOne({ where: { uuid: message.channel.id } })
@ -50,6 +48,9 @@ export function init() {
}
}
const isAdmin = message.member.roles.find(role => role.name === 'Admin')
if(!isAdmin) return
switch (cmd) {
case 'setmessage':

1
src/controllers/chatTribes.ts
View File

@ -415,6 +415,7 @@ export async function receiveTribeDelete(payload) {
}
export async function replayChatHistory(chat, contact) {
console.log('-> replayHistory')
if(!(chat&&chat.id&&contact&&contact.id)){
return console.log('[tribes] cant replay history')
}

3
src/network/send.ts
View File

@ -93,6 +93,7 @@ export async function sendMessage(params) {
}
const m = await personalizeMessage(msg, contact, isTribeOwner)
console.log('-> personalized msg',m)
const opts = {
dest: destkey,
data: m,
@ -130,7 +131,7 @@ export function signAndSend(opts, mqttTopic?:string, replayingHistory?:boolean){
const sig = await signer.signAscii(data)
data = data + sig
// console.log("ACTUALLY SEND", mqttTopic)
console.log("-> ACTUALLY SEND: topic:", mqttTopic)
try {
if(mqttTopic) {
await tribes.publish(mqttTopic, data, function(){

Write Preview
Loading…
Cancel
Save