Merge pull request #15 from stickymongoose/master

Add config for Alert timer, add timestamp to alert title, add dismiss…

MMM-TelegramBot.js

@@ -19,7 +19,8 @@
 
 Module.register("MMM-TelegramBot", {
   defaults: {
-    allowedUser: []
+    allowedUser: [],
+    alertTimer: "30000"
   },
   //requiresVersion: "2.1.2", // Required version of MagicMirror
 
@@ -152,24 +153,35 @@ Module.register("MMM-TelegramBot", {
         description : this.translate("TELBOT_SHUTDOWN"),
         callback : 'TELBOT_shutdown',
       },
+      {
+        command: 'dismissalert',
+        description : this.translate("TELBOT_DISMISSALERT"),
+        callback : 'TELBOT_dismissalert',
+      },
     ]
     defaultCommands.forEach((c) => {
       Register.add(c)
     })
   },
 
   TELBOT_alert: function (command, handler) {
-    var title = handler.message.from.first_name
+    var title = moment().format("LT") + " - " + handler.message.from.first_name
     var message = handler.args
+    var alerttime = this.config.alertTimer
     var text = this.translate("TELBOT_ALERT_RESULT")
     this.sendNotification('SHOW_ALERT', {
-      timer:30000,
+      timer:alerttime,
       title:title,
       message:message
     })
     handler.reply("TEXT", text, {parse_mode:'Markdown'})
   },
 
+  TELBOT_dismissalert: function (command, handler) {
+    this.sendNotification('HIDE_ALERT')
+    handler.reply("TEXT", text, {parse_mode:'Markdown'})
+  },
+
   TELBOT_hideall: function(command, handler) {
     var text = this.translate("TELBOT_HIDEALL_RESULT")
     var lockString = this.name

translations/en.json

@@ -32,5 +32,6 @@
   "TELBOT_SHUTDOWN_RESPONSE" : "I will shutdown `MagicMirror` now.",
   "TELBOT_HIDDEN" : "hidden",
   "TELBOT_SHOWING" : "showing",
-  "TELBOT_END" : "end"
+  "TELBOT_END" : "end",
+  "TELBOT_DISMISSALERT" : "Remove Alert from Mirror"
 }