Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gofmt

Browse Source
This commit is contained in:
Tulir Asokan 2018-06-02 00:44:21 +03:00
parent 134604edce
commit b9079e22d2
16 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -21,13 +21,13 @@ import (
"os"
"path/filepath"
"encoding/json"
"gopkg.in/yaml.v2"
"maunium.net/go/gomatrix"
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/matrix/pushrules"
"maunium.net/go/gomuks/matrix/rooms"
"strings"
"encoding/json"
)
type AuthCache struct {

4
matrix/matrix.go
View File

@ -30,6 +30,8 @@ import (
"strings"
"time"
"crypto/tls"
"encoding/json"
"gopkg.in/russross/blackfriday.v2"
"maunium.net/go/gomatrix"
"maunium.net/go/gomuks/config"
@ -38,8 +40,6 @@ import (
"maunium.net/go/gomuks/lib/bfhtml"
"maunium.net/go/gomuks/matrix/pushrules"
"maunium.net/go/gomuks/matrix/rooms"
"crypto/tls"
"encoding/json"
)
// Container is a wrapper for a gomatrix Client and some other stuff.

6
ui/command-processor.go
View File

@ -17,11 +17,11 @@
package ui
import (
"maunium.net/go/gomuks/interface"
"strings"
"fmt"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/debug"
"fmt"
"maunium.net/go/gomuks/interface"
"strings"
)
type gomuksPointerContainer struct {

2
ui/commands.go
View File

@ -17,9 +17,9 @@
package ui
import (
"encoding/json"
"maunium.net/go/gomuks/debug"
"strings"
"encoding/json"
)
func cmdMe(cmd *Command) {

2
ui/message-view.go
View File

@ -24,13 +24,13 @@ import (
"strings"
"github.com/mattn/go-runewidth"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/lib/open"
"maunium.net/go/gomuks/ui/messages"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/gomuks/config"
"maunium.net/go/tcell"
"maunium.net/go/tview"
)

4
ui/messages/base.go
View File

@ -20,11 +20,11 @@ import (
"encoding/gob"
"time"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/tcell"
"maunium.net/go/gomuks/config"
)
func init() {
@ -44,7 +44,7 @@ type BaseMessage struct {
buffer []tstring.TString
plainBuffer []tstring.TString
prevBufferWidth int
prevPrefs config.UserPreferences
prevPrefs config.UserPreferences
}
func newBaseMessage(id, sender, displayname, msgtype string, timestamp time.Time) BaseMessage {

4
ui/messages/expandedtextmessage.go
View File

@ -20,8 +20,8 @@ import (
"encoding/gob"
"time"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/ui/messages/tstring"
)
func init() {
@ -37,7 +37,7 @@ type ExpandedTextMessage struct {
func NewExpandedTextMessage(id, sender, displayname, msgtype string, text tstring.TString, timestamp time.Time) UIMessage {
return &ExpandedTextMessage{
BaseMessage: newBaseMessage(id, sender, displayname, msgtype, timestamp),
MsgText: text,
MsgText: text,
}
}

4
ui/messages/imagemessage.go
View File

@ -24,12 +24,12 @@ import (
"image/color"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/debug"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/lib/ansimage"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/tcell"
"maunium.net/go/gomuks/config"
)
func init() {
@ -38,7 +38,7 @@ func init() {
type ImageMessage struct {
BaseMessage
Body string
Body string
Homeserver string
FileID string
data []byte

2
ui/messages/message.go
View File

@ -17,9 +17,9 @@
package messages
import (
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/config"
)
// UIMessage is a wrapper for the content and metadata of a Matrix message intended to be displayed.

4
ui/messages/parser/htmlparser.go
View File

@ -22,12 +22,12 @@ import (
"regexp"
"strings"
"golang.org/x/net/html"
"maunium.net/go/gomatrix"
"maunium.net/go/gomuks/matrix/rooms"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/tcell"
"golang.org/x/net/html"
"strconv"
)
@ -68,7 +68,7 @@ func (parser *htmlParser) getAttribute(node *html.Node, attribute string) string
}
func digits(num int) int {
return int(math.Floor(math.Log10(float64(num)))+1)
return int(math.Floor(math.Log10(float64(num))) + 1)
}
func (parser *htmlParser) listToTString(node *html.Node, stripLinebreak bool) tstring.TString {

2
ui/messages/parser/parser.go
View File

@ -147,7 +147,7 @@ func getMembershipEventContent(room *rooms.Room, evt *gomatrix.Event) (sender st
text = tstring.NewColorTString(fmt.Sprintf("%s changed their display name to %s.", prevDisplayname, displayname), tcell.ColorGreen)
color := widget.GetHashColor(*evt.StateKey)
text.Colorize(0, len(prevDisplayname), color)
text.Colorize(len(prevDisplayname) + len(" changed their display name to "), len(displayname), color)
text.Colorize(len(prevDisplayname)+len(" changed their display name to "), len(displayname), color)
}
return
}

8
ui/messages/textbase.go
View File

@ -17,19 +17,19 @@
package messages
import (
"regexp"
"maunium.net/go/gomuks/ui/messages/tstring"
"fmt"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/ui/messages/tstring"
"regexp"
)
// Regular expressions used to split lines when calculating the buffer.
//
// From tview/textview.go
var (
boundaryPattern = regexp.MustCompile(`([[:punct:]]\s*|\s+)`)
boundaryPattern = regexp.MustCompile(`([[:punct:]]\s*|\s+)`)
bareBoundaryPattern = regexp.MustCompile(`(\s+)`)
spacePattern = regexp.MustCompile(`\s+`)
spacePattern = regexp.MustCompile(`\s+`)
)
func matchBoundaryPattern(bare bool, extract tstring.TString) tstring.TString {

4
ui/messages/textmessage.go
View File

@ -21,9 +21,9 @@ import (
"fmt"
"time"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/ui/messages/tstring"
"maunium.net/go/gomuks/config"
)
func init() {
@ -40,7 +40,7 @@ type TextMessage struct {
func NewTextMessage(id, sender, displayname, msgtype, text string, timestamp time.Time) UIMessage {
return &TextMessage{
BaseMessage: newBaseMessage(id, sender, displayname, msgtype, timestamp),
MsgText: text,
MsgText: text,
}
}

2
ui/messages/tstring/string.go
View File

@ -108,7 +108,7 @@ func (str TString) TrimLeft(fn func(rune) bool) TString {
}
func (str TString) TrimRight(fn func(rune) bool) TString {
for i := len(str)-1; i >= 0; i-- {
for i := len(str) - 1; i >= 0; i-- {
if !fn(str[i].Char) {
return append(NewBlankTString(), str[:i+1]...)
}

4
ui/room-view.go
View File

@ -25,6 +25,7 @@ import (
"time"
"github.com/mattn/go-runewidth"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/interface"
"maunium.net/go/gomuks/lib/util"
"maunium.net/go/gomuks/matrix/rooms"
@ -32,7 +33,6 @@ import (
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/tcell"
"maunium.net/go/tview"
"maunium.net/go/gomuks/config"
)
type RoomView struct {
@ -154,7 +154,7 @@ func (view *RoomView) GetStatus() string {
var buf strings.Builder
if len(view.completions.list) > 0 {
if view.completions.textCache != view.input.GetText() || view.completions.time.Add(10 * time.Second).Before(time.Now()) {
if view.completions.textCache != view.input.GetText() || view.completions.time.Add(10*time.Second).Before(time.Now()) {
view.completions.list = []string{}
} else {
buf.WriteString(strings.Join(view.completions.list, ", "))

2
ui/view-main.go
View File

@ -21,6 +21,7 @@ import (
"time"
"unicode"
"bufio"
"maunium.net/go/gomatrix"
"maunium.net/go/gomuks/config"
"maunium.net/go/gomuks/debug"
@ -32,7 +33,6 @@ import (
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/tcell"
"maunium.net/go/tview"
"bufio"
"os"
)