Added /command@botname syntax to all commands

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/Command.swift

@@ -32,7 +32,9 @@ extension Command {
     }
 
     var handler: Handler {
-        CommandHandler(name: name, commands: commands, callback: { (update, context) in
+        // Add 'Command@Botname' syntax
+        let commands = self.commands + self.commands.map({ "\($0)@\(botUser.username!)" })
+        return CommandHandler(name: name, commands: commands, callback: { (update, context) in
             do {
                 // Check if the sender is a user
                 guard let userID = update.message?.from?.id else {

NotifierBot/Sources/Notifier/Commands/GetPermissionsCommand.swift

@@ -31,7 +31,7 @@ struct GetPermissionsCommand: Command {
         let username: String!
         if args.count == 0 {
             // Use the reply message
-            guard let user = update.message?.replyToMessage?.from, !user.isBot else {
+            guard let user = update.message?.replyToMessage?.from, user.username != botUser.username else {
                 try bot.sendMessage("Error: Please respond to a message of a user.", to: chatID)
                 return
             }

NotifierBot/Sources/Notifier/Commands/SetPermissionsCommand.swift

@@ -27,7 +27,7 @@ struct SetPermissionsCommand: Command {
         let username: String!
         if args.count == 1 {
             // Use the reply message
-            guard let user = update.message?.replyToMessage?.from, !user.isBot else {
+            guard let user = update.message?.replyToMessage?.from, user.username != botUser.username else {
                 try bot.sendMessage("Error: Please respond to a message of a user.", to: chatID)
                 return
             }

NotifierBot/Sources/Notifier/main.swift

@@ -48,6 +48,7 @@ let allCommands: [Command] = [
 
 var token: String!
 let bot: Bot!
+let botUser: User!
 
 do {
 
@@ -64,6 +65,11 @@ do {
         exit(1)
     }
     bot = try Bot(token: token)
+    botUser = try bot.getMe().wait()
+    guard let _ = botUser.username else {
+        print("Unable to retrieve bot username")
+        exit(1)
+    }
 
     // Create a dispatcher and start polling
     let dispatcher = Dispatcher(bot: bot)