From a50a44b67ac15686e763c4254d4d8540243fff24 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 26 May 2020 15:01:01 +0200
Subject: [PATCH] update Di 26. Mai 15:01:01 CEST 2020

---
 server.js         |  2 +-
 server/app_cfg.js |  1 +
 server/broker.js  | 26 ++++++++++++--------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/server.js b/server.js
index 2ab6efe..fb85084 100644
--- a/server.js
+++ b/server.js
@@ -37,7 +37,7 @@ app.use(bodyParser.urlencoded({
 // Scripte einbinden
 var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, 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 socket = require('./server/socket')(io, sql, app_cfg, waip);
 var udp = require('./server/udp')(app_cfg, waip, sql);
diff --git a/server/app_cfg.js b/server/app_cfg.js
index 86b0b96..ea3a160 100644
--- a/server/app_cfg.js
+++ b/server/app_cfg.js
@@ -25,6 +25,7 @@ app_cfg.global = {
 
 // Einstellungen zur Erscheinung der Seite
 app_cfg.public = {
+	url: 'https://wachalarm.info.tm',
 	app_name: 'Wachalarm IP-Web',
 	company: 'Leitstelle Lausitz',
 	version: 'Version 1.2',
diff --git a/server/broker.js b/server/broker.js
index fe99247..a59e258 100755
--- a/server/broker.js
+++ b/server/broker.js
@@ -1,4 +1,4 @@
-module.exports = function (uuidv4, sql) {
+module.exports = function (app_cfg, sql, uuidv4) {
 
   // Module laden
   const twit = require('twit');
@@ -8,8 +8,8 @@ module.exports = function (uuidv4, sql) {
     // vmtl_data: tw.tw_screen_name, tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, wa.name_wache
     if (app_cfg.global.development) {
       console.log('Daten Vermittlung: ' + JSON.stringify(vmtl_data));
-    };  
-  
+    };
+
     var T = new twit({
       consumer_key: vmtl_data.tw_consumer_key,
       consumer_secret: vmtl_data.tw_consumer_secret,
@@ -31,20 +31,19 @@ module.exports = function (uuidv4, sql) {
           list_id: list_obj[0].id_str,
           count: 50
         };
+        // mit List_id die Mitglieder der Liste auslesen
         T.get('lists/members', member_params, function (error, members, response) {
           if (!error) {
             if (app_cfg.global.development) {
               console.log('Mitglieder der Twitter-Liste: ' + JSON.stringify(members));
-            };  
+            };
             // an jedes Mitglied der Liste eine Meldung senden
             var arrayLength = members.users.length;
             for (var i = 0; i < arrayLength; i++) {
-           
-              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();
-              
-              
-              //Do something
-
+              // 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();
+              // Parameter der Mitteilung
               var msg_params = {
                 event: {
                   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) {
                 if (!error) {
-                  console.log('OK');
-                  console.log(members.users[i].screen_name);
-                  sql.db_log('VMTL', 'Fehler beim lesen der Twitter-Liste: ' + error);
+                  sql.db_log('VMTL', 'Einsatz-Link an ' + members.users[i].screen_name + ' gesendet.');
                   callback && callback(members);
                 } else {
-                  console.log(error);
+                  sql.db_log('VMTL', 'Fehler beim senden des Einsatz-Links an ' + members.users[i].screen_name + ': ' + error);
                   callback && callback(null);
                 };
               });