diff --git a/server.js b/server.js index 92620f0..0d2bbbc 100644 --- a/server.js +++ b/server.js @@ -15,7 +15,7 @@ const favicon = require('serve-favicon'); const bodyParser = require('body-parser'); const bcrypt = require('bcrypt'); const passport = require('passport'); -const twitter = require('twitter'); +const twit = require('twit'); const uuidv4 = require('uuid/v4'); const turf = require('@turf/turf'); @@ -34,7 +34,7 @@ app.use(bodyParser.urlencoded({ var app_cfg = require('./server/app_cfg.js'); var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, 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 socket = require('./server/socket')(io, sql, app_cfg, waip); var udp = require('./server/udp')(app_cfg, waip, sql); diff --git a/server/twitter.js b/server/twitter.js index c7ad34e..f8d4020 100755 --- a/server/twitter.js +++ b/server/twitter.js @@ -3,15 +3,15 @@ module.exports = function(twit, uuidv4, app_cfg) { 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 - +console.log('twitter_data'+JSON.stringify(twitter_data)); var T = new twit({ consumer_key: twitter_data.tw_consumer_key, consumer_secret: twitter_data.tw_consumer_secret, access_token_key: twitter_data.tw_access_token_key, - access_token_secret: twitter_data.tw_access_token_secret - timeout_ms: 60*1000, // optional HTTP request timeout to apply to all requests. - strictSSL: true, // optional - requires SSL certificates to be valid. + access_token_secret: twitter_data.tw_access_token_secret//, + //timeout_ms: 60*1000, // optional HTTP request timeout to apply to all requests. + //strictSSL: true, // optional - requires SSL certificates to be valid. }) var params = {screen_name: twitter_data.tw_screen_name};