Browse Source

simplify

dependabot/npm_and_yarn/ini-1.3.7
Evan Feenstra 4 years ago
parent
commit
85ca7551c4
  1. 3
      dist/src/controllers/media.js
  2. 2
      dist/src/controllers/media.js.map
  3. 5
      dist/src/controllers/messages.js
  4. 2
      dist/src/controllers/messages.js.map
  5. 3
      dist/src/controllers/payment.js
  6. 2
      dist/src/controllers/payment.js.map
  7. 3
      src/controllers/media.ts
  8. 5
      src/controllers/messages.ts
  9. 3
      src/controllers/payment.ts

3
dist/src/controllers/media.js

@ -175,7 +175,8 @@ exports.purchase = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
mediaToken: media_token,
date: date,
createdAt: date,
updatedAt: date
updatedAt: date,
network_type: constants_1.default.network_types.lightning
});
const msg = {
mediaToken: media_token, id: message.id, uuid: message.uuid,

2
dist/src/controllers/media.js.map

File diff suppressed because one or more lines are too long

5
dist/src/controllers/messages.js

@ -155,7 +155,7 @@ exports.sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function*
// IF BOOST AND TRIBE OWNER NEED TO SEND ACTUAL SATS TO OG POSTER
const isTribe = chat.type === constants_1.default.chat_types.tribe;
const isTribeOwner = isTribe && owner.publicKey === chat.ownerPubkey;
if ((!isTribe || isTribeOwner) && reply_uuid && boost && amount) {
if (isTribeOwner && reply_uuid && boost && amount) {
const ogMsg = yield models_1.models.Message.findOne({ where: {
uuid: reply_uuid,
} });
@ -177,14 +177,13 @@ exports.sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function*
status: constants_1.default.statuses.pending,
createdAt: date,
updatedAt: date,
network_type: realSatsContactId ?
network_type: (!isTribe || realSatsContactId) ?
constants_1.default.network_types.lightning :
constants_1.default.network_types.mqtt
};
if (reply_uuid)
msg.replyUuid = reply_uuid;
// console.log(msg)
console.log("=> SAVED MSG", JSON.stringify(msg, null, 2));
const message = yield models_1.models.Message.create(msg);
res_1.success(res, jsonUtils.messageToJson(message, chat));
const msgToSend = {

2
dist/src/controllers/messages.js.map

File diff suppressed because one or more lines are too long

3
dist/src/controllers/payment.js

@ -51,7 +51,8 @@ exports.sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function*
amountMsat: parseFloat(amount) * 1000,
date: date,
createdAt: date,
updatedAt: date
updatedAt: date,
network_type: constants_1.default.network_types.lightning,
};
if (text)
msg.messageContent = text;

2
dist/src/controllers/payment.js.map

File diff suppressed because one or more lines are too long

3
src/controllers/media.ts

@ -195,7 +195,8 @@ export const purchase = async (req, res) => {
mediaToken: media_token,
date: date,
createdAt: date,
updatedAt: date
updatedAt: date,
network_type: constants.network_types.lightning
})
const msg={

5
src/controllers/messages.ts

@ -177,7 +177,7 @@ export const sendMessage = async (req, res) => {
// IF BOOST AND TRIBE OWNER NEED TO SEND ACTUAL SATS TO OG POSTER
const isTribe = chat.type===constants.chat_types.tribe
const isTribeOwner = isTribe && owner.publicKey===chat.ownerPubkey
if((!isTribe || isTribeOwner) && reply_uuid && boost && amount) {
if(isTribeOwner && reply_uuid && boost && amount) {
const ogMsg = await models.Message.findOne({where:{
uuid: reply_uuid,
}})
@ -200,13 +200,12 @@ export const sendMessage = async (req, res) => {
status: constants.statuses.pending,
createdAt: date,
updatedAt: date,
network_type: realSatsContactId ?
network_type: (!isTribe || realSatsContactId) ?
constants.network_types.lightning :
constants.network_types.mqtt
}
if(reply_uuid) msg.replyUuid=reply_uuid
// console.log(msg)
console.log("=> SAVED MSG",JSON.stringify(msg,null,2))
const message = await models.Message.create(msg)
success(res, jsonUtils.messageToJson(message, chat))

3
src/controllers/payment.ts

@ -63,7 +63,8 @@ export const sendPayment = async (req, res) => {
amountMsat: parseFloat(amount) * 1000,
date: date,
createdAt: date,
updatedAt: date
updatedAt: date,
network_type: constants.network_types.lightning,
}
if(text) msg.messageContent = text
if(remote_text) msg.remoteMessageContent = remote_text

Loading…
Cancel
Save