From 8431c408b418ade228b6f14336eaaebc83934749 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Mon, 16 Nov 2020 15:47:52 -0800 Subject: [PATCH] fix --- dist/src/controllers/feed.js | 2 +- dist/src/controllers/feed.js.map | 2 +- src/controllers/feed.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/src/controllers/feed.js b/dist/src/controllers/feed.js index 8ace059..b6832f1 100644 --- a/dist/src/controllers/feed.js +++ b/dist/src/controllers/feed.js @@ -29,7 +29,7 @@ exports.streamFeed = (req, res) => __awaiter(void 0, void 0, void 0, function* ( if (meta && meta.itemID) { const cm = { itemID: meta.itemID, - timestamp: meta.timestamp || 0, + ts: meta.ts || 0, sats_per_minute: amount || 0, }; const chat = yield models_1.models.Chat.findOne({ where: { id: chat_id } }); diff --git a/dist/src/controllers/feed.js.map b/dist/src/controllers/feed.js.map index 73acea7..6ff63ab 100644 --- a/dist/src/controllers/feed.js.map +++ b/dist/src/controllers/feed.js.map @@ -1 +1 @@ -{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../../src/controllers/feed.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../../src/controllers/feed.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/feed.ts b/src/controllers/feed.ts index 0c85978..43c94ac 100644 --- a/src/controllers/feed.ts +++ b/src/controllers/feed.ts @@ -6,7 +6,7 @@ import constants from '../constants' export interface ChatMeta { itemID: number, - timestamp: number, + ts: number, sats_per_minute: number, } @@ -44,7 +44,7 @@ export const streamFeed = async (req,res) => { if(meta && meta.itemID) { const cm:ChatMeta = { itemID: meta.itemID, - timestamp: meta.timestamp||0, + ts: meta.ts||0, sats_per_minute: amount||0, } const chat = await models.Chat.findOne({ where: { id: chat_id } })