Compare commits

..

No commits in common. "update" and "master" have entirely different histories.

5 changed files with 81 additions and 113 deletions

4
.gitignore vendored
View File

@ -132,7 +132,3 @@ dist
# config
config/config.json
# data
data/current_radar.gif
data/current_radar.jpg

View File

@ -1,6 +1,4 @@
{
"room": "",
"history": "",
"token": "",
"timezone": "",
"token": ""
}

BIN
data/current_radar.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 KiB

View File

@ -26,16 +26,13 @@ const client = new Client({
const config = JSON.parse(fs.readFileSync(path.resolve("config", "config.json")));
process.env.TZ = config.timezone;
client.once(Events.ClientReady, readyClient => {
console.log(`Ready! Logged in as ${readyClient.user.tag}`);
});
async function get_rain_image() {
try {
let radar_src = "https://weather.bangkok.go.th/Images/Radar/radarh.jpg"
const radar_image = await axios.get(radar_src, {
const radar_image = await axios.get('https://weather.bangkok.go.th/Images/Radar/radarh.jpg', {
responseType: "stream"
});
@ -61,8 +58,6 @@ const curr_image_path = path.resolve("data", "current_radar.jpg");
client.on('ready', () => {
(async () => {
const channel = client.channels.cache.get(config.room);
const webhooks = await channel.fetchWebhooks();
const webhook = webhooks.first();
let radar_image = await get_rain_image();
let radar_caption = await get_radar_caption();
@ -74,25 +69,11 @@ client.on('ready', () => {
console.log("File Saved");
console.log("Updating on boot");
let date = new Date().toLocaleString('th-TH');
let caption = `# Raindar Update\n## ${date}\n${radar_caption}\n\nLeft: Current Observation\nRight: 3 hour forecast`
let message = await channel.send({
content: caption,
files: [curr_image_path, "https://dds.bangkok.go.th/Radar/radar_rain.gif"]
content: radar_caption,
files: [curr_image_path]
});
let message_id = message.id;
console.log(`Sent ${message.id}: ${message.content}`);
await webhook.send({
content: caption,
files: [curr_image_path, "https://dds.bangkok.go.th/Radar/radar_rain.gif"],
threadId: config.history,
});
console.log(`Sent message to history`)
console.log(`Sent: ${message.content}`);
setInterval(async () => {
let curr_image_size = fs.statSync(curr_image_path).size;
@ -107,51 +88,16 @@ client.on('ready', () => {
console.log("File Saved");
let radar_image_size = radar_image[1];
console.log("Current: " + curr_image_size);
console.log("New: " + radar_image_size);
if(radar_image_size != curr_image_size) {
console.log("File change detected!");
channel.messages
.fetch(sentMessage.id)
.then((fetchedMessage) => {
console.log('Message exists');
fetchedMessage
.delete()
.then(() => console.log('Message deleted successfully'))
.catch((err) => console.log('Could not delete the message', err));
})
.catch((err) => {
if (err.httpStatus === 404) {
console.log('Message already deleted');
} else {
console.log(err);
}
});
let date = new Date().toLocaleString('th-TH');
let caption = `# Raindar Update\n## ${date}\n${radar_caption}\n\nLeft: Current Observation\nRight: 3 hour forecast`
let message = await channel.send({
content: caption,
files: [curr_image_path, "https://dds.bangkok.go.th/Radar/radar_rain.gif"]
content: radar_caption,
files: [curr_image_path]
});
console.log(`Sent ${message.id}: ${message.content}`);
message_id = message.id;
await webhook.send({
content: caption,
files: [curr_image_path, "https://dds.bangkok.go.th/Radar/radar_rain.gif"],
threadId: config.history,
});
console.log(`Sent message to history`)
console.log(`Sent: ${message.content}`);
} else {
console.log("No change in data, go on.");
}

28
test.js Normal file
View File

@ -0,0 +1,28 @@
import axios from "axios";
import { parse } from 'node-html-parser';
axios.get('https://weather.bangkok.go.th/Radar/RadarHighResolution.aspx')
.then(function(response) {
// console.log(response);
const root = parse(response.data);
//console.log(root.firstChild.structure);
// ul#list
// li
// #text
console.log(root.querySelector('#repeaDaily_lblDESCRIPTION_0').childNodes[0]._rawText);
// { tagName: 'ul',
// rawAttrs: 'id="list"',
// childNodes:
// [ { tagName: 'li',
// rawAttrs: '',
// childNodes: [Object],
// classNames: [] } ],
// id: 'list',
// classNames: [] }
//console.log(root.toString());
})
//<span id="repeaDaily_lblDESCRIPTION_0">(.*?)<\/span>