Channel info (#70)

feat(channel): make channel information available
target · Oct 25, 2018 · 348f7f9 · 348f7f9
1 parent 71d5f56
commit 348f7f9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 44 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,45 +1,27 @@
 {
-    "version": "2.0.0",
-    "tasks": [{
-        "label": "build-debug",
-        "type": "shell",
-        "command": "go",
-        "group": "build",
-        "presentation": {
-            "echo": true,
-            "reveal": "never",
-            "focus": false,
-            "panel": "shared"
-        },
-        "args": [
-            "build",
-            "-i",
-            "-gcflags",
-            "'-N -l'"
-        ],
-        "linux": {
-            "args": [
-                "-o",
-                "debug",
-                "${workspaceRoot}/cmd/flottbot/main.go"
-            ]
-        },
-        "osx": {
-            "args": [
-                "-o",
-                "debug",
-                "${workspaceRoot}/cmd/flottbot/main.go"
-            ]
-        },
-        "windows": {
-            "args": [
-                "-o",
-                "debug.exe",
-                "\"${workspaceRoot}\\cmd\\flottbot\\main.go\""
-            ]
-        },
-        "problemMatcher": [
-            "$go"
-        ]
-    }]
-}
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build-debug",
+      "type": "shell",
+      "command": "go",
+      "group": "build",
+      "presentation": {
+        "echo": true,
+        "reveal": "never",
+        "focus": false,
+        "panel": "shared"
+      },
+      "args": [
+        "build",
+        "-i",
+        "-gcflags",
+        "'-N -l'",
+        "-o",
+        "debug",
+        "${workspaceFolder}/cmd/flottbot/main.go"
+      ],
+      "problemMatcher": ["$go"]
+    }
+  ]
+}
diff --git a/remote/discord/helper.go b/remote/discord/helper.go
@@ -30,6 +30,9 @@ func populateMessage(message models.Message, msgType models.MessageType, channel
 	// 	message.ChannelName = name
 	// }
 
+	message.Vars["_channel.id"] = channel
+	message.Vars["_channel.name"] = channel
+
 	// Populate message user sender
 	// These will be accessible on rules via ${_user.email}, etc
 	if user != nil { // nil user implies a message from an api/bot (i.e. not an actual user)

diff --git a/remote/slack/helper.go b/remote/slack/helper.go
@@ -396,6 +396,10 @@ func populateMessage(message models.Message, msgType models.MessageType, channel
 			message.ChannelName = name
 		}
 
+		// make channel variables available
+		message.Vars["_channel.id"] = message.ChannelID
+		message.Vars["_channel.name"] = message.ChannelName // will be empty if it came via DM
+
 		// Populate message with user information (i.e. who sent the message)
 		// These will be accessible on rules via ${_user.email}, ${_user.id}, etc.
 		if user != nil { // nil user implies a message from an api/bot (i.e. not an actual user)