diff --git a/api/controllers/chats.ts b/api/controllers/chats.ts index c54447e..ccc00a3 100644 --- a/api/controllers/chats.ts +++ b/api/controllers/chats.ts @@ -102,8 +102,8 @@ async function createGroupChat(req, res) { // publish to tribe server tribes.declare({ ...chatParams, - pricePerMessage: price_per_message, - priceToJoin: price_to_join, + pricePerMessage: price_per_message||0, + priceToJoin: price_to_join||0, description, tags, img, }) } diff --git a/api/controllers/invoices.ts b/api/controllers/invoices.ts index 2fe51e9..12798c9 100644 --- a/api/controllers/invoices.ts +++ b/api/controllers/invoices.ts @@ -189,14 +189,14 @@ const receiveInvoice = async (payload) => { var date = new Date(); date.setMilliseconds(0) - const { owner, sender, chat, msg_id } = await helpers.parseReceiveParams(payload) + const { owner, sender, chat, msg_id, chat_type, sender_alias } = await helpers.parseReceiveParams(payload) if (!owner || !sender || !chat) { return console.log('=> no group chat!') } const { memo, sat, msat, paymentHash, invoiceDate, expirationSeconds } = decodePaymentRequest(payment_request) - const message = await models.Message.create({ + const msg:{[k:string]:any} = { chatId: chat.id, type: constants.message_types.invoice, sender: sender.id, @@ -211,7 +211,12 @@ const receiveInvoice = async (payload) => { status: constants.statuses.pending, createdAt: date, updatedAt: date - }) + } + const isTribe = chat_type===constants.chat_types.tribe + if(isTribe) { + msg.senderAlias = sender_alias + } + const message = await models.Message.create(msg) console.log('received keysend invoice message', message.id) socket.sendJson({ @@ -219,7 +224,7 @@ const receiveInvoice = async (payload) => { response: jsonUtils.messageToJson(message, chat, sender) }) - sendNotification(chat, sender.alias, 'message') + sendNotification(chat, msg.senderAlias||sender.alias, 'message') const theChat = {...chat.dataValues, contactIds:[sender.id]} sendConfirmation({ chat:theChat, sender: owner, msg_id }) diff --git a/api/controllers/media.ts b/api/controllers/media.ts index ac47b8f..6d8e7bc 100644 --- a/api/controllers/media.ts +++ b/api/controllers/media.ts @@ -392,7 +392,7 @@ const receiveAttachment = async (payload) => { var date = new Date(); date.setMilliseconds(0) - const {owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id} = await helpers.parseReceiveParams(payload) + const {owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias} = await helpers.parseReceiveParams(payload) if(!owner || !sender || !chat) { return console.log('=> no group chat!') } @@ -409,6 +409,10 @@ const receiveAttachment = async (payload) => { if(mediaToken) msg.mediaToken = mediaToken if(mediaKey) msg.mediaKey = mediaKey if(mediaType) msg.mediaType = mediaType + const isTribe = chat_type===constants.chat_types.tribe + if(isTribe) { + msg.senderAlias = sender_alias + } const message = await models.Message.create(msg) @@ -419,7 +423,7 @@ const receiveAttachment = async (payload) => { response: jsonUtils.messageToJson(message, chat, sender) }) - sendNotification(chat, sender.alias, 'message') + sendNotification(chat, msg.senderAlias||sender.alias, 'message') const theChat = {...chat.dataValues, contactIds:[sender.id]} sendConfirmation({ chat:theChat, sender: owner, msg_id }) diff --git a/api/controllers/messages.ts b/api/controllers/messages.ts index 5fd401c..9ca4eb8 100644 --- a/api/controllers/messages.ts +++ b/api/controllers/messages.ts @@ -184,7 +184,7 @@ const receiveMessage = async (payload) => { response: jsonUtils.messageToJson(message, chat, sender) }) - sendNotification(chat, sender.alias, 'message') + sendNotification(chat, msg.senderAlias||sender.alias, 'message') const theChat = {...chat.dataValues, contactIds:[sender.id]} sendConfirmation({ chat:theChat, sender: owner, msg_id }) diff --git a/api/controllers/payment.ts b/api/controllers/payment.ts index 478e204..6e049fd 100644 --- a/api/controllers/payment.ts +++ b/api/controllers/payment.ts @@ -124,7 +124,7 @@ const receivePayment = async (payload) => { var date = new Date(); date.setMilliseconds(0) - const {owner, sender, chat, amount, content, mediaType, mediaToken} = await helpers.parseReceiveParams(payload) + const {owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias} = await helpers.parseReceiveParams(payload) if(!owner || !sender || !chat) { return console.log('=> no group chat!') } @@ -142,6 +142,9 @@ const receivePayment = async (payload) => { if(content) msg.messageContent = content if(mediaType) msg.mediaType = mediaType if(mediaToken) msg.mediaToken = mediaToken + if(chat_type===constants.chat_types.tribe) { + msg.senderAlias = sender_alias + } const message = await models.Message.create(msg) @@ -152,7 +155,7 @@ const receivePayment = async (payload) => { response: jsonUtils.messageToJson(message, chat, sender) }) - sendNotification(chat, sender.alias, 'message') + sendNotification(chat, msg.senderAlias||sender.alias, 'message') } const listPayments = async (req, res) => { diff --git a/dist/api/controllers/chats.js b/dist/api/controllers/chats.js index ef694d6..25e4854 100644 --- a/dist/api/controllers/chats.js +++ b/dist/api/controllers/chats.js @@ -99,7 +99,7 @@ function createGroupChat(req, res) { chatParams = yield createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join); if (is_listed && chatParams.uuid) { // publish to tribe server - tribes.declare(Object.assign(Object.assign({}, chatParams), { pricePerMessage: price_per_message, priceToJoin: price_to_join, description, tags, img })); + tribes.declare(Object.assign(Object.assign({}, chatParams), { pricePerMessage: price_per_message || 0, priceToJoin: price_to_join || 0, description, tags, img })); } // make me owner when i create members[owner.publicKey].role = constants.chat_roles.owner; diff --git a/dist/api/controllers/chats.js.map b/dist/api/controllers/chats.js.map index b5b404d..3a6c3c9 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/controllers/invoices.js b/dist/api/controllers/invoices.js index 305c3c7..fc3e1b2 100644 --- a/dist/api/controllers/invoices.js +++ b/dist/api/controllers/invoices.js @@ -174,12 +174,12 @@ const receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function* const payment_request = dat.message.invoice; var date = new Date(); date.setMilliseconds(0); - const { owner, sender, chat, msg_id } = yield helpers.parseReceiveParams(payload); + const { owner, sender, chat, msg_id, chat_type, sender_alias } = yield helpers.parseReceiveParams(payload); if (!owner || !sender || !chat) { return console.log('=> no group chat!'); } const { memo, sat, msat, paymentHash, invoiceDate, expirationSeconds } = decodePaymentRequest(payment_request); - const message = yield models_1.models.Message.create({ + const msg = { chatId: chat.id, type: constants.message_types.invoice, sender: sender.id, @@ -194,13 +194,18 @@ const receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function* status: constants.statuses.pending, createdAt: date, updatedAt: date - }); + }; + const isTribe = chat_type === constants.chat_types.tribe; + if (isTribe) { + msg.senderAlias = sender_alias; + } + const message = yield models_1.models.Message.create(msg); console.log('received keysend invoice message', message.id); socket.sendJson({ type: 'invoice', response: jsonUtils.messageToJson(message, chat, sender) }); - hub_1.sendNotification(chat, sender.alias, 'message'); + hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message'); const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); diff --git a/dist/api/controllers/invoices.js.map b/dist/api/controllers/invoices.js.map index f739e91..03ca4b9 100644 --- a/dist/api/controllers/invoices.js.map +++ b/dist/api/controllers/invoices.js.map @@ -1 +1 @@ -{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../api/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../api/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/media.js b/dist/api/controllers/media.js index cec1a6b..306db09 100644 --- a/dist/api/controllers/media.js +++ b/dist/api/controllers/media.js @@ -359,7 +359,7 @@ const receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, functio console.log('received attachment', { payload }); var date = new Date(); date.setMilliseconds(0); - const { owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id } = yield helpers.parseReceiveParams(payload); + const { owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias } = yield helpers.parseReceiveParams(payload); if (!owner || !sender || !chat) { return console.log('=> no group chat!'); } @@ -379,13 +379,17 @@ const receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, functio msg.mediaKey = mediaKey; if (mediaType) msg.mediaType = mediaType; + const isTribe = chat_type === constants.chat_types.tribe; + if (isTribe) { + msg.senderAlias = sender_alias; + } const message = yield models_1.models.Message.create(msg); // console.log('saved attachment', message.dataValues) socket.sendJson({ type: 'attachment', response: jsonUtils.messageToJson(message, chat, sender) }); - hub_1.sendNotification(chat, sender.alias, 'message'); + hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message'); const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); diff --git a/dist/api/controllers/media.js.map b/dist/api/controllers/media.js.map index 7d00fe8..2d9cfc3 100644 --- a/dist/api/controllers/media.js.map +++ b/dist/api/controllers/media.js.map @@ -1 +1 @@ -{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../api/controllers/media.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../api/controllers/media.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/messages.js b/dist/api/controllers/messages.js index fe4c1a1..ce135bb 100644 --- a/dist/api/controllers/messages.js +++ b/dist/api/controllers/messages.js @@ -163,7 +163,7 @@ const receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function* type: 'message', response: jsonUtils.messageToJson(message, chat, sender) }); - hub_1.sendNotification(chat, sender.alias, 'message'); + hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message'); const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); diff --git a/dist/api/controllers/messages.js.map b/dist/api/controllers/messages.js.map index 1e2b2f4..fc1913b 100644 --- a/dist/api/controllers/messages.js.map +++ b/dist/api/controllers/messages.js.map @@ -1 +1 @@ -{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/payment.js b/dist/api/controllers/payment.js index e47e323..75601bd 100644 --- a/dist/api/controllers/payment.js +++ b/dist/api/controllers/payment.js @@ -114,7 +114,7 @@ const receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function* console.log('received payment', { payload }); var date = new Date(); date.setMilliseconds(0); - const { owner, sender, chat, amount, content, mediaType, mediaToken } = yield helpers.parseReceiveParams(payload); + const { owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias } = yield helpers.parseReceiveParams(payload); if (!owner || !sender || !chat) { return console.log('=> no group chat!'); } @@ -134,13 +134,16 @@ const receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function* msg.mediaType = mediaType; if (mediaToken) msg.mediaToken = mediaToken; + if (chat_type === constants.chat_types.tribe) { + msg.senderAlias = sender_alias; + } const message = yield models_1.models.Message.create(msg); console.log('saved message', message.dataValues); socket.sendJson({ type: 'direct_payment', response: jsonUtils.messageToJson(message, chat, sender) }); - hub_1.sendNotification(chat, sender.alias, 'message'); + hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message'); }); exports.receivePayment = receivePayment; const listPayments = (req, res) => __awaiter(void 0, void 0, void 0, function* () { diff --git a/dist/api/controllers/payment.js.map b/dist/api/controllers/payment.js.map index aabf6ed..baf4021 100644 --- a/dist/api/controllers/payment.js.map +++ b/dist/api/controllers/payment.js.map @@ -1 +1 @@ -{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../api/controllers/payment.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../api/controllers/payment.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,gCAAyC;AACzC,0CAAyC;AACzC,2CAA0C;AAC1C,sCAAqC;AACrC,sCAAsC;AACtC,gDAA+C;AAC/C,wCAA4C;AAC5C,yDAAwD;AACxD,sCAAqC;AAErC,MAAM,WAAW,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACrC,MAAM,EACJ,MAAM,EACN,OAAO,EACP,UAAU,EACV,eAAe,EACf,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,UAAU,EACV,eAAe,EACf,WAAW,GACZ,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE;QAC9C,OAAO,OAAO,CAAC,qBAAqB,CAAC;YACnC,eAAe;YACf,MAAM;YACN,GAAG,EAAC,EAAE;YACN,OAAO,EAAE,GAAG,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBAC5B,aAAO,CAAC,GAAG,EAAE,EAAC,eAAe,EAAE,MAAM,EAAC,CAAC,CAAA;YACzC,CAAC;YACD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpC,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC;SACF,CAAC,CAAA;KACH;IAED,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IAEvE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC;QAC1C,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,UAAU;KACzB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,IAAI;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;IAClC,IAAG,WAAW;QAAE,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAA;IAEtD,IAAG,IAAI,EAAC;QACN,MAAM,YAAY,GAAG,MAAM,qBAAc,CAAC;YACxC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAE,IAAI,EAAC,EAAE;YAC9B,IAAI,EAAE,GAAG,EAAC,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,SAAS;SACxB,CAAC,CAAA;QACF,GAAG,CAAC,UAAU,GAAG,YAAY,CAAA;QAC7B,GAAG,CAAC,SAAS,GAAG,UAAU,IAAI,EAAE,CAAA;KACjC;IAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAqB;QAClC,EAAE,EAAC,OAAO,CAAC,EAAE;QACb,MAAM;KACP,CAAA;IACD,IAAG,IAAI,EAAE;QACP,SAAS,CAAC,SAAS,GAAG,UAAU,IAAE,YAAY,CAAA;QAC9C,SAAS,CAAC,UAAU,GAAG,EAAC,IAAI,EAAC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAC,CAAA;KACpD;IACD,IAAG,WAAW;QAAE,SAAS,CAAC,OAAO,GAAG,WAAW,CAAA;IAE/C,+CAA+C;IAC/C,kCAAkC;IAClC,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAG,WAAW,EAAC;QACb,OAAO,mCAAO,IAAI,CAAC,UAAU,KAAE,UAAU,EAAC,WAAW,GAAC,CAAA;QACtD,IAAG,eAAe;YAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAA;KACxD;IACD,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;YACtB,wCAAwC;YACxC,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC,CAAA;QACD,OAAO,EAAE,CAAO,KAAK,EAAE,EAAE;YACvB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aACjD,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAA;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAC;AA2FA,kCAAW;AAzFb,MAAM,cAAc,GAAG,CAAO,OAAO,EAAE,EAAE;IACvC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAE5C,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAC,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IACxI,IAAG,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;KACxC;IAED,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,OAAO;QAAE,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA;IACxC,IAAG,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IACvC,IAAG,UAAU;QAAE,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC1C,IAAG,SAAS,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE;QAC3C,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;KAC9B;IAEA,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;IAEhD,MAAM,CAAC,QAAQ,CAAC;QACd,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,CAAC,CAAA;IAEF,sBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAClE,CAAC,CAAA,CAAA;AAoDC,wCAAc;AAlDhB,MAAM,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACtC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAA;IACnE,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpE,MAAM,QAAQ,GAAU,EAAE,CAAA;IAE1B,MAAM,IAAI,GAAO,MAAM,SAAS,CAAC,eAAe,EAAE,CAAA;IAClD,IAAG,IAAI,IAAI,IAAI,CAAC,MAAM,EAAC;QACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA,EAAE;YAChB,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAC5C,IAAG,GAAG,IAAI,GAAG,GAAC,CAAC,EAAE;gBACf,IAAI,YAAY,GAAC,EAAE,CAAA;gBACnB,IAAG,GAAG,CAAC,MAAM,EAAC;oBACZ,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;iBACvD;gBACD,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAC,SAAS;oBACd,MAAM,EAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;oBAC1B,IAAI,EAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC;oBAChC,eAAe,EAAC,GAAG,CAAC,eAAe;oBACnC,YAAY;iBACb,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;KACH;IAED,MAAM,IAAI,GAAO,MAAM,SAAS,CAAC,eAAe,EAAE,CAAA;IAClD,IAAG,IAAI,IAAI,IAAI,CAAC,MAAM,EAAC;QACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA,EAAE;YAChB,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAC5C,IAAG,GAAG,IAAI,GAAG,GAAC,CAAC,EAAE;gBACf,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAC,SAAS;oBACd,MAAM,EAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;oBAC1B,IAAI,EAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC;oBAChC,MAAM,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAC,CAAC,CAAC;oBAClC,YAAY,EAAE,GAAG,CAAC,YAAY;iBAC/B,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;KACH;IAED,mBAAmB;IACnB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;IAEtC,aAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9C,CAAC,CAAA,CAAC;AAKA,oCAAY"} \ No newline at end of file