diff --git a/colors.go b/colors.go index 3ddf629..2625b13 100644 --- a/colors.go +++ b/colors.go @@ -2,10 +2,10 @@ package main import ( "fmt" - "regexp" + "regexp" ) -// TODO maybe datastructure +// TODO maybe datastructure // BASH-like PS1 variable equivalent (without colours) // TODO bold? cursive etc? func color(c int) string { @@ -18,6 +18,7 @@ func color(c int) string { return fmt.Sprintf("\033[0;%dm", 29+c) } } + // TODO maybe make the text into some datastructure which remembers the color func colorText(text string, color string, offColor string) string { return fmt.Sprintf("%s%s%s", color, text, offColor) diff --git a/main.go b/main.go index 5229fa4..5adaa97 100644 --- a/main.go +++ b/main.go @@ -143,8 +143,8 @@ func sendChat(message string) { func formatOutput(api keybase.ChatAPI) string { ret := "" msgType := api.Msg.Content.Type - switch (msgType) { - case "text", "attachment": + switch msgType { + case "text", "attachment": var c = messageHeaderColor ret = colorText(outputFormat, c, noColor) tm := time.Unix(int64(api.Msg.SentAt), 0) @@ -153,7 +153,7 @@ func formatOutput(api keybase.ChatAPI) string { msg = colorRegex(msg, `(@\w*(\.\w+)*)`, messageLinkColor, messageBodyColor) // mention URL msg = colorRegex(msg, `(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))`, messageLinkColor, messageBodyColor) - msg = colorText(colorReplaceMentionMe(msg, messageBodyColor), messageBodyColor,c) + msg = colorText(colorReplaceMentionMe(msg, messageBodyColor), messageBodyColor, c) if msgType == "attachment" { msg = fmt.Sprintf("%s\n%s", msg, colorText("[Attachment]", messageAttachmentColor, c)) } @@ -180,9 +180,9 @@ func populateList() { } else { clearView("List") - var recentPMs = fmt.Sprintf("%s---[PMs]---%s\n", channelsHeaderColor, channelsColor); + var recentPMs = fmt.Sprintf("%s---[PMs]---%s\n", channelsHeaderColor, channelsColor) var recentPMsCount = 0 - var recentChannels = fmt.Sprintf("%s---[Teams]---%s\n", channelsHeaderColor, channelsColor); + var recentChannels = fmt.Sprintf("%s---[Teams]---%s\n", channelsHeaderColor, channelsColor) var recentChannelsCount = 0 for _, s := range testVar.Result.Conversations { channels = append(channels, s.Channel) @@ -190,7 +190,7 @@ func populateList() { recentChannelsCount++ if recentChannelsCount <= ((maxY - 2) / 3) { if s.Unread { - recentChannels += fmt.Sprintf("%s*",color(0)) + recentChannels += fmt.Sprintf("%s*", color(0)) } recentChannels += fmt.Sprintf("%s\n\t#%s\n%s", s.Channel.Name, s.Channel.TopicName, channelsColor) } @@ -198,7 +198,7 @@ func populateList() { recentPMsCount++ if recentPMsCount <= ((maxY - 2) / 3) { if s.Unread { - recentChannels += fmt.Sprintf("%s*",color(0)) + recentChannels += fmt.Sprintf("%s*", color(0)) } recentPMs += fmt.Sprintf("%s\n%s", cleanChannelName(s.Channel.Name), channelsColor) } diff --git a/userConfigs.go b/userConfigs.go index d27ef61..2319247 100644 --- a/userConfigs.go +++ b/userConfigs.go @@ -1,4 +1,5 @@ package main + // Path where Downloaded files will default to var downloadPath = "/tmp/"