hgw/mercury
hgw
/
mercury
1
Fork 0
Code Issues Pull Requests Packages Wiki Activity

Add user specific timezone settings

This commit is contained in:
hgw 2023-10-02 02:11:27 +00:00
parent d07923361a
commit 3b19c5226d
5 changed files with 75 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bot.js
View File

@ -75,7 +75,7 @@ async function help(chan, sub) {
}
async function opt(chan, user, setting, setting2, value, value2) {
if (setting == 'set' || setting == "get") {
if (setting == 'operset' || setting == "get") {
await checkUserHostmask(user)
}
openPostWorker(chan, 'options', user, setting, setting2, value, value2, hostmask)
@ -105,7 +105,7 @@ async function feed(chan, nick, provfeed, n) {
if (isValidUrl(provfeed) === true) { //URL Lookup
consoleLog('[bot.feed] Valid URL requested')
openPostWorker(chan, 'feed-preset', provfeed, n);
openPostWorker(chan, 'feed-preset', provfeed, n, nick);
} else if (predefinedFeeds.includes(predefString[0])) { //Predefined Feed lookup
consoleLog('[bot.feed] Detected predefined feed: '+predefString[0])
@ -122,7 +122,7 @@ async function feed(chan, nick, provfeed, n) {
} else if (uconfig[nick].alias !== undefined ) { //Alias Lookup
consoleLog('[bot.feed] Alias requested')
var provfeed = uconfig[nick].alias[provfeed.toUpperCase()]
openPostWorker(chan, "feed-preset", provfeed, n);
openPostWorker(chan, "feed-preset", provfeed, n, nick);
} else {
consoleLog('[bot.feed] No valid feed entered')
bot.say(chan, errorMsg+" Your chosen feed or alias is not valid")

8
commands/feed-list.js
View File

@ -90,9 +90,13 @@ async function fetchFeed(feedURL, n, nick) {
.replace(/\s{2,}/g, ' ') //idk
var body = striptags(body);
if (data.isoDate !== undefined) {
var date = moment(data.isoDate)
var date = moment(data.isoDate)
if (uconfig[nick].timezone != undefined) {
var syncDate = date.tz(uconfig[nick].timezone)
} else {
var syncDate = date.tz(config.feed.timezone)
var date = syncDate.format(config.feed.time_format)
}
var date = syncDate.format(config.feed.time_format)
} else {
var date = data.pubDate
}

13
commands/feed-predef.js
View File

@ -1,4 +1,5 @@
const config = require('../config/default.json')
const uconfig = require('../config/usersettings.json')
const { parentPort, workerData } = require('worker_threads');
const { d1, d2 } = workerData;
var provfeed = d1;
@ -89,7 +90,11 @@ async function twitter(feedURL, n) {
if (data.isoDate !== undefined) {
var date = moment(data.isoDate)
var syncDate = date.tz(config.feed.timezone)
if (uconfig[nick].timezone != undefined) {
var syncDate = date.tz(uconfig[nick].timezone)
} else {
var syncDate = date.tz(config.feed.timezone)
}
consoleLog('[feed-predef.twitter] Got tweet from '+syncDate.format())
var date = syncDate.format(config.feed.time_format)
} else {
@ -156,7 +161,11 @@ async function github(user, repo, type, n) {
if (data.isoDate !== undefined) {
var date = moment(data.isoDate)
var syncDate = date.tz(config.feed.timezone)
if (uconfig[nick].timezone != undefined) {
var syncDate = date.tz(uconfig[nick].timezone)
} else {
var syncDate = date.tz(config.feed.timezone)
}
//console.log(syncDate.format())
var date = syncDate.format(config.feed.time_format)
} else {

10
commands/feed-preset.js
View File

@ -1,8 +1,10 @@
const config = require('../config/default.json')
const uconfig = require('../config/usersettings.json')
const { parentPort, workerData } = require('worker_threads');
const { d1, d2 } = workerData;
const { d1, d2, d3 } = workerData;
var provfeed = d1;
var n = d2;
var nick = d3;
let Parser = require('rss-parser');
let parser = new Parser({
headers: {'User-Agent': config.feed.useragent},
@ -75,7 +77,11 @@ async function fetchFeed(feedURL, n) {
var body = striptags(body);
if (data.isoDate !== undefined) {
var date = moment(data.isoDate)
var syncDate = date.tz(config.feed.timezone)
if (uconfig[nick].timezone != undefined) {
var syncDate = date.tz(uconfig[nick].timezone)
} else {
var syncDate = date.tz(config.feed.timezone)
}
var date = syncDate.format(config.feed.time_format)
} else {
var date = data.pubDate

56
commands/options.js
View File

@ -15,6 +15,8 @@ let parser = new Parser({
});
const editJsonFile = require("edit-json-file");
const timer = ms => new Promise(res => setTimeout(res, ms))
const moment = require('moment-timezone');
warningMsg = ''+config.colours.brackets+'['+config.colours.warning+'WARNING'+config.colours.brackets+']'
errorMsg = ''+config.colours.brackets+'['+config.colours.error+'ERROR'+config.colours.brackets+']'
@ -132,9 +134,12 @@ async function alias(setting, value, url, nick) {
}
}
async function get(setting, hostmask) {
async function get(setting, hostmask, nick) {
if (setting == "hostmask") {
sendUpstream('Your hostmask ==> '+hostmask)
} else if (setting == "user.tz" || setting == "user.timezone" ) {
var file = editJsonFile('/home/node/app/config/usersettings.json')
sendUpstream(setting + ' ==> ' + file.get(nick+".timezone"))
} else {
consoleLog('[options.get] Getting value of '+setting)
var file = editJsonFile('/home/node/app/config/default.json')
@ -147,10 +152,34 @@ async function get(setting, hostmask) {
}
}
async function set(setting, value, value2, hostmask) {
async function set(setting, value, value2, nick) {
if (setting == 'user.tz' || setting == 'user.timezone') {
content = []
var tzarray = moment.tz.names().map(a => a.toLowerCase())
if (tzarray.includes(value.toLowerCase()) == false) {
consoleLog('[options.set.tz] Invalid timezone entered')
sendUpstream(errorMsg+' Invalid timezone entered, not changing')
}
var file = editJsonFile('/home/node/app/config/usersettings.json');
if (uconfig[nick].timezone == undefined || uconfig[nick].timezone == "" ) {
var oldvalue = "Unset"
} else {
var oldvalue = file.get(nick+".timezone")
}
consoleLog('[options.set.tz] Adding/editing the timezone for'+nick+': '+oldvalue+' ==> '+value)
file.set(nick+".timezone", value)
file.save()
content.push(setting+' ==> ' +oldvalue+' (PREVIOUS)')
content.push(setting+ ' ==> '+file.get(nick+".timezone")+' (UPDATED)')
var output = content.join("\n")
sendUpstream(output)
}
}
async function operset(setting, value, value2, hostmask) {
content = []
if (value2 == "-s" || value2 == '--spaces') {
consoleLog('[options.set] ' + value2+' called, replacing all dashes with spaces')
consoleLog('[options.operset] ' + value2+' called, replacing all dashes with spaces')
var value = value.replace(/-/g,' ')
}
var file = editJsonFile('/home/node/app/config/default.json')
@ -163,18 +192,25 @@ async function set(setting, value, value2, hostmask) {
var disallowedCheck = disallowedCheck[0]
if (config.irc.settings_auth_enable == 'true' ) {
if (hostmask != config.irc.settings_auth_hostmask) {
consoleLog('[options.set] Unauthorised user '+hostmask+' attempted to set '+setting+' to '+value)
consoleLog('[options.operset] Unauthorised user '+hostmask+' attempted to set '+setting+' to '+value)
sendUpstream(errorMsg+' You are not permitted to perform this action')
}
}
if (file.get(setting) == undefined) {
consoleLog('[options.set] '+setting+' is not a valid setting')
consoleLog('[options.operset] '+setting+' is not a valid setting')
sendUpstream(errorMsg+' '+setting+' is not a valid setting or has not been defined')
}
if (disallowedSettings.includes(disallowedCheck)) {
consoleLog('[options.set] '+hostmask+' attempted to edit disallowed setting category: '+disallowedCheck)
consoleLog('[options.operset] '+hostmask+' attempted to edit disallowed setting category: '+disallowedCheck)
sendUpstream(errorMsg+" You may not modify this setting")
}
if (setting == "feed.timezone") {
var tzarray = moment.tz.names().map(a => a.toLowerCase())
if (tzarray.includes(value.toLowerCase()) == false) {
consoleLog('[options.operset] Invalid timezone entered')
content.push(warningMsg+' Invalid timezone entered, changing anyways but output will default to Etc/UTC')
}
}
var oldvalue = file.get(setting)
file.set(setting, value);
file.save();
@ -189,11 +225,13 @@ if (setting === 'feed') {
} else if (setting === 'list') {
feed(user, setting2)
} else if (setting === 'get') {
get(setting2, hostmask);
get(setting2, hostmask, user);
} else if(setting === 'alias') {
alias(setting2, value, value2, user)
} else if(setting === 'operset') {
operset(setting2, value, value2, hostmask)
} else if(setting === 'set') {
set(setting2, value, value2, hostmask)
} else {
set(setting2, value, value2, user)
} else {
sendUpstream(errorMsg+' '+setting+' is not a valid option')
}