Browse Source

sender alias for api actions

push-params
Evan Feenstra 5 years ago
parent
commit
a048ba8fa5
  1. 2
      .github/workflows/release.yml
  2. 8
      api/controllers/actions.ts
  3. 6
      dist/api/controllers/actions.js
  4. 2
      dist/api/controllers/actions.js.map
  5. 2
      docs/myNode_deployment.md
  6. 2
      docs/raspiblitz_deployment.md

2
.github/workflows/release.yml

@ -17,4 +17,4 @@ jobs:
uses: joelwmale/webhook-action@master
env:
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
data: "{'text': '[GITHUB] New release in sphinx-relay! $HEAD_TAG', 'action': 'broadcast', 'app': 'github', 'secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"
data: "{'text': '[GITHUB] New release in sphinx-relay! ${{ env.HEAD_TAG }}', 'action': 'broadcast', 'app': 'github', 'secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"

8
api/controllers/actions.ts

@ -75,14 +75,15 @@ async function processExtra(req, res) {
if(!chat_uuid || !text) return failure(res,'no uuid or text')
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const theChat = await models.Chat.findOne({where:{uuid: chat_uuid}})
if(!theChat) return failure(res,'no chat')
if(!theChat || !owner) return failure(res,'no chat')
if(!theChat.type===constants.chat_types.tribe) return failure(res,'not a tribe')
const encryptedForMeText = rsa.encrypt(owner.contactKey, text)
const encryptedText = rsa.encrypt(theChat.groupKey, text)
const textMap = {'chat': encryptedText}
var date = new Date();
date.setMilliseconds(0)
date.setMilliseconds(0)
const alias = app.charAt(0).toUpperCase() + app.slice(1);
const msg:{[k:string]:any}={
chatId: theChat.id,
uuid: short.generate(),
@ -95,11 +96,12 @@ async function processExtra(req, res) {
status: constants.statuses.confirmed,
createdAt: date,
updatedAt: date,
senderAlias: alias,
}
const message = await models.Message.create(msg)
await network.sendMessage({
chat: theChat,
sender: owner,
sender: {...owner.dataValues, alias},
message: { content:textMap, id:message.id, uuid: message.uuid },
type: constants.message_types.message,
success: ()=> success(res, {success:true}),

6
dist/api/controllers/actions.js

@ -91,7 +91,7 @@ function processExtra(req, res) {
return res_1.failure(res, 'no uuid or text');
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const theChat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
if (!theChat)
if (!theChat || !owner)
return res_1.failure(res, 'no chat');
if (!theChat.type === constants.chat_types.tribe)
return res_1.failure(res, 'not a tribe');
@ -100,6 +100,7 @@ function processExtra(req, res) {
const textMap = { 'chat': encryptedText };
var date = new Date();
date.setMilliseconds(0);
const alias = app.charAt(0).toUpperCase() + app.slice(1);
const msg = {
chatId: theChat.id,
uuid: short.generate(),
@ -112,11 +113,12 @@ function processExtra(req, res) {
status: constants.statuses.confirmed,
createdAt: date,
updatedAt: date,
senderAlias: alias,
};
const message = yield models_1.models.Message.create(msg);
yield network.sendMessage({
chat: theChat,
sender: owner,
sender: Object.assign(Object.assign({}, owner.dataValues), { alias }),
message: { content: textMap, id: message.id, uuid: message.uuid },
type: constants.message_types.message,
success: () => res_1.success(res, { success: true }),

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

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

2
docs/myNode_deployment.md

@ -19,6 +19,8 @@ python2 (if not present): `$ sudo apt install python2`
### Open port 3001 on myNode
**note**: This port can be whatever number you want. Just add PORT to your environment like `export PORT=5005`.
Open up a console window with SSH. And login as root
```sh
$ sudo su

2
docs/raspiblitz_deployment.md

@ -19,6 +19,8 @@ python2 (if not present): `$ sudo apt install python2`
### Open port 3001 on Raspiblitz
**note**: This port can be whatever number you want. Just add PORT to your environment like `export PORT=5005`.
Open up a console window with SSH. And log in as root
```sh
$ sudo su

Loading…
Cancel
Save