From 520fb6674a24c3cad844e48b46ebceadab4fbdde Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 18 Oct 2021 18:56:32 +0300 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D0=B8=D1=82=D1=8C=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=BC=D0=B5=D0=BC=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/index.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/backend/index.js b/backend/index.js index fff6bbb..49ac984 100644 --- a/backend/index.js +++ b/backend/index.js @@ -118,18 +118,14 @@ app.get('/card', async (req, res) => { }) app.get('/meme', async (req, res) => { + const amount = req.query.amount || 1 try { - let card - // Тянем карты и отбрасываем их в соответствии с их вероятностью отбрасывания - do { - card = await cardsCollection.aggregate([{ $sample: { size: 1 } }]).toArray() - card = card[0] - } while (Math.random() < dropProb[card.name]) + let cards = await cardsCollection.aggregate([{ $sample: { size: amount } }]).toArray() // Удаляем конфиденциальную информацию - delete card.date - delete card.link - delete card.name - res.status(200).send(card) + cards = cards.map((card) => { + return card.image + }) + res.status(200).send(cards) } catch (e) { console.log("Error: " + e) res.status(500).send()