lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix

dependabot/npm_and_yarn/ini-1.3.7
Evan Feenstra 4 years ago
parent
b01fa87fcc
commit
a2ab10780c
3 changed files with 61 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      dist/src/controllers/feed.js
  2. 2
      dist/src/controllers/feed.js.map
  3. 78
      src/controllers/feed.ts

38
dist/src/controllers/feed.js
View File

@ -18,25 +18,27 @@ exports.streamFeed = (req, res) => __awaiter(void 0, void 0, void 0, function* (
if (!(destinations && destinations.length)) {
return res_1.failure(res, 'no destinations');
}
let meta;
try {
meta = JSON.parse(text);
}
catch (e) { }
if (!meta) {
return res_1.failure(res, 'no meta');
}
if (update_meta && meta && meta.itemID) {
const cm = {
itemID: meta.itemID,
ts: meta.ts || 0,
sats_per_minute: amount || 0,
};
const chat = yield models_1.models.Chat.findOne({ where: { id: chat_id } });
if (!chat) {
return res_1.failure(res, 'no chat');
if (update_meta) {
let meta;
try {
meta = JSON.parse(text);
}
catch (e) { }
if (!meta) {
return res_1.failure(res, 'no meta');
}
if (meta && meta.itemID) {
const cm = {
itemID: meta.itemID,
ts: meta.ts || 0,
sats_per_minute: amount || 0,
};
const chat = yield models_1.models.Chat.findOne({ where: { id: chat_id } });
if (!chat) {
return res_1.failure(res, 'no chat');
}
yield chat.update({ meta: JSON.stringify(cm) });
}
yield chat.update({ meta: JSON.stringify(cm) });
}
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
if (amount && typeof amount === 'number') {

2
dist/src/controllers/feed.js.map
View File

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

78
src/controllers/feed.ts
View File

@ -1,5 +1,5 @@
import {models} from '../models'
import { models } from '../models'
import * as helpers from '../helpers'
import { failure, success } from '../utils/res'
import constants from '../constants'
@ -17,55 +17,57 @@ export interface Destination {
type: DestinationType
}
export const streamFeed = async (req,res) => {
export const streamFeed = async (req, res) => {
const {
destinations,
amount,
chat_id,
text,
update_meta,
}:{
destinations:Destination[],
amount:number,
chat_id:number,
text:string,
update_meta:boolean,
}: {
destinations: Destination[],
amount: number,
chat_id: number,
text: string,
update_meta: boolean,
} = req.body
if(!(destinations && destinations.length)) {
if (!(destinations && destinations.length)) {
return failure(res, 'no destinations')
}
let meta;
try {
meta = JSON.parse(text)
} catch(e) {}
if(!meta) {
return failure(res, 'no meta')
}
if(update_meta && meta && meta.itemID) {
const cm:ChatMeta = {
itemID: meta.itemID,
ts: meta.ts||0,
sats_per_minute: amount||0,
if (update_meta) {
let meta;
try {
meta = JSON.parse(text)
} catch (e) { }
if (!meta) {
return failure(res, 'no meta')
}
const chat = await models.Chat.findOne({ where: { id: chat_id } })
if(!chat) {
return failure(res, 'no chat')
if (meta && meta.itemID) {
const cm: ChatMeta = {
itemID: meta.itemID,
ts: meta.ts || 0,
sats_per_minute: amount || 0,
}
const chat = await models.Chat.findOne({ where: { id: chat_id } })
if (!chat) {
return failure(res, 'no chat')
}
await chat.update({ meta: JSON.stringify(cm) })
}
await chat.update({meta: JSON.stringify(cm)})
}
const owner = await models.Contact.findOne({ where: { isOwner: true }})
const owner = await models.Contact.findOne({ where: { isOwner: true } })
if(amount && typeof amount==='number') {
await asyncForEach(destinations, async (d:Destination)=>{
if (amount && typeof amount === 'number') {
await asyncForEach(destinations, async (d: Destination) => {
if (d.type === 'node') {
if (!d.address) return
if (d.address.length !== 66) return
if (d.address===owner.publicKey) return // dont send to self
if (d.address === owner.publicKey) return // dont send to self
const amt = Math.max(Math.round((d.split / 100) * amount), 1)
await anonymousKeysend(owner, d.address, amt, text, function(){}, function(){})
await anonymousKeysend(owner, d.address, amt, text, function () { }, function () { })
}
})
}
@ -74,14 +76,14 @@ export const streamFeed = async (req,res) => {
}
export async function anonymousKeysend(owner, destination_key:string, amount:number, text:string, onSuccess:Function, onFailure:Function){
const msg:{[k:string]:any} = {
type:constants.message_types.keysend,
export async function anonymousKeysend(owner, destination_key: string, amount: number, text: string, onSuccess: Function, onFailure: Function) {
const msg: { [k: string]: any } = {
type: constants.message_types.keysend,
}
if(text) msg.message = {content:text}
if (text) msg.message = { content: text }
return helpers.performKeysendMessage({
sender:owner,
sender: owner,
destination_key,
amount,
msg,
@ -94,15 +96,15 @@ export async function anonymousKeysend(owner, destination_key:string, amount:num
type: constants.message_types.keysend,
sender: 1,
amount,
amountMsat: amount*1000,
amountMsat: amount * 1000,
paymentHash: '',
date,
messageContent: text||'',
messageContent: text || '',
status: constants.statuses.confirmed,
createdAt: date,
updatedAt: date
})
onSuccess({destination_key, amount})
onSuccess({ destination_key, amount })
},
failure: (error) => {
onFailure(error)

Write Preview
Loading…
Cancel
Save