Fixed /fetch command to use new screenshot script syntax

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/FetchCommand.swift

@@ -32,7 +32,7 @@ struct FetchCommand: Command {
             return
         }
         // Take the screenshot
-        JFUtils.takeScreenshot(url: entry!.url, filename: "/tmp/screenshot.png", area: entry!.area)
+        JFUtils.takeScreenshot(entry: entry!, filename: "/tmp/screenshot.png")
         // Send the screenshot as file
         // Use the script, because its easier than sending the file in swift
         JFUtils.sendFile(path: "/tmp/screenshot.png", chatID: chatID)

NotifierBot/Sources/Notifier/Commands/FetchURLCommand.swift

@@ -40,7 +40,8 @@ struct FetchURLCommand: Command {
             try bot.sendMessage("Please enter a valid URL, starting with 'http://' or 'https://'", to: chatID)
             return
         }
-        JFUtils.takeScreenshot(url: url, filename: "/tmp/screenshot.png", area: area)
+        // Create a dummy entry for this url
+        JFUtils.takeScreenshot(entry: URLEntry(name: "", url: url, area: area, chatID: chatID), filename: "/tmp/screenshot.png")
         JFUtils.sendFile(path: "/tmp/screenshot.png", chatID: chatID)
     }
 }

NotifierBot/Sources/Notifier/JFUtils.swift

@@ -31,11 +31,11 @@ struct JFUtils {
         return output
     }
 
-    static func takeScreenshot(url: String, filename: String, area: Rectangle = .zero) {
-        shell("\(kScreenshotScript) \(filename) \"\(url)\"")
-        if area.width != 0 && area.height != 0 {
+    static func takeScreenshot(entry e: URLEntry, filename: String) {
+        shell("\(kScreenshotScript) \"\(e.url)\" \"\(filename)\" \"\(e.delay)\" \"\(e.captureElement)\" \"\(e.clickElement)\" \"\(e.waitElement)\"")
+        if e.area.width != 0 && e.area.height != 0 {
             // Crop the screenshot
-            shell("\(kConvertPath) \(filename) -crop \(area.width)x\(area.height)+\(area.x)+\(area.y) \(filename)")
+            shell("\(kConvertPath) \(filename) -crop \(e.area.width)x\(e.area.height)+\(e.area.x)+\(e.area.y) \(filename)")
         }
     }