From d02dd317a50a99a043a8296afc073b2aa8bac2b6 Mon Sep 17 00:00:00 2001 From: Gregory Rudolph Date: Fri, 8 Nov 2019 09:40:20 -0500 Subject: [PATCH 1/3] Delete go.mod --- go.mod | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 go.mod diff --git a/go.mod b/go.mod deleted file mode 100644 index 8be19cf..0000000 --- a/go.mod +++ /dev/null @@ -1,12 +0,0 @@ -module github.com/Rudi9719/kbtui - -go 1.12 - -require ( - github.com/awesome-gocui/gocui v0.6.0 - github.com/magefile/mage v1.9.0 - github.com/mattn/go-runewidth v0.0.5 // indirect - github.com/pelletier/go-toml v1.6.0 - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - samhofi.us/x/keybase v0.0.0-20191023034410-b00e56e8dd3c -) From 430c42748750170e310879d50ad0384bf49f49c1 Mon Sep 17 00:00:00 2001 From: Gregory Rudolph Date: Fri, 8 Nov 2019 09:40:45 -0500 Subject: [PATCH 2/3] Delete go.sum --- go.sum | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 go.sum diff --git a/go.sum b/go.sum deleted file mode 100644 index 097bc30..0000000 --- a/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/awesome-gocui/gocui v0.6.0 h1:hhDJiQC12tEsJNJ+iZBBVaSSLFYo9llFuYpQlL5JZVI= -github.com/awesome-gocui/gocui v0.6.0/go.mod h1:1QikxFaPhe2frKeKvEwZEIGia3haiOxOUXKinrv17mA= -github.com/awesome-gocui/termbox-go v0.0.0-20190427202837-c0aef3d18bcc h1:wGNpKcHU8Aadr9yOzsT3GEsFLS7HQu8HxQIomnekqf0= -github.com/awesome-gocui/termbox-go v0.0.0-20190427202837-c0aef3d18bcc/go.mod h1:tOy3o5Nf1bA17mnK4W41gD7PS3u4Cv0P0pqFcoWMy8s= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE= -github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.5 h1:jrGtp51JOKTWgvLFzfG6OtZOJcK2sEnzc/U+zw7TtbA= -github.com/mattn/go-runewidth v0.0.5/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/pelletier/go-toml v1.5.0 h1:5BakdOZdtKJ1FFk6QdL8iSGrMWsXgchNJcrnarjbmJQ= -github.com/pelletier/go-toml v1.5.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= -github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= -github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -samhofi.us/x/keybase v0.0.0-20191023034410-b00e56e8dd3c h1:qIKOKqYnRCx+O2IOz3a/lplrD0p1e3n/VoGOdrTGrVo= -samhofi.us/x/keybase v0.0.0-20191023034410-b00e56e8dd3c/go.mod h1:fcva80IUFyWcHtV4bBSzgKg07K6Rvuvi3GtGCLNGkyE= From bc7ef238deb41f80e8be25a8898ac7d2f117fce5 Mon Sep 17 00:00:00 2001 From: Casper Weiss Bang Date: Thu, 28 Nov 2019 20:24:09 +0100 Subject: [PATCH 3/3] minor formatting fixes --- main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 67f2a06..e869f2d 100644 --- a/main.go +++ b/main.go @@ -466,16 +466,18 @@ func formatMessageBody(body string) StyledString { message := config.Colors.Message.Body.stylize(body) message = colorReplaceMentionMe(message) - message = message.colorRegex(`_[^_]*_`, config.Colors.Message.Body.withItalic()) - message = message.colorRegex(`~[^~]*~`, config.Colors.Message.Body.withStrikethrough()) + // TODO when gocui actually fixes there shit with formatting, then un comment these lines + // message = message.colorRegex(`_[^_]*_`, config.Colors.Message.Body.withItalic()) + // message = message.colorRegex(`~[^~]*~`, config.Colors.Message.Body.withStrikethrough()) message = message.colorRegex(`@[\w_]*([\.#][\w_]+)*`, config.Colors.Message.LinkKeybase) // TODO change how bold, italic etc works, so it uses boldOn boldOff ([1m and [22m) message = message.colorRegex(`\*[^\*]*\*`, config.Colors.Message.Body.withBold()) - message = message.colorRegex(">.*$", config.Colors.Message.Quote) + message = message.colorRegex("^>.*$", config.Colors.Message.Quote) message = message.regexReplaceFunc("```(.*\n)*```", func(match string) string { maxWidth, _ := g.Size() output := "\n" match = strings.Replace(strings.Replace(match, "```", "", -1), "\t", " ", -1) + match = removeFormatting(match) lines := strings.Split(match, "\n") for _, line := range lines { maxLineLength := maxWidth/2 + maxWidth/3 - 2