dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Push Fix

Browse Source
This commit is contained in:
Georg Reisinger 2019-03-18 18:39:43 +01:00
parent 78997fdd83
commit 8b0a30c3cf
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
express-server/db-connect/db-connect.js
View File

@ -1,3 +1,4 @@
var push = require('../push/push');
const { const {
query, query,
nonQuery nonQuery
@ -20,8 +21,8 @@ async function updateUser(uid, mid, name, picture, email) {
async function getmessageids(sl_id) { async function getmessageids(sl_id) {
try { try {
let members = query('SELECT * FROM "Shoppinglist_member" WHERE sl_id = $1;', [sl_id]); let members = await query('SELECT row_to_json("User") AS obj FROM "Shoppinglist_member" JOIN "User" USING (username) WHERE sl_id = $1;', [sl_id]);
let admin = query('SELECT * FROM "Shoppinglist_admin" WHERE sl_id = $1;', [sl_id]); let admin = await query('SELECT row_to_json("User") AS obj FROM "Shoppinglist_admin" JOIN "User" USING (username) WHERE sl_id = $1;', [sl_id]);
return users_to_array(admin, members); return users_to_array(admin, members);
} catch (error) { } catch (error) {
@ -193,6 +194,7 @@ async function addGroup(sl_id, name, color, hidden) {
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} }
push.sendMultiplePush(await getmessageids(sl_id), "Gruppe wurde hinzugefügt!", "Zu " + name + " wurde die Gruppe " + name + " hinzugefügt!");
} }
//add item into group //add item into group
@ -497,10 +499,10 @@ function generateInviteLink() {
function users_to_array(admin, members) { function users_to_array(admin, members) {
let users = []; let users = [];
users.push(admin.username); users.push(admin[0].message_id);
for (let item of members) { for (let item of members) {
users.push(item.username); users.push(item.message_id);
} }
return users; return users;

23
express-server/push/push.js
View File

@ -1,8 +1,6 @@
var admin = require('firebase-admin'); var admin = require('firebase-admin');
function sendPush(msgtoken, title, text){ function sendPush(msgtoken, title, text){
var message = { var message = {
notification: { notification: {
title: title, title: title,
@ -24,24 +22,9 @@ function sendPush(msgtoken, title, text){
} }
function sendMultiplePush(message_ids, title, text){ function sendMultiplePush(message_ids, title, text){
console.log(message_ids) for(var i = 0; i < message_ids.length; i++){
var message = { sendPush(message_ids[i], title, text);
data: { }
title: title,
body: text
},
tokens: message_ids
};
admin.messaging().sendMulticast(message)
.then(function(response) {
// See the MessagingDevicesResponse reference documentation for
// the contents of response.
console.log('Successfully sent message:', response);
})
.catch(function(error) {
console.log('Error sending message:', error);
});
} }
module.exports = { module.exports = {
sendPush,sendMultiplePush sendPush,sendMultiplePush