dziban303/weather-bot
1
0
Fork 0
forked from ChrisChrome/weather-bot
Code Pull requests Activity

Show product URL separately

Browse source
This commit is contained in:
Christopher Cookman 2024-05-08 06:11:41 -06:00
parent 635ece22aa
commit c814f4602a
Signed by: ChrisChrome
GPG key ID: A023A26E42C33A42
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
index.js
View file

@ -64,6 +64,14 @@ const getUniqueChannels = function () {
}); });
} }
// Get first url in a string, return object {string, url} remove the url from the string
const getFirstURL = function (string) {
const url = string.match(/(https?:\/\/[^\s]+)/g);
if (!url) return { string, url: null };
const newString = string.replace(url[0], "");
return { string: newString, url: url[0] };
}
const xmpp = client({ const xmpp = client({
@ -104,6 +112,7 @@ xmpp.on("stanza", (stanza) => {
// Get body of message // Get body of message
const body = html.decode(stanza.getChildText("body")); const body = html.decode(stanza.getChildText("body"));
const bodyData = getFirstURL(body);
// get product id from "x" tag // get product id from "x" tag
const product_id = parseProductID(stanza.getChild("x").attrs.product_id); const product_id = parseProductID(stanza.getChild("x").attrs.product_id);
// Check timestamp, if not within 3 minutes, ignore it // Check timestamp, if not within 3 minutes, ignore it
@ -116,11 +125,11 @@ xmpp.on("stanza", (stanza) => {
if(config.debug >= 1) console.log(`Sending NTFY for ${config.ntfy.prefix}${fromChannel}`) if(config.debug >= 1) console.log(`Sending NTFY for ${config.ntfy.prefix}${fromChannel}`)
ntfyBody = { ntfyBody = {
"topic": `${config.ntfy.prefix}${fromChannel}`, "topic": `${config.ntfy.prefix}${fromChannel}`,
"message": body, "message": bodyData.string,
"title": "New Alert", "title": "New Alert",
"tags": [`Timestamp: ${product_id.timestamp}`, `Station: ${product_id.station}`, `WMO: ${product_id.wmo}`, `PIL: ${product_id.pil}`, `Channel: ${fromChannel}`], "tags": [`Timestamp: ${product_id.timestamp}`, `Station: ${product_id.station}`, `WMO: ${product_id.wmo}`, `PIL: ${product_id.pil}`, `Channel: ${fromChannel}`],
"priority": 3, "priority": 3,
"actions": [{ "action": "view", "label": "Product", "url": bodyData.url }]
} }
if (stanza.getChild("x").attrs.twitter_media) { if (stanza.getChild("x").attrs.twitter_media) {
ntfyBody.attach = stanza.getChild("x").attrs.twitter_media; ntfyBody.attach = stanza.getChild("x").attrs.twitter_media;
@ -143,7 +152,7 @@ xmpp.on("stanza", (stanza) => {
// Send discord msg // Send discord msg
let embed = { let embed = {
title: "New Alert", title: "New Alert",
description: body, description: bodyData.string,
color: 0x00ff00, color: 0x00ff00,
timestamp: product_id.timestamp, timestamp: product_id.timestamp,
footer: { footer: {
@ -171,7 +180,23 @@ xmpp.on("stanza", (stanza) => {
console.log(`Deleted channel ${row.channelid} from database`) console.log(`Deleted channel ${row.channelid} from database`)
}); });
}; };
channel.send({ content: row.custommessage, embeds: [embed] }).then((msg) => { channel.send({
content: row.custommessage, embeds: [embed],
components: [
{
type: 1,
components: [
{
type: 2,
label: "Product",
style: 5,
url: bodyData.url
}
]
}
]
}
).then((msg) => {
if (msg.channel.type === Discord.ChannelType.GuildAnnouncement) msg.crosspost(); if (msg.channel.type === Discord.ChannelType.GuildAnnouncement) msg.crosspost();
}) })
}); });