From 9cfb8662e425a909a3a7ac7211cf56523689bbde Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 15 May 2020 11:40:31 -0700 Subject: [PATCH] modify attachment payload --- api/controllers/chats.ts | 118 +++++++++++++-------------- api/helpers.ts | 4 +- api/models/ts/chat.ts | 6 ++ api/network/modify.ts | 18 +++++ api/network/receive.ts | 68 ++++++++++------ api/utils/setup.ts | 2 + dist/api/controllers/chats.js | 120 ++++++++++++++-------------- dist/api/controllers/chats.js.map | 2 +- dist/api/helpers.js | 4 +- dist/api/helpers.js.map | 2 +- dist/api/models/ts/chat.js | 8 ++ dist/api/models/ts/chat.js.map | 2 +- dist/api/network/modify.js | 19 +++++ dist/api/network/modify.js.map | 1 + dist/api/network/receive.js | 74 +++++++++++------ dist/api/network/receive.js.map | 2 +- dist/api/utils/setup.js | 2 + dist/api/utils/setup.js.map | 2 +- frontend/components/Media/index.jsx | 15 ++-- 19 files changed, 287 insertions(+), 182 deletions(-) create mode 100644 api/network/modify.ts create mode 100644 dist/api/network/modify.js create mode 100644 dist/api/network/modify.js.map diff --git a/api/controllers/chats.ts b/api/controllers/chats.ts index 2f902b5..b0aa587 100644 --- a/api/controllers/chats.ts +++ b/api/controllers/chats.ts @@ -68,7 +68,7 @@ async function createGroupChat(req, res) { let chatParams:any = null if(is_tribe){ - chatParams = await createTribeChatParams(owner, contact_ids, name, img) + chatParams = await createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join) if(is_listed){ // publish to tribe server tribes.declare({ @@ -243,20 +243,27 @@ async function joinTribe(req, res){ async function receiveGroupLeave(payload) { console.log('=> receiveGroupLeave') - const { sender_pub_key, chat_uuid, chat_type } = await helpers.parseReceiveParams(payload) + const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner } = await helpers.parseReceiveParams(payload) const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } }) if (!chat) return - const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) - if (!sender) return + const isTribe = chat_type===constants.chat_types.tribe + + let sender + if(!isTribe || isTribeOwner) { + sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) + if (!sender) return - const oldContactIds = JSON.parse(chat.contactIds || '[]') - const contactIds = oldContactIds.filter(cid => cid !== sender.id) - await chat.update({ contactIds: JSON.stringify(contactIds) }) + const oldContactIds = JSON.parse(chat.contactIds || '[]') + const contactIds = oldContactIds.filter(cid => cid !== sender.id) + await chat.update({ contactIds: JSON.stringify(contactIds) }) - if(chat_type===constants.chat_types.tribe){ - await models.ChatMember.destroy({where:{chatId: chat.id, contactId: sender.id}}) + if(isTribeOwner) { + if(chat_type===constants.chat_types.tribe){ + await models.ChatMember.destroy({where:{chatId: chat.id, contactId: sender.id}}) + } + } } var date = new Date(); @@ -264,9 +271,9 @@ async function receiveGroupLeave(payload) { const msg = { chatId: chat.id, type: constants.message_types.group_leave, - sender: sender.id, + sender: (sender && sender.id) || 0, date: date, - messageContent: '', + messageContent: `${sender_alias} has left the group`, remoteMessageContent: '', status: constants.statuses.confirmed, createdAt: date, @@ -284,69 +291,60 @@ async function receiveGroupLeave(payload) { }) } -// only owner needs to add! -// here: can only join if enough $$$! -// forward to all over mqtt -// add to ChatMember table async function receiveGroupJoin(payload) { console.log('=> receiveGroupJoin') - const { sender_pub_key, chat_uuid, chat_members, chat_type } = await helpers.parseReceiveParams(payload) + const { sender_pub_key, chat_uuid, chat_members, chat_type, isTribeOwner } = await helpers.parseReceiveParams(payload) const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } }) if (!chat) return - // THIS CHECK CAN BE DONE IN NETWORK.RECEIVE? --> forward to mqtt if needed to const isTribe = chat_type===constants.chat_types.tribe - if(isTribe) { - const owner = await models.Contact.findOne({ where: { isOwner: true } }) - const verifiedOwnerPubkey = await tribes.verifySignedTimestamp(chat_uuid) - if(verifiedOwnerPubkey!==owner.publicKey){ - return // SKIP if not owner (not each member needs to be added) - // but maybe we need to add alias in there somehow? so other people can see "Evan joined" - } - } + + var date = new Date() + date.setMilliseconds(0) let theSender: any = null - const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) - const contactIds = JSON.parse(chat.contactIds || '[]') - if (sender) { - theSender = sender // might already include?? - if(!contactIds.includes(sender.id)) contactIds.push(sender.id) - } else { - const member = chat_members[sender_pub_key] - if(member && member.key) { - const createdContact = await models.Contact.create({ - publicKey: sender_pub_key, - contactKey: member.key, - alias: member.alias||'Unknown', - status: 1 - }) - theSender = createdContact - contactIds.push(createdContact.id) + const member = chat_members[sender_pub_key] + const senderAlias = (member && member.alias) || 'Unknown' + + if(!isTribe || isTribeOwner) { // dont need to create contacts for these + const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) + const contactIds = JSON.parse(chat.contactIds || '[]') + if (sender) { + theSender = sender // might already include?? + if(!contactIds.includes(sender.id)) contactIds.push(sender.id) + } else { + if(member && member.key) { + const createdContact = await models.Contact.create({ + publicKey: sender_pub_key, + contactKey: member.key, + alias: senderAlias, + status: 1 + }) + theSender = createdContact + contactIds.push(createdContact.id) + } } - } - if(!theSender) return // fail (no contact key?) + if(!theSender) return // fail (no contact key?) - await chat.update({ contactIds: JSON.stringify(contactIds) }) - - var date = new Date() - date.setMilliseconds(0) + await chat.update({ contactIds: JSON.stringify(contactIds) }) - if(isTribe){ // IF TRIBE, ADD TO XREF - models.ChatMember.create({ - contactId: theSender.id, - chatId: chat.id, - role: constants.chat_roles.reader, - lastActive: date, - }) + if(isTribeOwner){ // IF TRIBE, ADD TO XREF + models.ChatMember.create({ + contactId: theSender.id, + chatId: chat.id, + role: constants.chat_roles.reader, + lastActive: date, + }) + } } const msg = { chatId: chat.id, type: constants.message_types.group_join, - sender: theSender.id, + sender: (theSender && theSender.id) || 0, date: date, - messageContent: '', + messageContent: `${senderAlias} has joined the group`, remoteMessageContent: '', status: constants.statuses.confirmed, createdAt: date, @@ -357,7 +355,7 @@ async function receiveGroupJoin(payload) { socket.sendJson({ type: 'group_join', response: { - contact: jsonUtils.contactToJson(theSender), + contact: jsonUtils.contactToJson(theSender||{}), chat: jsonUtils.chatToJson(chat), message: jsonUtils.messageToJson(message, null) } @@ -487,7 +485,7 @@ function createGroupChatParams(owner, contactIds, members, name) { } } -async function createTribeChatParams(owner, contactIds, name, img) { +async function createTribeChatParams(owner, contactIds, name, img, price_per_message, price_to_join) { let date = new Date() date.setMilliseconds(0) if (!(owner && contactIds && Array.isArray(contactIds))) { @@ -508,7 +506,9 @@ async function createTribeChatParams(owner, contactIds, name, img) { type: constants.chat_types.tribe, groupKey: keys.public, groupPrivateKey: keys.private, - host: tribes.getHost() + host: tribes.getHost(), + pricePerMessage: price_per_message||0, + priceToJoin: price_to_join||0, } } diff --git a/api/helpers.ts b/api/helpers.ts index a62ecd2..3243e29 100644 --- a/api/helpers.ts +++ b/api/helpers.ts @@ -133,6 +133,7 @@ async function sleep(ms) { async function parseReceiveParams(payload) { const dat = payload.content || payload const sender_pub_key = dat.sender.pub_key + const sender_alias = dat.sender.alias const chat_uuid = dat.chat.uuid const chat_type = dat.chat.type const chat_members: { [k: string]: any } = dat.chat.members || {} @@ -145,6 +146,7 @@ async function parseReceiveParams(payload) { const msg_id = dat.message.id||0 const mediaKey = dat.message.mediaKey const mediaType = dat.message.mediaType + const isTribeOwner = dat.isTribeOwner?true:false const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation) let sender @@ -159,7 +161,7 @@ async function parseReceiveParams(payload) { sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) chat = await models.Chat.findOne({ where: { uuid: chat_uuid } }) } - return { owner, sender, chat, sender_pub_key, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key } + return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key } } export { diff --git a/api/models/ts/chat.ts b/api/models/ts/chat.ts index 807ff5f..150a60a 100644 --- a/api/models/ts/chat.ts +++ b/api/models/ts/chat.ts @@ -54,4 +54,10 @@ export default class Chat extends Model { @Column host: string + @Column + priceToJoin: number + + @Column + pricePerMessage: number + } \ No newline at end of file diff --git a/api/network/modify.ts b/api/network/modify.ts new file mode 100644 index 0000000..82194e4 --- /dev/null +++ b/api/network/modify.ts @@ -0,0 +1,18 @@ +import * as path from 'path' + +const constants = require(path.join(__dirname,'../../config/constants.json')) +const msgtypes = constants.message_types + +export function modifyPayload(payload) { + if(payload.type===msgtypes.attachment) { + console.log("MODIFY, ", payload) + // download image from mediaToken + // decrypt key + // decrypt image + // new key, re-encrypt, re-upload + // new payload + + // how to link w og msg? ogMediaToken? + } + return payload +} diff --git a/api/network/receive.ts b/api/network/receive.ts index 976e00f..1229874 100644 --- a/api/network/receive.ts +++ b/api/network/receive.ts @@ -6,32 +6,54 @@ import * as tribes from '../utils/tribes' import {SPHINX_CUSTOM_RECORD_KEY, verifyAscii} from '../utils/lightning' import { models } from '../models' import {sendMessage} from './send' +import {modifyPayload} from './modify' const constants = require(path.join(__dirname,'../../config/constants.json')) -const types = constants.message_types +const msgtypes = constants.message_types const typesToForward=[ - types.message, types.attachment, types.group_join, types.group_leave + msgtypes.message, msgtypes.group_join, msgtypes.group_leave, msgtypes.attachment +] +const typesToModify=[ + msgtypes.attachment ] async function onReceive(payload){ // if tribe, owner must forward to MQTT - // console.log("RECEIVED PAYLOAD",payload) + let doAction = true + const toAddIn:{[k:string]:any} = {} const isTribe = payload.chat && payload.chat.type===constants.chat_types.tribe if(isTribe && typesToForward.includes(payload.type)){ const tribeOwnerPubKey = await tribes.verifySignedTimestamp(payload.chat.uuid) const owner = await models.Contact.findOne({where: {isOwner:true}}) if(owner.publicKey===tribeOwnerPubKey){ - forwardMessageToTribe(payload) + // CHECK PRICES + toAddIn.isTribeOwner = true + const chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}}) + if(payload.type===msgtypes.group_join) { + if(payload.message.amount receiveGroupLeave'); - const { sender_pub_key, chat_uuid, chat_type } = yield helpers.parseReceiveParams(payload); + const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner } = yield helpers.parseReceiveParams(payload); const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } }); if (!chat) return; - const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); - if (!sender) - return; - const oldContactIds = JSON.parse(chat.contactIds || '[]'); - const contactIds = oldContactIds.filter(cid => cid !== sender.id); - yield chat.update({ contactIds: JSON.stringify(contactIds) }); - if (chat_type === constants.chat_types.tribe) { - yield models_1.models.ChatMember.destroy({ where: { chatId: chat.id, contactId: sender.id } }); + const isTribe = chat_type === constants.chat_types.tribe; + let sender; + if (!isTribe || isTribeOwner) { + sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); + if (!sender) + return; + const oldContactIds = JSON.parse(chat.contactIds || '[]'); + const contactIds = oldContactIds.filter(cid => cid !== sender.id); + yield chat.update({ contactIds: JSON.stringify(contactIds) }); + if (isTribeOwner) { + if (chat_type === constants.chat_types.tribe) { + yield models_1.models.ChatMember.destroy({ where: { chatId: chat.id, contactId: sender.id } }); + } + } } var date = new Date(); date.setMilliseconds(0); const msg = { chatId: chat.id, type: constants.message_types.group_leave, - sender: sender.id, + sender: (sender && sender.id) || 0, date: date, - messageContent: '', + messageContent: `${sender_alias} has left the group`, remoteMessageContent: '', status: constants.statuses.confirmed, createdAt: date, @@ -270,67 +276,57 @@ function receiveGroupLeave(payload) { }); } exports.receiveGroupLeave = receiveGroupLeave; -// only owner needs to add! -// here: can only join if enough $$$! -// forward to all over mqtt -// add to ChatMember table function receiveGroupJoin(payload) { return __awaiter(this, void 0, void 0, function* () { console.log('=> receiveGroupJoin'); - const { sender_pub_key, chat_uuid, chat_members, chat_type } = yield helpers.parseReceiveParams(payload); + const { sender_pub_key, chat_uuid, chat_members, chat_type, isTribeOwner } = yield helpers.parseReceiveParams(payload); const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } }); if (!chat) return; - // THIS CHECK CAN BE DONE IN NETWORK.RECEIVE? --> forward to mqtt if needed to const isTribe = chat_type === constants.chat_types.tribe; - if (isTribe) { - const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); - const verifiedOwnerPubkey = yield tribes.verifySignedTimestamp(chat_uuid); - if (verifiedOwnerPubkey !== owner.publicKey) { - return; // SKIP if not owner (not each member needs to be added) - // but maybe we need to add alias in there somehow? so other people can see "Evan joined" - } - } + var date = new Date(); + date.setMilliseconds(0); let theSender = null; - const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); - const contactIds = JSON.parse(chat.contactIds || '[]'); - if (sender) { - theSender = sender; // might already include?? - if (!contactIds.includes(sender.id)) - contactIds.push(sender.id); - } - else { - const member = chat_members[sender_pub_key]; - if (member && member.key) { - const createdContact = yield models_1.models.Contact.create({ - publicKey: sender_pub_key, - contactKey: member.key, - alias: member.alias || 'Unknown', - status: 1 + const member = chat_members[sender_pub_key]; + const senderAlias = (member && member.alias) || 'Unknown'; + if (!isTribe || isTribeOwner) { // dont need to create contacts for these + const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); + const contactIds = JSON.parse(chat.contactIds || '[]'); + if (sender) { + theSender = sender; // might already include?? + if (!contactIds.includes(sender.id)) + contactIds.push(sender.id); + } + else { + if (member && member.key) { + const createdContact = yield models_1.models.Contact.create({ + publicKey: sender_pub_key, + contactKey: member.key, + alias: senderAlias, + status: 1 + }); + theSender = createdContact; + contactIds.push(createdContact.id); + } + } + if (!theSender) + return; // fail (no contact key?) + yield chat.update({ contactIds: JSON.stringify(contactIds) }); + if (isTribeOwner) { // IF TRIBE, ADD TO XREF + models_1.models.ChatMember.create({ + contactId: theSender.id, + chatId: chat.id, + role: constants.chat_roles.reader, + lastActive: date, }); - theSender = createdContact; - contactIds.push(createdContact.id); } } - if (!theSender) - return; // fail (no contact key?) - yield chat.update({ contactIds: JSON.stringify(contactIds) }); - var date = new Date(); - date.setMilliseconds(0); - if (isTribe) { // IF TRIBE, ADD TO XREF - models_1.models.ChatMember.create({ - contactId: theSender.id, - chatId: chat.id, - role: constants.chat_roles.reader, - lastActive: date, - }); - } const msg = { chatId: chat.id, type: constants.message_types.group_join, - sender: theSender.id, + sender: (theSender && theSender.id) || 0, date: date, - messageContent: '', + messageContent: `${senderAlias} has joined the group`, remoteMessageContent: '', status: constants.statuses.confirmed, createdAt: date, @@ -340,7 +336,7 @@ function receiveGroupJoin(payload) { socket.sendJson({ type: 'group_join', response: { - contact: jsonUtils.contactToJson(theSender), + contact: jsonUtils.contactToJson(theSender || {}), chat: jsonUtils.chatToJson(chat), message: jsonUtils.messageToJson(message, null) } @@ -460,7 +456,7 @@ function createGroupChatParams(owner, contactIds, members, name) { type: constants.chat_types.group }; } -function createTribeChatParams(owner, contactIds, name, img) { +function createTribeChatParams(owner, contactIds, name, img, price_per_message, price_to_join) { return __awaiter(this, void 0, void 0, function* () { let date = new Date(); date.setMilliseconds(0); @@ -481,7 +477,9 @@ function createTribeChatParams(owner, contactIds, name, img) { type: constants.chat_types.tribe, groupKey: keys.public, groupPrivateKey: keys.private, - host: tribes.getHost() + host: tribes.getHost(), + pricePerMessage: price_per_message || 0, + priceToJoin: price_to_join || 0, }; }); } diff --git a/dist/api/controllers/chats.js.map b/dist/api/controllers/chats.js.map index c80f41c..b5bc4ee 100644 --- a/dist/api/controllers/chats.js.map +++ b/dist/api/controllers/chats.js.map @@ -1 +1 @@ -{"version":3,"file":"chats.js","sourceRoot":"","sources":["../../../api/controllers/chats.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chats.js","sourceRoot":"","sources":["../../../api/controllers/chats.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/helpers.js b/dist/api/helpers.js index e0ed3a0..3b69c4e 100644 --- a/dist/api/helpers.js +++ b/dist/api/helpers.js @@ -149,6 +149,7 @@ function parseReceiveParams(payload) { return __awaiter(this, void 0, void 0, function* () { const dat = payload.content || payload; const sender_pub_key = dat.sender.pub_key; + const sender_alias = dat.sender.alias; const chat_uuid = dat.chat.uuid; const chat_type = dat.chat.type; const chat_members = dat.chat.members || {}; @@ -161,6 +162,7 @@ function parseReceiveParams(payload) { const msg_id = dat.message.id || 0; const mediaKey = dat.message.mediaKey; const mediaType = dat.message.mediaType; + const isTribeOwner = dat.isTribeOwner ? true : false; const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation); let sender; let chat; @@ -173,7 +175,7 @@ function parseReceiveParams(payload) { sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } }); } - return { owner, sender, chat, sender_pub_key, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key }; + return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key }; }); } exports.parseReceiveParams = parseReceiveParams; diff --git a/dist/api/helpers.js.map b/dist/api/helpers.js.map index c860f5e..bc804bd 100644 --- a/dist/api/helpers.js.map +++ b/dist/api/helpers.js.map @@ -1 +1 @@ -{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../api/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../api/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/models/ts/chat.js b/dist/api/models/ts/chat.js index 521c20c..b797c45 100644 --- a/dist/api/models/ts/chat.js +++ b/dist/api/models/ts/chat.js @@ -77,6 +77,14 @@ __decorate([ sequelize_typescript_1.Column, __metadata("design:type", String) ], Chat.prototype, "host", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Number) +], Chat.prototype, "priceToJoin", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Number) +], Chat.prototype, "pricePerMessage", void 0); Chat = __decorate([ sequelize_typescript_1.Table({ tableName: 'sphinx_chats', underscored: true }) ], Chat); diff --git a/dist/api/models/ts/chat.js.map b/dist/api/models/ts/chat.js.map index cd481b0..33bb426 100644 --- a/dist/api/models/ts/chat.js.map +++ b/dist/api/models/ts/chat.js.map @@ -1 +1 @@ -{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../api/models/ts/chat.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,IAAI,GAAzB,MAAqB,IAAK,SAAQ,4BAAW;CAqD5C,CAAA;AA7CC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;gCACQ;AAGV;IADC,6BAAM;;kCACK;AAGZ;IADC,6BAAM;;kCACK;AAGZ;IADC,6BAAM;;sCACS;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;kCACZ;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;oCACV;AAGd;IADC,6BAAM;;wCACW;AAGlB;IADC,6BAAM;;qCACS;AAGhB;IADC,6BAAM;8BACI,IAAI;uCAAA;AAGf;IADC,6BAAM;8BACI,IAAI;uCAAA;AAOf;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;qCACc;AAGhB;IADC,6BAAM;;sCACS;AAGhB;IADC,6BAAM;;6CACgB;AAGvB;IADC,6BAAM;;kCACK;AAnDO,IAAI;IADxB,4BAAK,CAAC,EAAC,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACjC,IAAI,CAqDxB;kBArDoB,IAAI"} \ No newline at end of file +{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../api/models/ts/chat.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,IAAI,GAAzB,MAAqB,IAAK,SAAQ,4BAAW;CA2D5C,CAAA;AAnDC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;gCACQ;AAGV;IADC,6BAAM;;kCACK;AAGZ;IADC,6BAAM;;kCACK;AAGZ;IADC,6BAAM;;sCACS;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;kCACZ;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;oCACV;AAGd;IADC,6BAAM;;wCACW;AAGlB;IADC,6BAAM;;qCACS;AAGhB;IADC,6BAAM;8BACI,IAAI;uCAAA;AAGf;IADC,6BAAM;8BACI,IAAI;uCAAA;AAOf;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;qCACc;AAGhB;IADC,6BAAM;;sCACS;AAGhB;IADC,6BAAM;;6CACgB;AAGvB;IADC,6BAAM;;kCACK;AAGZ;IADC,6BAAM;;yCACY;AAGnB;IADC,6BAAM;;6CACgB;AAzDJ,IAAI;IADxB,4BAAK,CAAC,EAAC,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACjC,IAAI,CA2DxB;kBA3DoB,IAAI"} \ No newline at end of file diff --git a/dist/api/network/modify.js b/dist/api/network/modify.js new file mode 100644 index 0000000..8ccbe1f --- /dev/null +++ b/dist/api/network/modify.js @@ -0,0 +1,19 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const path = require("path"); +const constants = require(path.join(__dirname, '../../config/constants.json')); +const msgtypes = constants.message_types; +function modifyPayload(payload) { + if (payload.type === msgtypes.attachment) { + console.log("MODIFY, ", payload); + // download image from mediaToken + // decrypt key + // decrypt image + // new key, re-encrypt, re-upload + // new payload + // how to link w og msg? ogMediaToken? + } + return payload; +} +exports.modifyPayload = modifyPayload; +//# sourceMappingURL=modify.js.map \ No newline at end of file diff --git a/dist/api/network/modify.js.map b/dist/api/network/modify.js.map new file mode 100644 index 0000000..06c1cf8 --- /dev/null +++ b/dist/api/network/modify.js.map @@ -0,0 +1 @@ +{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../../api/network/modify.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,6BAA6B,CAAC,CAAC,CAAA;AAC7E,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAA;AAExC,SAAgB,aAAa,CAAC,OAAO;IACnC,IAAG,OAAO,CAAC,IAAI,KAAG,QAAQ,CAAC,UAAU,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAChC,iCAAiC;QACjC,cAAc;QACd,gBAAgB;QAChB,iCAAiC;QACjC,cAAc;QAEd,sCAAsC;KACvC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAZD,sCAYC"} \ No newline at end of file diff --git a/dist/api/network/receive.js b/dist/api/network/receive.js index ce678ed..08e7934 100644 --- a/dist/api/network/receive.js +++ b/dist/api/network/receive.js @@ -17,33 +17,59 @@ const tribes = require("../utils/tribes"); const lightning_2 = require("../utils/lightning"); const models_1 = require("../models"); const send_1 = require("./send"); +const modify_1 = require("./modify"); const constants = require(path.join(__dirname, '../../config/constants.json')); -const types = constants.message_types; +const msgtypes = constants.message_types; const typesToForward = [ - types.message, types.attachment, types.group_join, types.group_leave + msgtypes.message, msgtypes.group_join, msgtypes.group_leave, msgtypes.attachment +]; +const typesToModify = [ + msgtypes.attachment ]; function onReceive(payload) { return __awaiter(this, void 0, void 0, function* () { // if tribe, owner must forward to MQTT - // console.log("RECEIVED PAYLOAD",payload) + let doAction = true; + const toAddIn = {}; const isTribe = payload.chat && payload.chat.type === constants.chat_types.tribe; if (isTribe && typesToForward.includes(payload.type)) { const tribeOwnerPubKey = yield tribes.verifySignedTimestamp(payload.chat.uuid); const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); if (owner.publicKey === tribeOwnerPubKey) { - forwardMessageToTribe(payload); + // CHECK PRICES + toAddIn.isTribeOwner = true; + const chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } }); + if (payload.type === msgtypes.group_join) { + if (payload.message.amount < chat.priceToJoin) + doAction = false; + } + if (payload.type === msgtypes.message) { + if (payload.message.amount < chat.pricePerMessage) + doAction = false; + } + if (doAction) + forwardMessageToTribe(payload); } } - if (ACTIONS[payload.type]) { - ACTIONS[payload.type](payload); - } - else { - console.log('Incorrect payload type:', payload.type); + if (doAction) { + if (ACTIONS[payload.type]) { + ACTIONS[payload.type](Object.assign(Object.assign({}, payload), toAddIn)); + } + else { + console.log('Incorrect payload type:', payload.type); + } } }); } -function forwardMessageToTribe(payload) { +function forwardMessageToTribe(ogpayload) { return __awaiter(this, void 0, void 0, function* () { + let payload; + if (typesToModify.includes(ogpayload.type)) { + payload = yield modify_1.modifyPayload(ogpayload); + } + else { + payload = ogpayload; + } console.log("FORWARD TO TRIBE", payload); const chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } }); //const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) @@ -61,20 +87,20 @@ function forwardMessageToTribe(payload) { }); } const ACTIONS = { - [types.contact_key]: controllers_1.controllers.contacts.receiveContactKey, - [types.contact_key_confirmation]: controllers_1.controllers.contacts.receiveConfirmContactKey, - [types.message]: controllers_1.controllers.messages.receiveMessage, - [types.invoice]: controllers_1.controllers.invoices.receiveInvoice, - [types.direct_payment]: controllers_1.controllers.payments.receivePayment, - [types.confirmation]: controllers_1.controllers.confirmations.receiveConfirmation, - [types.attachment]: controllers_1.controllers.media.receiveAttachment, - [types.purchase]: controllers_1.controllers.media.receivePurchase, - [types.purchase_accept]: controllers_1.controllers.media.receivePurchaseAccept, - [types.purchase_deny]: controllers_1.controllers.media.receivePurchaseDeny, - [types.group_create]: controllers_1.controllers.chats.receiveGroupCreateOrInvite, - [types.group_invite]: controllers_1.controllers.chats.receiveGroupCreateOrInvite, - [types.group_join]: controllers_1.controllers.chats.receiveGroupJoin, - [types.group_leave]: controllers_1.controllers.chats.receiveGroupLeave, + [msgtypes.contact_key]: controllers_1.controllers.contacts.receiveContactKey, + [msgtypes.contact_key_confirmation]: controllers_1.controllers.contacts.receiveConfirmContactKey, + [msgtypes.message]: controllers_1.controllers.messages.receiveMessage, + [msgtypes.invoice]: controllers_1.controllers.invoices.receiveInvoice, + [msgtypes.direct_payment]: controllers_1.controllers.payments.receivePayment, + [msgtypes.confirmation]: controllers_1.controllers.confirmations.receiveConfirmation, + [msgtypes.attachment]: controllers_1.controllers.media.receiveAttachment, + [msgtypes.purchase]: controllers_1.controllers.media.receivePurchase, + [msgtypes.purchase_accept]: controllers_1.controllers.media.receivePurchaseAccept, + [msgtypes.purchase_deny]: controllers_1.controllers.media.receivePurchaseDeny, + [msgtypes.group_create]: controllers_1.controllers.chats.receiveGroupCreateOrInvite, + [msgtypes.group_invite]: controllers_1.controllers.chats.receiveGroupCreateOrInvite, + [msgtypes.group_join]: controllers_1.controllers.chats.receiveGroupJoin, + [msgtypes.group_leave]: controllers_1.controllers.chats.receiveGroupLeave, }; function initGrpcSubscriptions() { return __awaiter(this, void 0, void 0, function* () { diff --git a/dist/api/network/receive.js.map b/dist/api/network/receive.js.map index 106e7c3..f7d9a95 100644 --- a/dist/api/network/receive.js.map +++ b/dist/api/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/utils/setup.js b/dist/api/utils/setup.js index 6d584e1..e4eebec 100644 --- a/dist/api/utils/setup.js +++ b/dist/api/utils/setup.js @@ -47,6 +47,8 @@ function migrate() { addTableColumn('sphinx_chats', 'group_key'); addTableColumn('sphinx_chats', 'group_private_key'); addTableColumn('sphinx_chats', 'host'); + addTableColumn('sphinx_chats', 'price_to_join', 'BIGINT'); + addTableColumn('sphinx_chats', 'price_per_message', 'BIGINT'); try { yield models_1.sequelize.query(` CREATE TABLE sphinx_chat_members ( diff --git a/dist/api/utils/setup.js.map b/dist/api/utils/setup.js.map index e4cd023..c565e8a 100644 --- a/dist/api/utils/setup.js.map +++ b/dist/api/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAA2C;AAC3C,sCAA2C;AAC3C,iDAAoC;AACpC,iCAAgC;AAChC,sCAAqC;AACrC,gDAAwC;AACxC,8CAA0D;AAE1D,MAAM,YAAY,GAAG,CAAC,CAAA;AAEtB,MAAM,aAAa,GAAG,GAAS,EAAE;IAC/B,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;IACxC,MAAM,UAAU,EAAE,CAAA;IAClB,IAAI;QACF,MAAM,kBAAS,CAAC,IAAI,EAAE,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;KACpC;IAAC,OAAM,CAAC,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAC,CAAC,CAAC,CAAA;KAChC;IACD,MAAM,OAAO,EAAE,CAAA;IACf,iBAAiB,EAAE,CAAA;IACnB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;AACnC,CAAC,CAAA,CAAA;AAiFQ,sCAAa;AA/EtB,SAAe,UAAU;;QACvB,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAA;SAC/D;QAAC,OAAM,CAAC,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAC,CAAC,CAAC,CAAA;SACtC;IACH,CAAC;CAAA;AAED,SAAe,OAAO;;QACpB,cAAc,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;QAC3C,cAAc,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAA;QACnD,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QACtC,IAAG;YACD,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;EAQxB,CAAC,CAAA;SACA;QAAC,OAAM,CAAC,EAAC,GAAE;IACd,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,KAAY,EAAE,MAAa,EAAE,IAAI,GAAC,MAAM;;QACpE,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC,eAAe,KAAK,QAAQ,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;SACpE;QAAC,OAAM,CAAC,EAAE;YACT,oCAAoC;SACrC;IACH,CAAC;CAAA;AAED,MAAM,iBAAiB,GAAG,GAAS,EAAE;IACnC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IACvE,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,SAAS,GAAG,MAAM,yBAAa,EAAE,CAAA;QACvC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,CAAO,GAAG,EAAE,IAAI,EAAE,EAAE;YACxC,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,mDAAmD,EAAE,GAAG,CAAC,CAAA;aACtE;iBAAM;gBACL,IAAI;oBACF,MAAM,GAAG,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAC,CAAC,CAAA;oBAC7D,IAAG,CAAC,GAAG,EAAC;wBACN,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;4BAC1C,EAAE,EAAE,CAAC;4BACL,SAAS,EAAE,IAAI,CAAC,eAAe;4BAC/B,OAAO,EAAE,IAAI;4BACb,SAAS,EAAE,IAAI;yBAChB,CAAC,CAAA;wBACF,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;qBAChE;iBACF;gBAAC,OAAM,KAAK,EAAE;oBACb,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAA;iBACxD;aACF;QACH,CAAC,CAAA,CAAC,CAAA;KACH;AACH,CAAC,CAAA,CAAA;AAqBuB,8CAAiB;AAnBzC,MAAM,aAAa,GAAG,GAAS,EAAE;IAC/B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,MAAM,OAAO,GAAQ,oBAAI,CAAC,wCAAwC,EAChE,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAC,EAClB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACtB,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CACF,CAAC;QAEF,wCAAwC;QACxC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAA;AAE0C,sCAAa;AAExD,SAAe,SAAS;;QACtB,MAAM,YAAY,EAAE,CAAA;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AALyD,8BAAS;AAOnE,SAAe,YAAY;;QACzB,MAAM,UAAU,GAAG,MAAM,yBAAe,EAAE,CAAA;QAC1C,MAAM,GAAG,GAAG,MAAM,kBAAQ,EAAE,CAAA;QAC5B,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,aAAa,UAAU,EAAE,CAAC,CAAA;IAChE,CAAC;CAAA;AAED,SAAe,OAAO;;QACpB,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;QAC9B,IAAI,SAAS,CAAA;QACb,IAAG,CAAC,EAAE,EAAE;YACN,IAAI;gBACF,SAAS,GAAG,MAAM,QAAQ,CAAC,EAAE,EAAE,CAAA;aAChC;YAAC,OAAM,CAAC,EAAC,GAAE;SACb;aAAM;YACL,SAAS,GAAG,EAAE,CAAA;SACf;QACD,IAAG,CAAC,SAAS,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YACvC,OAAM;SACP;QACD,IAAI,KAAK,GAAG,SAAS,CAAA;QACrB,qDAAqD;QAErD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,kBAAQ,IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC3E,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAC,EAAC,IAAI,EAAC,UAAU,EAAC,EAAE,UAAU,GAAG,EAAE,GAAG;YACvD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/frontend/components/Media/index.jsx b/frontend/components/Media/index.jsx index 364d953..8c6dd85 100644 --- a/frontend/components/Media/index.jsx +++ b/frontend/components/Media/index.jsx @@ -43,8 +43,7 @@ export default function Media(props) { const ttl = 60*60*24*7 // one week const file = files[0] || {} var start = new Date(); - const r = await api.media.UPLOAD('upload/attachment',file,{ - chat_uuid: '1234567890', + const r = await api.media.UPLOAD('file',file,{ name: file.name||'filename', description: description||'description', ttl: ttl, @@ -52,12 +51,12 @@ export default function Media(props) { var end = new Date(); var time = end.getTime() - start.getTime(); console.log('Upload Timer: finished in', time, 'ms'); - // await api.relay.POST('attachment', { - // muid: r.muid, - // file_name: r.filename, - // chat_id: 13, - // ttl: ttl, - // }) + await api.relay.POST('attachment', { + muid: r.muid, + file_name: r.filename, + chat_id: 13, + ttl: ttl, + }) }, [description]) // subscribe to "description" async function search(){