Re-enable PenaTemperatures and improve reliability

.brackets.json

@@ -1,18 +0,0 @@
-{
-	"language": {
-		"javascript": {
-			"linting.prefer": "JSHint",
-			"linting.usePreferredOnly": true
-		}
-	},
-	"jwolfe.file-tree-exclude.list": [
-        "node_modules",
-        "bower_components",
-        ".git",
-        "dist",
-        "vendor",
-	    "deploy",
-	    ".hg",
-		"build"
-    ]
-}

.gitignore

@@ -13,3 +13,4 @@ backup/
 config.js
 .swp
 .orig
+log/

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:alpine
+
+# Setup
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+
+# Copy code
+COPY app.js .
+COPY appTest.js .
+COPY logger.js .
+COPY plugins/ ./plugins/
+
+CMD [ "node", "app.js" ]

README.md

@@ -28,6 +28,13 @@ npm install
 npm run start
 ```
 
+## Docker
+
+```sh
+docker build -t kulmapaikka-ircbot .
+docker run -v $(pwd)/config.js:/app/config.js kulmapaikka-ircbot
+```
+
 ## Tekijä
 
-Jukka Lankinen <jukka.lankinen@gmail.com>
+Jukka Susivainio <jukka.susivainio@posteo.fi>

app.js

@@ -4,7 +4,7 @@ const path = require('path')
 
 // Load config
 const config = require('./config')
-const cron = require('node-cron')
+const CronJob = require('cron').CronJob
 
 // Load new plugins
 const PluginManager = require('./plugins/pluginManager.js')
@@ -118,11 +118,13 @@ client.addListener('names', function (channel, nicks) {
 
 for (let i = 0; i < config.cron.length; i++) {
   let row = config.cron[i]
-  cron.schedule(row.cron, () => {
+  logger.info('starting cron with ' + row.cron)
+  const job = new CronJob(row.cron, () => {
+    logger.info('cron triggered. Running command ' + row.command)
     if (client.conn !== null) {
       for (let c = 0; c < config.irc.channels.length; c++) {
         handleMessage('BOT', config.irc.channels[c], row.command)
       }
     }
-  })
+  }, null, true, 'Europe/Helsinki');
 }

package.json

@@ -19,14 +19,14 @@
 		"cron": "=1.7.1",
 		"file-stream-rotator": "=0.4.1",
 		"finalhandler": "=1.1.2",
-		"googleapis": "=42.0.0",
+		"googleapis": "^91.0.0",
 		"html-to-text": "=5.1.1",
 		"irc": "=0.5.2",
 		"lokijs": "=1.5.7",
-		"mkdirp": "=0.5.1",
+		"mkdirp": "=0.5.5",
 		"morgan": "=1.9.1",
 		"node-cron": "^2.0.3",
-		"node-dev": "=4.0.0",
+		"node-dev": "^7.1.0",
 		"node-uuid": "=1.4.8",
 		"promise": "=8.0.3",
 		"request": "=2.88.0",
@@ -36,6 +36,6 @@
 		"winston-daily-rotate-file": "^3.10.0"
 	},
 	"devDependencies": {
-		"nodemon": "^1.18.5"
+		"nodemon": "^2.0.15"
 	}
 }

plugins/pvm.js

@@ -25,10 +25,7 @@ class Pwm extends BasePlugin {
 
   today () {
     var today = new Date()
-    var month = today.getMonth() + 1
+    return (new Intl.DateTimeFormat('fi-FI', {day: 'numeric', month: 'numeric', timeZone: 'Europe/Helsinki'}).format(today))
-    var day = today.getDate()
-    var dateString = day + '.' + month + '.'
-    return dateString
   }
   getWeather (city, code) {
     var language = 'fi'
@@ -78,8 +75,8 @@ class Pwm extends BasePlugin {
 
           let sunriseDate = new Date(Number(weather.sys.sunrise) * 1000)
           let sunsetDate = new Date(Number(weather.sys.sunset) * 1000)
-          let sunrise = sunriseDate.getHours() + '.' + sunriseDate.getMinutes()
+          let sunrise = new Intl.DateTimeFormat('fi-FI', {hour: 'numeric', minute: 'numeric', timeZone: 'Europe/Helsinki'}).format(sunriseDate)
-          let sunset = sunsetDate.getHours() + '.' + sunsetDate.getMinutes()
+          let sunset = new Intl.DateTimeFormat('fi-FI', {hour: 'numeric', minute: 'numeric', timeZone: 'Europe/Helsinki'}).format(sunsetDate)
 
           const $ = cheerio.load(data[0])
           let names = []

plugins/weather.js

@@ -4,7 +4,7 @@ var BasePlugin = require('./base.js')
 const logger = require('../logger')
 
 class Weather extends BasePlugin {
-  constructor (config) {
+  constructor(config) {
     super(config)
     this.name = 'Weather'
 
@@ -31,19 +31,19 @@ class Weather extends BasePlugin {
     }
   }
 
-  help () {
+  help() {
     //     | Command             | Description
     return '.saa <kaupunki>        Antaa sään maapallon tärkeimmistä sijainneista'
   }
 
-  test (input) {
+  test(input) {
     if (input.match(/^\.saa(.*)/i)) {
       return true
     }
     return false
   }
 
-  getTemperature (city, code) {
+  getTemperature(city, code) {
     var language = 'fi'
 
     var urlArgs = {
@@ -57,7 +57,7 @@ class Weather extends BasePlugin {
     return promise
   }
 
-  getTemperatures (cities, code) {
+  getTemperatures(cities, code) {
     logger.info('getting temperatures ', cities, code)
     if (typeof code === 'undefined') {
       code = 'fi'
@@ -76,11 +76,13 @@ class Weather extends BasePlugin {
       'APPID': this.apikey
     }
     var url = 'http://api.openweathermap.org/data/2.5/group'
-    var promise = requestPromise(url, urlArgs)
+    var promise = requestPromise(url, urlArgs).catch(e => {
+      logger.error('Failed to retrieve openweathermap data')
+    })
 
     return promise
   }
-  getPenaTemperatures (start, stop, limit) {
+  getPenaTemperatures(start, stop, limit) {
     logger.info('getting pena', start, stop, limit)
     var urlArgs = {}
 
@@ -96,13 +98,15 @@ class Weather extends BasePlugin {
       urlArgs.stop = stop
     }
 
-    var url = 'http://masa.dy.fi/api/temperature.php'
+    var url = 'https://masa.dy.fi/api/temperature.php'
 
-    var promise = requestPromise(url, urlArgs)
+    var promise = requestPromise(url, urlArgs).catch(e => {
+      logger.error('Failed to retrieve pena temperatures data')
+    })
 
     return promise
   }
-  getTemperatureString (owmCityIds) {
+  getTemperatureString(owmCityIds) {
     let that = this
     var promise = new Promise(function (resolve, reject) {
       Promise.all([
@@ -111,26 +115,30 @@ class Weather extends BasePlugin {
       ]).then(function (results) {
         var resultString = ''
         // OWM
-        results[0].list.forEach(function (data) {
+        let weatherData = []
+        if (results[0] !== undefined) {
+          results[0].list.forEach((data) => {
             var city = data.name
             var temp = (data.main.temp - 273.15).toFixed(1)
             var code = data.weather[0].icon
 
-          resultString += '' + city + ' (' + temp + ' °C, ' + that.iconCodeToText[code] + '), '
+            weatherData.push(city + ' (' + temp + ' °C, ' + that.iconCodeToText[code] + ')')
           })
-
+        }
+        if (results[1] !== undefined) {
           if (results[1].length > 0) {
             var temp = Number(results[1][0].temp).toFixed(1)
-          resultString += 'Aura (' + temp + ' °C)'
+            weatherData.push('Aura (' + temp + ' °C)')
           }
-
+        }
+        resultString = weatherData.join(', ')
         resolve(resultString)
       }, (str) => reject(str))
     })
     return promise
   }
 
-  result (input) {
+  result(input) {
     // Different cases
     let that = this
 

plugins/youtube.js

@@ -25,8 +25,8 @@ class Youtube extends BasePlugin {
         resultString += result.title
         resultString += ', esittäjänä ' + result.channelTitle
         if (typeof result.statistics !== 'undefined') {
-          var rotten = (Number(result.statistics.likeCount) / (Number(result.statistics.likeCount) + Number(result.statistics.dislikeCount))).toFixed(2)
+          var likeCount = Number(result.statistics.likeCount)
-          resultString += ' (' + result.duration + ', ' + result.statistics.viewCount + ' katselukertaa, ' + rotten * 100 + '% tykätty, ' + result.url + ' )'
+          resultString += ' (' + result.duration + ', ' + result.statistics.viewCount + ' katselukertaa, ' + likeCount + ' 👍)'
         }
         resolve(resultString)
       }, function (err) {