From d7a88a4327fc1814561efb8b73eae7f29ffce655 Mon Sep 17 00:00:00 2001 From: Haw Loeung Date: Sun, 18 Feb 2024 07:40:03 +1100 Subject: [PATCH] Fix formatting / lint failures --- bridge/matrix/matrix.go | 86 +++++++++++++++++---------------- bridge/matrix/sync.go | 5 +- mm-go-irckit/server.go | 4 +- mm-go-irckit/server_commands.go | 2 +- mm-go-irckit/service.go | 8 +-- mm-go-irckit/userbridge.go | 4 +- 6 files changed, 56 insertions(+), 53 deletions(-) diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 84fb0ca4..9597daa5 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -8,26 +8,27 @@ import ( "sync" "time" + "maunium.net/go/mautrix" + "maunium.net/go/mautrix/event" + "maunium.net/go/mautrix/id" + "github.com/42wim/matterbridge/bridge/helper" "github.com/42wim/matterircd/bridge" "github.com/davecgh/go-spew/spew" "github.com/spf13/viper" - "maunium.net/go/mautrix" - "maunium.net/go/mautrix/event" - "maunium.net/go/mautrix/id" ) type Matrix struct { mc *mautrix.Client credentials bridge.Credentials - quitChan []chan struct{} - eventChan chan *bridge.Event - v *viper.Viper - connected bool - firstSync bool - dmChannels map[id.RoomID][]id.UserID - channels map[id.RoomID]*Channel - users map[id.UserID]*User + // quitChan []chan struct{} + eventChan chan *bridge.Event + v *viper.Viper + connected bool + firstSync bool + dmChannels map[id.RoomID][]id.UserID + channels map[id.RoomID]*Channel + users map[id.UserID]*User sync.RWMutex } @@ -68,7 +69,7 @@ func New(v *viper.Viper, cred bridge.Credentials, eventChan chan *bridge.Event, } func (m *Matrix) syncCallback(resp *mautrix.RespSync, since string) bool { - //spew.Dump(resp) + // spew.Dump(resp) fmt.Println("synccallback", len(resp.AccountData.Events), resp.NextBatch) m.firstSync = true @@ -76,6 +77,7 @@ func (m *Matrix) syncCallback(resp *mautrix.RespSync, since string) bool { return true } +//nolint:funlen,forcetypeassert func (m *Matrix) handleMatrix(onConnect func()) { syncer := m.mc.Syncer.(*mautrix.DefaultSyncer) @@ -87,7 +89,7 @@ func (m *Matrix) handleMatrix(onConnect func()) { syncer.OnEventType(event.StateMember, m.handleMember) syncer.OnEventType(event.StateCreate, m.handleCreate) syncer.OnEventType(event.StateRoomName, m.handleRoomName) - //syncer.OnEventType(event.AccountDataDirectChats, m.handleDM) + // syncer.OnEventType(event.AccountDataDirectChats, m.handleDM) syncer.OnEventType(event.StateCanonicalAlias, m.handleCanonicalAlias) syncer.OnEvent(func(source mautrix.EventSource, evt *event.Event) { // sync is almost complete @@ -147,6 +149,7 @@ func (m *Matrix) handleMatrix(onConnect func()) { go onConnect() } +//nolint:unparam func (m *Matrix) handleDM(source mautrix.EventSource, ev *event.Event) { m.Lock() @@ -176,7 +179,7 @@ func (m *Matrix) handleDM(source mautrix.EventSource, ev *event.Event) { } m.channels[roomID].Unlock() - //m.dmChannels[room] = []id.UserID{u} + // m.dmChannels[room] = []id.UserID{u} } } @@ -211,7 +214,6 @@ func (m *Matrix) handleMember(source mautrix.EventSource, ev *event.Event) { spew.Dump(m.channels) spew.Dump(m.users) - } } @@ -253,7 +255,7 @@ func (m *Matrix) handleCanonicalAlias(source mautrix.EventSource, ev *event.Even m.channels[ev.RoomID].AltAliases = ev.Content.AsCanonicalAlias().AltAliases m.channels[ev.RoomID].Unlock() - //m.mc.JoinedMembers(ev.RoomID) + // m.mc.JoinedMembers(ev.RoomID) } func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) { @@ -270,17 +272,17 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) { m.RUnlock() if ok { - event := &bridge.Event{ + event := &bridge.Event{ //nolint:gocritic Type: "direct_message", Data: &bridge.DirectMessageEvent{ Text: text, ChannelID: ev.RoomID.String(), Sender: ghost, Receiver: m.GetMe(), - //Files: m.getFilesFromData(data), + // Files: m.getFilesFromData(data), MessageID: string(ev.ID), - //Event: rmsg.Event, - //ParentID: mxEvent + // Event: rmsg.Event, + // ParentID: mxEvent }, } @@ -288,17 +290,17 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) { return } - event := &bridge.Event{ + event := &bridge.Event{ //nolint:gocritic Type: "channel_message", Data: &bridge.ChannelMessageEvent{ Text: text, ChannelID: ev.RoomID.String(), Sender: ghost, ChannelType: "P", - //Files: m.getFilesFromData(data), + // Files: m.getFilesFromData(data), MessageID: string(ev.ID), - //Event: rmsg.Event, - //ParentID: mxEvent + // Event: rmsg.Event, + // ParentID: mxEvent }, } @@ -374,7 +376,7 @@ func (m *Matrix) MsgUserThread(userID, parentID, text string) (string, error) { fmt.Println("msguserthread sending message: error,resp", err, resp) m.Lock() - m.dmChannels[id.RoomID(resp.RoomID)] = invites + m.dmChannels[resp.RoomID] = invites m.Unlock() roomID = resp.RoomID @@ -432,7 +434,7 @@ func (m *Matrix) SetTopic(channelID, text string) error { func (m *Matrix) StatusUser(userID string) (string, error) { return "", nil - //return m.mc.GetStatus(userID), nil + // return m.mc.GetStatus(userID), nil } func (m *Matrix) StatusUsers() (map[string]string, error) { @@ -473,7 +475,7 @@ func (m *Matrix) SetStatus(status string) error { func (m *Matrix) Nick(name string) error { return nil - //return m.mc.UpdateUserNick(name) + // return m.mc.UpdateUserNick(name) } func (m *Matrix) GetChannelName(channelID string) string { @@ -487,8 +489,7 @@ func (m *Matrix) GetChannelName(channelID string) string { } func (m *Matrix) GetChannelUsers(channelID string) ([]*bridge.UserInfo, error) { - - //return m.channels[id.RoomID(channelID)].Members + // return m.channels[id.RoomID(channelID)].Members var users []*bridge.UserInfo resp, err := m.mc.JoinedMembers(id.RoomID(channelID)) @@ -496,7 +497,7 @@ func (m *Matrix) GetChannelUsers(channelID string) ([]*bridge.UserInfo, error) { return nil, err } - //fmt.Println("getchannelusers", channelID, len(resp.Joined)) + // fmt.Println("getchannelusers", channelID, len(resp.Joined)) for user := range resp.Joined { users = append(users, m.createUser(user)) @@ -514,7 +515,7 @@ func (m *Matrix) GetUsers() []*bridge.UserInfo { m.RLock() for userID := range m.users { - users = append(users, m.createUser(id.UserID(userID))) + users = append(users, m.createUser(userID)) } m.RUnlock() @@ -616,19 +617,20 @@ func (m *Matrix) createUser(userID id.UserID) *bridge.UserInfo { User: userID.String(), Real: displayName, Host: host, - //Roles: mmuser.Roles, + // Roles: mmuser.Roles, Ghost: true, Me: me, - //TeamID: teamID, + // TeamID: teamID, Username: nick, - //FirstName: mmuser.FirstName, - //LastName: mmuser.LastName, - //MentionKeys: strings.Split(mentionkeys, ","), + // FirstName: mmuser.FirstName, + // LastName: mmuser.LastName, + // MentionKeys: strings.Split(mentionkeys, ","), } return info } +//nolint:unused func isValidNick(s string) bool { /* IRC RFC ([0] - see below) mentions a limit of 9 chars for * IRC nicks, but modern clients allow more than that. Let's @@ -668,6 +670,8 @@ func isValidNick(s string) bool { // maybeShorten returns a prefix of msg that is approximately newLen // characters long, followed by "...". Words that start with uncounted // are included in the result but are not reckoned against newLen. +// +//nolint:unused func maybeShorten(msg string, newLen int, uncounted string, unicode bool) string { if newLen == 0 || len(msg) < newLen { return msg @@ -723,8 +727,6 @@ func (m *Matrix) GetPostsSince(channelID string, since int64) interface{} { } func (m *Matrix) UpdateLastViewed(channelID string) { - return - } func (m *Matrix) UpdateLastViewedUser(userID string) error { @@ -744,7 +746,7 @@ func (m *Matrix) SearchUsers(query string) ([]*bridge.UserInfo, error) { return brusers, nil } -func (s *Matrix) GetPostThread(channelID string) interface{} { +func (m *Matrix) GetPostThread(channelID string) interface{} { return nil } @@ -768,14 +770,14 @@ func (m *Matrix) Connected() bool { return m.connected } -func (s *Matrix) AddReaction(msgID, emoji string) error { +func (m *Matrix) AddReaction(msgID, emoji string) error { return nil } -func (s *Matrix) RemoveReaction(msgID, emoji string) error { +func (m *Matrix) RemoveReaction(msgID, emoji string) error { return nil } -func (s *Matrix) GetLastSentMsgs() []string { +func (m *Matrix) GetLastSentMsgs() []string { return []string{} } diff --git a/bridge/matrix/sync.go b/bridge/matrix/sync.go index ad6b897d..80eae17f 100644 --- a/bridge/matrix/sync.go +++ b/bridge/matrix/sync.go @@ -4,10 +4,11 @@ import ( "fmt" "time" - "github.com/davecgh/go-spew/spew" "maunium.net/go/mautrix" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" + + "github.com/davecgh/go-spew/spew" ) type Syncer struct { @@ -28,7 +29,7 @@ func (s *Syncer) ProcessResponse(resp *mautrix.RespSync, since string) error { append(sync.State.Events, sync.Timeline.Events...), sync.Ephemeral.Events...), sync.AccountData.Events...) { - ev.Content.ParseRaw(ev.Type) + ev.Content.ParseRaw(ev.Type) //nolint:errcheck ev.RoomID = room spew.Dump(ev) diff --git a/mm-go-irckit/server.go b/mm-go-irckit/server.go index a398ee4c..4832eca3 100644 --- a/mm-go-irckit/server.go +++ b/mm-go-irckit/server.go @@ -447,7 +447,7 @@ outerloop: case irc.PASS: u.Pass = msg.Params case irc.JOIN: - s.EncodeMessage(u, irc.ERR_NOTREGISTERED, []string{"*"}, "Please register first") + s.EncodeMessage(u, irc.ERR_NOTREGISTERED, []string{"*"}, "Please register first") //nolint:errcheck // https://ircv3.net/specs/extensions/capability-negotiation.html case irc.CAP: subcommand := msg.Params[0] @@ -475,7 +475,7 @@ outerloop: ok := s.add(u) if !ok { - s.EncodeMessage(u, irc.ERR_NICKNAMEINUSE, []string{u.Nick}, "Nickname is already in use") + s.EncodeMessage(u, irc.ERR_NICKNAMEINUSE, []string{u.Nick}, "Nickname is already in use") //nolint:errcheck continue } s.u = u diff --git a/mm-go-irckit/server_commands.go b/mm-go-irckit/server_commands.go index ff660965..a3bdde2a 100644 --- a/mm-go-irckit/server_commands.go +++ b/mm-go-irckit/server_commands.go @@ -392,7 +392,7 @@ func CmdPrivMsg(s Server, u *User, msg *irc.Message) error { msgID, err2 := u.br.MsgChannel(ch.ID(), msg.Trailing) if err2 != nil { - u.MsgSpoofUser(u, u.br.Protocol(), "msg: "+msg.Trailing+" could not be sent "+err2.Error()) + u.MsgSpoofUser(u, u.br.Protocol(), "msg: "+msg.Trailing+" could not be sent "+err2.Error()) //nolint:goconst return err2 } diff --git a/mm-go-irckit/service.go b/mm-go-irckit/service.go index 7cbf93ae..e31a51e1 100644 --- a/mm-go-irckit/service.go +++ b/mm-go-irckit/service.go @@ -40,7 +40,7 @@ func login(u *User, toUser *User, args []string, service string) { return } - if service == "matrix" { + if service == "matrix" { //nolint:nestif var err error if len(args) != 1 && len(args) != 3 { @@ -84,7 +84,7 @@ func login(u *User, toUser *User, args []string, service string) { u.MsgUser(toUser, "login OK") if u.Credentials.Token != "" { - u.MsgUser(toUser, "token used: "+u.Credentials.Token) + u.MsgUser(toUser, "token used: "+u.Credentials.Token) //nolint:goconst } return @@ -182,7 +182,7 @@ func login(u *User, toUser *User, args []string, service string) { datalen-- } - if len(args) >= datalen { // nolint:nestif + if len(args) >= datalen { //nolint:nestif logger.Debugf("args_len: %d", len(args)) logger.Debugf("team: %s", cred.Team) logger.Debugf("server: %s", cred.Server) @@ -299,7 +299,7 @@ func search(u *User, toUser *User, args []string, service string) { if len(postlist.Posts[postlist.Order[i]].FileIds) > 0 { for _, fname := range u.br.GetFileLinks(postlist.Posts[postlist.Order[i]].FileIds) { - u.MsgUser(toUser, "\x1ddownload file - "+fname+"\x1d") + u.MsgUser(toUser, "\x1ddownload file - "+fname+"\x1d") //nolint:goconst } } diff --git a/mm-go-irckit/userbridge.go b/mm-go-irckit/userbridge.go index 2711223c..52f7bc13 100644 --- a/mm-go-irckit/userbridge.go +++ b/mm-go-irckit/userbridge.go @@ -15,8 +15,8 @@ import ( bolt "go.etcd.io/bbolt" "github.com/42wim/matterircd/bridge" - "github.com/42wim/matterircd/bridge/matrix" "github.com/42wim/matterircd/bridge/mastodon" + "github.com/42wim/matterircd/bridge/matrix" "github.com/42wim/matterircd/bridge/mattermost" "github.com/42wim/matterircd/bridge/slack" "github.com/alecthomas/chroma/v2/quick" @@ -1027,7 +1027,7 @@ func (u *User) prefixContext(channelID, messageID, parentID, event string) strin prefixChar = "↪" } - if u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost" || u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost+post" { + if u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost" || u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost+post" { //nolint:goconst if parentID == "" { return fmt.Sprintf("[@@%s]", messageID) }