rudi/kbtui
1
0
Fork 0
mirror of https://github.com/Rudi9719/kbtui.git synced 2026-03-23 12:37:23 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
David Haukeness
2019-10-17 11:07:22 -06:00
parent dffff400ff fb1bb0c0fa
commit e9ac10ecbf
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -365,19 +365,18 @@ func formatOutput(api keybase.ChatAPI) string {
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)
if msgType == "attachment" {
msg = fmt.Sprintf("%s\n%s", msg, colorText("[Attachment]", messageAttachmentColor, c))
msg = fmt.Sprintf("%s", colorText("[Attachment]", messageAttachmentColor, c))
}
user := colorUsername(api.Msg.Sender.Username, c)
device := colorText(api.Msg.Sender.DeviceName, messageSenderDeviceColor, c)
msgId := colorText(fmt.Sprintf("%d", api.Msg.ID), messageIdColor, c)
ts := colorText(fmt.Sprintf("%s", tm.Format(timeFormat)), messageTimeColor, c)
msgID := colorText(fmt.Sprintf("%d", api.Msg.ID), messageIdColor, c)
ts := colorText(tm.Format(timeFormat), messageTimeColor, c)
ret = strings.Replace(ret, "$MSG", msg, 1)
ret = strings.Replace(ret, "$USER", user, 1)
ret = strings.Replace(ret, "$DEVICE", device, 1)
ret = strings.Replace(ret, "$ID", msgId, 1)
ret = strings.Replace(ret, "$ID", msgID, 1)
ret = strings.Replace(ret, "$TIME", ts, 1)
ret = strings.Replace(ret, "$DATE", fmt.Sprintf("%s", tm.Format(dateFormat)), 1)
ret = strings.Replace(ret, "$DATE", colorText(tm.Format(dateFormat), messageTimeColor, c), 1)
ret = strings.Replace(ret, "```", fmt.Sprintf("\n<code>\n"), -1)
}
return ret