From 3cf17cfeb01debfc3850a6b4f82fb4bdd3248383 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 24 Aug 2018 20:19:07 -0700 Subject: [PATCH] adding in news distribution --- app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 8e8735e..9b21846 100644 --- a/app.js +++ b/app.js @@ -84,13 +84,16 @@ io.on('connection', function (socket) { let long = input.position.long; let lat = input.position.lat; - var sql = 'SELECT * FROM messages, users WHERE messages.user_id = users.id HAVING (6371393 * acos(cos(radians((?))) * cos(radians(messages.lat)) * cos(radians(messages.lng) - radians((?))) + sin(radians((?))) * sin(radians(messages.lat))) < 300) ORDER BY messages.id' + var sql = 'SELECT * FROM users, messages WHERE messages.user_id = users.id HAVING (6371393 * acos(cos(radians((?))) * cos(radians(messages.lat)) * cos(radians(messages.lng) - radians((?))) + sin(radians((?))) * sin(radians(messages.lat))) < 300) ORDER BY messages.id' con.query(sql, [lat, long, lat], function (err, result, fields) { if (err) throw err; socket.emit('initMessages', result); console.log('Sent all ' + result.length + ' initial messages!'); }); + + // temporarily sending the news messages to users on initial + socket.emit('initNews', news); });