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

update Do 12. Mär 15:01:02 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-12 15:01:03 +01:00
parent bdcf4e78fe
commit ae4a8ec387
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server.js
View File

@ -15,7 +15,7 @@ const favicon = require('serve-favicon');
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
const bcrypt = require('bcrypt'); const bcrypt = require('bcrypt');
const passport = require('passport'); const passport = require('passport');
const twitter = require('twitter'); const twit = require('twit');
const uuidv4 = require('uuid/v4'); const uuidv4 = require('uuid/v4');
const turf = require('@turf/turf'); const turf = require('@turf/turf');
@ -34,7 +34,7 @@ app.use(bodyParser.urlencoded({
var app_cfg = require('./server/app_cfg.js'); var app_cfg = require('./server/app_cfg.js');
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, turf, app_cfg); var sql = require('./server/sql_qry')(sql_cfg, uuidv4, turf, app_cfg);
var tw = require('./server/twitter')(twitter, uuidv4, app_cfg); var tw = require('./server/twitter')(twit, uuidv4, app_cfg);
var waip = require('./server/waip')(io, sql, tw, async, app_cfg); var waip = require('./server/waip')(io, sql, tw, 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);

8
server/twitter.js
View File

@ -3,15 +3,15 @@ module.exports = function(twit, uuidv4, app_cfg) {
function alert_twitter_list(twitter_data, callback) { function alert_twitter_list(twitter_data, callback) {
// 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 // 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
console.log('twitter_data'+JSON.stringify(twitter_data));
var T = new twit({ var T = new twit({
consumer_key: twitter_data.tw_consumer_key, consumer_key: twitter_data.tw_consumer_key,
consumer_secret: twitter_data.tw_consumer_secret, consumer_secret: twitter_data.tw_consumer_secret,
access_token_key: twitter_data.tw_access_token_key, access_token_key: twitter_data.tw_access_token_key,
access_token_secret: twitter_data.tw_access_token_secret access_token_secret: twitter_data.tw_access_token_secret//,
timeout_ms: 60*1000, // optional HTTP request timeout to apply to all requests. //timeout_ms: 60*1000, // optional HTTP request timeout to apply to all requests.
strictSSL: true, // optional - requires SSL certificates to be valid. //strictSSL: true, // optional - requires SSL certificates to be valid.
}) })
var params = {screen_name: twitter_data.tw_screen_name}; var params = {screen_name: twitter_data.tw_screen_name};