Merge pull request #6 from henrikno/small-improvements

Add blacklist, coloring and more

README.md

@@ -27,6 +27,11 @@ You can also set `SLACK_CHANNELS` to a comma separated list of channels to filte
 export SLACK_CHANNELS='general,random'
 ```
 
+Or you can instead blacklist some channels:
+```
+export SLACK_BLACKLIST_CHANELS='general,random'
+```
+
 If you are using a [terminal compatible with hyperlinks](https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda) URLs will be nicely formatted and clickable
 
 ```

moonsla.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/nlopes/slack"
+	"github.com/logrusorgru/aurora"
 )
 
 func getChannels(api *slack.Client) (channels map[string]string) {
@@ -21,6 +22,15 @@ func getChannels(api *slack.Client) (channels map[string]string) {
 	return channels
 }
 
+func getDMs(api *slack.Client, users map[string]string) (channels map[string]string) {
+	channels = make(map[string]string)
+	chans, _ := api.GetIMChannels()
+	for _, c := range chans {
+		channels[c.ID] = users[c.User]
+	}
+	return channels
+}
+
 func getUsers(api *slack.Client) (users map[string]string) {
 	users = make(map[string]string)
 	allUsers, _ := api.GetUsers()
@@ -30,13 +40,13 @@ func getUsers(api *slack.Client) (users map[string]string) {
 	return users
 }
 
-func getTimeStamp(ts string) (timeStamp time.Time) {
+func getTimeStamp(ts string) (timeStamp time.Time, err error) {
 	i, err := strconv.ParseInt(strings.Split(ts, ".")[0], 10, 64)
 	if err != nil {
-		panic(err)
+		return time.Unix(0, 0), err
 	}
 	timeStamp = time.Unix(i, 0)
-	return timeStamp
+	return timeStamp, nil
 }
 
 func formatMentions(msg string, users map[string]string) string {
@@ -93,8 +103,9 @@ func formatAttachments(attachments []slack.Attachment) string {
 	return strings.Join(messages, "\n")
 }
 
-func filterChannel(name string, channels map[string]string, whitelist []string) (whitelisted bool, cName string) {
+func filterChannel(name string, channels map[string]string, whitelist []string, blacklist []string) (whitelisted bool, cName string) {
 	whitelisted = false
+	var blacklisted bool = false
 
 	cName, ok := channels[name]
 	if ok {
@@ -103,6 +114,11 @@ func filterChannel(name string, channels map[string]string, whitelist []string)
 				whitelisted = true
 			}
 		}
+		for _, w := range blacklist {
+			if cName == w {
+				blacklisted = true
+			}
+		}
 	} else {
 		whitelisted = true
 		cName = name
@@ -112,7 +128,32 @@ func filterChannel(name string, channels map[string]string, whitelist []string)
 		whitelisted = true
 	}
 
-	return whitelisted, cName
+	if blacklisted {
+		return false, cName
+	} else {
+		return whitelisted, cName
+	}
+}
+
+func min_int(a int, b int) int {
+	if a < b {
+		return a
+	} else {
+		return b
+	}
+}
+
+func takeN(text []string, n int) []string {
+	return text[:min_int(n, len(text))]
+}
+
+func trim(text string) string {
+	splits := strings.Split(text, "\n")
+	splitted := takeN(splits, 3)
+	if len(splits) > 3 {
+		splitted = append(splitted, "...")
+	}
+	return strings.Join(splitted, "\n")
 }
 
 func main() {
@@ -133,22 +174,26 @@ func main() {
 	users := getUsers(api)
 	fmt.Printf("Found %v users\n", len(users))
 
+	dms := getDMs(api, users)
+	fmt.Printf("Found %v DMs\n", len(dms))
+
 	rtm := api.NewRTM()
 	go rtm.ManageConnection()
 
-	whitelist := strings.Split(os.Getenv("SLACK_CHANNELS"), ",")
+	whitelist := strings.Split(strings.TrimSpace(os.Getenv("SLACK_CHANNELS")), ",")
 	fmt.Printf("Channel whitelist: %v\n", whitelist)
 
+	blacklist := strings.Split(strings.TrimSpace(os.Getenv("SLACK_BLACKLIST_CHANNELS")), ",")
+	fmt.Printf("Channel blacklist: %v\n", blacklist)
+
 	for msg := range rtm.IncomingEvents {
 
 		switch ev := msg.Data.(type) {
 
 		case *slack.MessageEvent:
 
-			whitelisted, cName := filterChannel(ev.Channel, channels, whitelist)
-			if !whitelisted {
-				continue
-			}
+			whitelisted, cName := filterChannel(ev.Channel, channels, whitelist, blacklist)
+			var is_dm bool = false
 
 			// Map the users ID to a username if it exists
 			uName, ok := users[ev.User]
@@ -160,8 +205,17 @@ func main() {
 				uName = ev.Username
 			}
 
-			t := getTimeStamp(ev.EventTimestamp)
-			timeStamp := fmt.Sprintf("%02d:%02d:%02d", t.Hour(), t.Minute(), t.Second())
+			dmName, present := dms[ev.Channel]
+			if present {
+				cName = dmName
+				is_dm = true
+			}
+
+			t, err := getTimeStamp(ev.EventTimestamp)
+			var timeStamp string = "00:00:00"
+			if err == nil {
+				timeStamp = fmt.Sprintf("%02d:%02d:%02d", t.Hour(), t.Minute(), t.Second())
+			}
 
 			text := ev.Text
 
@@ -172,8 +226,21 @@ func main() {
 			msg := formatMentions(text, users)
 
 			msg = formatUrls(msg)
+			if !whitelisted {
+				continue
+			}
+
+			if strings.TrimSpace(msg) == "" {
+				continue
+			}
+			msg = trim(msg)
+
+			msgC := aurora.Gray(msg)
+			if is_dm {
+				msgC = aurora.Red(msg)
+			}
 
-			fmt.Printf("%v - %v - %v: %v\n", timeStamp, cName, uName, msg)
+			fmt.Printf("%v - %v - %v: %v\n", timeStamp, aurora.Green(cName), aurora.Blue(uName), msgC)
 
 		case *slack.RTMError:
 			fmt.Printf("Error: %s\n", ev.Error())