Browse Source

fix detect forward bot res

push-params
Evan Feenstra 4 years ago
parent
commit
9ce730e14f
  1. 2
      .github/workflows/release.yml
  2. 2
      .github/workflows/update.yml
  3. 2
      api/controllers/actions.ts
  4. 2
      dist/api/controllers/actions.js
  5. 2
      dist/api/controllers/actions.js.map

2
.github/workflows/release.yml

@ -17,4 +17,4 @@ jobs:
uses: joelwmale/webhook-action@749e2dcbc6735ce0c36e1dbbb660618cd7b5f91c
env:
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
data: "{'text': '[GITHUB] New release in sphinx-relay! ${{ env.HEAD_TAG }}', 'action': 'broadcast', 'bot_id': '87B4FDD3DD71C2B0', 'bot_secret': '${{ secrets.WEBHOOK_SECRET }}'}"
data: "{'content': '[GITHUB] New release in sphinx-relay! ${{ env.HEAD_TAG }}', 'action': 'broadcast', 'bot_id': '87B4FDD3DD71C2B0', 'bot_secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"

2
.github/workflows/update.yml

@ -19,4 +19,4 @@ jobs:
uses: joelwmale/webhook-action@749e2dcbc6735ce0c36e1dbbb660618cd7b5f91c
env:
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
data: "{'text': 'New push in sphinx-relay by ${{ env.COMMIT_AUTHOR }}: ${{ env.COMMIT_MSG }}', 'action': 'broadcast', 'bot_id': '87B4FDD3DD71C2B0', 'bot_secret': '${{ secrets.WEBHOOK_SECRET }}'}"
data: "{'content': 'New push in sphinx-relay by ${{ env.COMMIT_AUTHOR }}: ${{ env.COMMIT_MSG }}', 'action': 'broadcast', 'bot_id': '87B4FDD3DD71C2B0', 'bot_secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"

2
api/controllers/actions.ts

@ -77,7 +77,7 @@ export async function finalAction(a:Action, bot_id:string){
}
const iAmTribeAdmin = owner.publicKey === (theChat && theChat.ownerPubkey)
console.log("=> ACTION HIT", a.action, a.bot_name)
if(!iAmTribeAdmin) { // IM NOT ADMIN - its my bot and i need to forward to admin
if(chat_uuid && !iAmTribeAdmin) { // IM NOT ADMIN - its my bot and i need to forward to admin - there is a chat_uuid
const myBot = await models.Bot.findOne({where:{
id: bot_id
}})

2
dist/api/controllers/actions.js

@ -78,7 +78,7 @@ function finalAction(a, bot_id) {
}
const iAmTribeAdmin = owner.publicKey === (theChat && theChat.ownerPubkey);
console.log("=> ACTION HIT", a.action, a.bot_name);
if (!iAmTribeAdmin) { // IM NOT ADMIN - its my bot and i need to forward to admin
if (chat_uuid && !iAmTribeAdmin) { // IM NOT ADMIN - its my bot and i need to forward to admin - there is a chat_uuid
const myBot = yield models_1.models.Bot.findOne({ where: {
id: bot_id
} });

2
dist/api/controllers/actions.js.map

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