Removing RSS, and VFC dependencies, and code. Adding XMPP presence

This commit is contained in:
Stephen Vanderwarker 2022-01-27 20:27:43 -05:00
parent 5ec19de979
commit 530b6bdeae
Signed by: stephen
GPG Key ID: EF429EF847868C14
3 changed files with 2 additions and 57 deletions

View File

@ -27,12 +27,10 @@ mqtt_password =
mqtt_server = mqtt_server =
mqtt_topic = mqtt_topic =
mqtt_user = mqtt_user =
rss_url =
tuya_name = tuya_name =
tuya_status_url = tuya_status_url =
tuya_toggle_url = tuya_toggle_url =
user_jid = user_jid =
user_name = user_name =
vfc_url =
weather_api_key = weather_api_key =
weather_units = weather_units =

View File

@ -3,8 +3,6 @@ const ini = require('ini');
const mastodon = require('mastodon'); const mastodon = require('mastodon');
const mqtt = require('mqtt'); const mqtt = require('mqtt');
const request = require('request'); const request = require('request');
let Parser = require('rss-parser');
let parser = new Parser();
const xmpp = require('simple-xmpp'); const xmpp = require('simple-xmpp');
try { try {
@ -42,14 +40,11 @@ const mqtt_password = config.mqtt_password;
const mqtt_server = config.mqtt_server; const mqtt_server = config.mqtt_server;
const mqtt_topic = config.mqtt_topic; const mqtt_topic = config.mqtt_topic;
const mqtt_user = config.mqtt_user; const mqtt_user = config.mqtt_user;
const rpc_url = config.rpc_url;
const rss_url = config.rss_url;
const tuya_name = config.tuya_name; const tuya_name = config.tuya_name;
const tuya_status_url = config.tuya_status_url; const tuya_status_url = config.tuya_status_url;
const tuya_toggle_url = config.tuya_toggle_url; const tuya_toggle_url = config.tuya_toggle_url;
const user_jid = config.user_jid; const user_jid = config.user_jid;
const user_name = config.user_name; const user_name = config.user_name;
const vfc_url = config.vfc_url;
const weather_api_key = config.weather_api_key; const weather_api_key = config.weather_api_key;
const weather_units = config.weather_units; const weather_units = config.weather_units;
@ -160,7 +155,6 @@ xmpp.on('chat', function(from, message) {
}); });
console.log('lights status'); console.log('lights status');
} }
else if (message === tuya_name + ' on') { else if (message === tuya_name + ' on') {
request(tuya_toggle_url + "?stat=true&devname=" + tuya_name,(error, res, body) => { request(tuya_toggle_url + "?stat=true&devname=" + tuya_name,(error, res, body) => {
if (error) { if (error) {
@ -214,43 +208,6 @@ xmpp.on('chat', function(from, message) {
console.log('lights on'); console.log('lights on');
} }
// Check VFC balance
else if (message === "vfc" || message === "Vfc") {
ami.action({
'action':'originate',
'channel':'SIP/' + asterisk_callfrom,
'context': asterisk_context,
'callerID' : asterisk_callerID,
'exten' : asterisk_callto,
'priority' : '1',
});
request(vfc_url, (error, res, body) => {
if (error) {
return console.log(error)
};
if (!error && res.statusCode == 200) {
const balance = user_name + " has " + res.body + " VFC";
xmpp.send(from, balance);
console.log(balance);
}
});
console.log('vfc');
}
// Get latest RSS item from feed
else if (message === "rss" || message === "Rss") {
(async () => {
let feed = await parser.parseURL(rss_url);
// console.log(feed.title);
feed.items.forEach(item => {
console.log(item.title + ':' + item.link)
xmpp.send(from, item.title)
});
xmpp.send(from, 'See https://vanderwarker.social/@stephen for full entries.')
})();
}
// Ping a user to let them know you would like to communitcate // Ping a user to let them know you would like to communitcate
else if (message === "ping" || message === 'Ping') { else if (message === "ping" || message === 'Ping') {
xmpp.send(from, "Pinging " + user_name + "! Please stand by."); xmpp.send(from, "Pinging " + user_name + "! Please stand by.");
@ -341,16 +298,8 @@ xmpp.on('error', function(err) {
console.error(err); console.error(err);
}); });
// EXTENDING XEPS (WIP) // Set XMPP status
/* xmpp.setPresence('chat', 'Asterisk,Mastodon, and MQTT. Oh my!');
xmpp.on('chatstate', function(from, state) {
console.log(state);
});
xmpp.on('buddy', function(jid, state, statusText, resource) {
console.log(state + statusText + resource);
});
*/
// Alas, we connect to XMPP! // Alas, we connect to XMPP!
xmpp.connect({ xmpp.connect({

View File

@ -8,7 +8,6 @@
"sms", "sms",
"autoreply", "autoreply",
"asterisk", "asterisk",
"rss",
"mqtt", "mqtt",
"gotify", "gotify",
"push notifications" "push notifications"
@ -26,7 +25,6 @@
"mastodon": "1.2.2", "mastodon": "1.2.2",
"mqtt": "4.2.6", "mqtt": "4.2.6",
"request": "2.88.0", "request": "2.88.0",
"rss-parser": "3.12.0",
"simple-xmpp": "2.3.1" "simple-xmpp": "2.3.1"
}, },
"bugs": { "bugs": {