Compare commits

..

No commits in common. "4f8d74c7e358ff6a8b8e12a710a8f9a1e965be26" and "daaebbd507107209a6400f9cb37a7b7b31cc8926" have entirely different histories.

3 changed files with 6 additions and 8 deletions

View File

@ -7,8 +7,6 @@ Vanderwarker Family XMPP Bot.
[![NPM](https://nodei.co/npm/vxmppb.png?compact=true)](https://nodei.co/npm/vxmppb/)
[![Known Vulnerabilities](https://snyk.io/test/npm/vxmppb/badge.svg)](https://snyk.io/test/npm/vxmppb)
![docker](https://img.shields.io/docker/pulls/vxmppb/vxmppb.svg)
![npm](https://img.shields.io/npm/dt/vxmppb)

View File

@ -1,5 +1,4 @@
debug =
calls =
[asterisk]
callfrom =

View File

@ -16,8 +16,6 @@ try {
const config = ini.parse(fs.readFileSync('./config.ini', 'utf-8'));
// check if user debugging is enabled
const debugging = config.debug;
// check if user wants phone calls with commands are run
const callme = config.calls;
// Asterisk config
const asterisk_callfrom = config.asterisk.callfrom;
@ -398,7 +396,9 @@ try {
console.log('error:', err);
} else {
let w = JSON.parse(body);
let wm = weather_city_name + " Weather: Tempature: " + w.main.temp + " degrees. Conditions: " + w.weather[0].main + ". Pressure: " +
let wm = weather_city_name + " Weather: \r\n Tempature: " + w.main.temp + " degrees. \r\n Conditions: " + w.weather[0].main + "\r\n Pressure: " +
w.main.pressure + " \r\n Wind Direction: " + getDirection(w.wind.deg) + "\r\n Wind Speed: " + w.wind.speed + " m.p.h. \r\n";
let wmc = weather_city_name + " Weather: Tempature: " + w.main.temp + " degrees. Conditions: " + w.weather[0].main + ". Pressure: " +
w.main.pressure + ". Wind Direction: " + getDirection(w.wind.deg) + ". Wind Speed: " + w.wind.speed + " miles per hour \r\n";
// send weather to mqtt
client.publish('weather/temp', '' + w.main.temp + '');
@ -409,15 +409,16 @@ try {
// send weather to xmpp admin
xmpp.send(from, wm);
// call admin with latest weather report
/*
ami.action({
'action':'originate',
'channel':'SIP/' + asterisk_callfrom,
'context': asterisk_context,
'callerID' : asterisk_callerID,
'data': 'googletts.agi,' + wm,
'data': 'googletts.agi,' + wmc,
'application': 'agi'
});
*/
}
});
debug();