Updated screenshot tool path

Fixed some more markdown character escaping

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/FetchURLCommand.swift

@@ -40,9 +40,7 @@ struct FetchURLCommand: Command {
             try bot.sendMessage("Please enter a valid URL, starting with 'http://' or 'https://'", to: chatID)
             return
         }
-        DispatchQueue.main.async {
-            JFUtils.takeScreenshot(url: url, filename: "/tmp/screenshot.png", area: area)
-            JFUtils.sendFile(path: "/tmp/screenshot.png", chatID: chatID)
-        }
+        JFUtils.takeScreenshot(url: url, filename: "/tmp/screenshot.png", area: area)
+        JFUtils.sendFile(path: "/tmp/screenshot.png", chatID: chatID)
     }
 }

NotifierBot/Sources/Notifier/Commands/ListAllCommand.swift

@@ -28,7 +28,8 @@ struct ListAllCommand: Command {
         let groups = Array(Set(entries.map({ $0.chatID })))
         var list = "*Monitored Websites:*\n"
         for chatID in groups {
-            list += "*\(chatID):*\n"
+            // Escape the chat ID because it could have a minus sign in front of it
+            list += "*\(String(chatID).escaped()):*\n"
             for entry in entries.filter({ $0.chatID == chatID }) {
                 // For each entry in this group
                 list += "- \(entry.name): \(entry.url)".escaped()

NotifierBot/Sources/Notifier/JFUtils.swift

@@ -32,7 +32,7 @@ struct JFUtils {
     }
 
     static func takeScreenshot(url: String, filename: String, area: Rectangle = .zero) {
-        shell("\(kPythonPath) \(kScreenshotScript) \(filename) \"\(url)\"")
+        shell("\(kScreenshotScript) \(filename) \"\(url)\"")
         if area.width != 0 && area.height != 0 {
             // Crop the screenshot
             shell("\(kConvertPath) \(filename) -crop \(area.width)x\(area.height)+\(area.x)+\(area.y) \(filename)")

NotifierBot/Sources/Notifier/main.swift

@@ -24,7 +24,7 @@ let kURLListFile = "\(mainDirectory!)/urlwatcher/urls.list"
 // The url_watcher.sh script that actually performs the monitoring
 let kUrlwatchTool = "\(mainDirectory!)/urlwatcher/urlwatcher.sh"
 // The python screenshot script that takes the screenshot
-let kScreenshotScript = "\(mainDirectory!)/tools/screenshot.py"
+let kScreenshotScript = "\(mainDirectory!)/tools/screenshot.sh"
 // The telegram.sh script from here: https://github.com/fabianonline/telegram.sh
 let kTelegramScript = "\(mainDirectory!)/tools/telegram.sh"