mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Di 26. Mai 15:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-05-26 15:01:01 +02:00
parent a5d185ba21
commit a50a44b67a
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -37,7 +37,7 @@ app.use(bodyParser.urlencoded({
// Scripte einbinden // Scripte einbinden
var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg); var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg);
var sql = require('./server/sql_qry')(sql_cfg, uuidv4, app_cfg); var sql = require('./server/sql_qry')(sql_cfg, uuidv4, app_cfg);
var brk = require('./server/broker')(uuidv4, sql); var brk = require('./server/broker')(app_cfg, sql, uuidv4);
var waip = require('./server/waip')(io, sql, brk, async, app_cfg); var waip = require('./server/waip')(io, sql, brk, async, app_cfg);
var socket = require('./server/socket')(io, sql, app_cfg, waip); var socket = require('./server/socket')(io, sql, app_cfg, waip);
var udp = require('./server/udp')(app_cfg, waip, sql); var udp = require('./server/udp')(app_cfg, waip, sql);

1
server/app_cfg.js
View File

@ -25,6 +25,7 @@ app_cfg.global = {
// Einstellungen zur Erscheinung der Seite // Einstellungen zur Erscheinung der Seite
app_cfg.public = { app_cfg.public = {
url: 'https://wachalarm.info.tm',
app_name: 'Wachalarm IP-Web', app_name: 'Wachalarm IP-Web',
company: 'Leitstelle Lausitz', company: 'Leitstelle Lausitz',
version: 'Version 1.2', version: 'Version 1.2',

20
server/broker.js
View File

@ -1,4 +1,4 @@
module.exports = function (uuidv4, sql) { module.exports = function (app_cfg, sql, uuidv4) {
// Module laden // Module laden
const twit = require('twit'); const twit = require('twit');
@ -31,6 +31,7 @@ module.exports = function (uuidv4, sql) {
list_id: list_obj[0].id_str, list_id: list_obj[0].id_str,
count: 50 count: 50
}; };
// mit List_id die Mitglieder der Liste auslesen
T.get('lists/members', member_params, function (error, members, response) { T.get('lists/members', member_params, function (error, members, response) {
if (!error) { if (!error) {
if (app_cfg.global.development) { if (app_cfg.global.development) {
@ -39,12 +40,10 @@ module.exports = function (uuidv4, sql) {
// an jedes Mitglied der Liste eine Meldung senden // an jedes Mitglied der Liste eine Meldung senden
var arrayLength = members.users.length; var arrayLength = members.users.length;
for (var i = 0; i < arrayLength; i++) { for (var i = 0; i < arrayLength; i++) {
// Mitteilungstext festelgen
var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + vmtl_data.einsatzart + ' für ' + vmtl_data.name_wache + ', bitte um Rückmeldung: ' app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4(); var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + vmtl_data.einsatzart + ' für ' + vmtl_data.name_wache + ', bitte um Rückmeldung: ' +
app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4();
// Parameter der Mitteilung
//Do something
var msg_params = { var msg_params = {
event: { event: {
type: "message_create", type: "message_create",
@ -58,14 +57,13 @@ module.exports = function (uuidv4, sql) {
} }
} }
}; };
// Mitteilung senden
T.post('direct_messages/events/new', msg_params, function (error, members, response) { T.post('direct_messages/events/new', msg_params, function (error, members, response) {
if (!error) { if (!error) {
console.log('OK'); sql.db_log('VMTL', 'Einsatz-Link an ' + members.users[i].screen_name + ' gesendet.');
console.log(members.users[i].screen_name);
sql.db_log('VMTL', 'Fehler beim lesen der Twitter-Liste: ' + error);
callback && callback(members); callback && callback(members);
} else { } else {
console.log(error); sql.db_log('VMTL', 'Fehler beim senden des Einsatz-Links an ' + members.users[i].screen_name + ': ' + error);
callback && callback(null); callback && callback(null);
}; };
}); });