Skip to content

Commit a0d03d0

Browse files
hloeunghloeung
committed
Fix formatting / lint failures
1 parent 74ae87e commit a0d03d0

File tree

6 files changed

+52
-49
lines changed

6 files changed

+52
-49
lines changed

‎bridge/matrix/matrix.go

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,27 @@ import (
88
"sync"
99
"time"
1010

11+
"maunium.net/go/mautrix"
12+
"maunium.net/go/mautrix/event"
13+
"maunium.net/go/mautrix/id"
14+
1115
"github.com/42wim/matterbridge/bridge/helper"
1216
"github.com/42wim/matterircd/bridge"
1317
"github.com/davecgh/go-spew/spew"
1418
"github.com/spf13/viper"
15-
"maunium.net/go/mautrix"
16-
"maunium.net/go/mautrix/event"
17-
"maunium.net/go/mautrix/id"
1819
)
1920

2021
type Matrix struct {
2122
mc *mautrix.Client
2223
credentials bridge.Credentials
23-
quitChan []chan struct{}
24-
eventChan chan *bridge.Event
25-
v *viper.Viper
26-
connected bool
27-
firstSync bool
28-
dmChannels map[id.RoomID][]id.UserID
29-
channels map[id.RoomID]*Channel
30-
users map[id.UserID]*User
24+
// quitChan []chan struct{}
25+
eventChan chan *bridge.Event
26+
v *viper.Viper
27+
connected bool
28+
firstSync bool
29+
dmChannels map[id.RoomID][]id.UserID
30+
channels map[id.RoomID]*Channel
31+
users map[id.UserID]*User
3132
sync.RWMutex
3233
}
3334

@@ -68,14 +69,15 @@ func New(v *viper.Viper, cred bridge.Credentials, eventChan chan *bridge.Event,
6869
}
6970

7071
func (m *Matrix) syncCallback(resp *mautrix.RespSync, since string) bool {
71-
//spew.Dump(resp)
72+
// spew.Dump(resp)
7273
fmt.Println("synccallback", len(resp.AccountData.Events), resp.NextBatch)
7374

7475
m.firstSync = true
7576

7677
return true
7778
}
7879

80+
//nolint:funlen,forcetypeassert
7981
func (m *Matrix) handleMatrix(onConnect func()) {
8082
syncer := m.mc.Syncer.(*mautrix.DefaultSyncer)
8183

@@ -87,7 +89,7 @@ func (m *Matrix) handleMatrix(onConnect func()) {
8789
syncer.OnEventType(event.StateMember, m.handleMember)
8890
syncer.OnEventType(event.StateCreate, m.handleCreate)
8991
syncer.OnEventType(event.StateRoomName, m.handleRoomName)
90-
//syncer.OnEventType(event.AccountDataDirectChats, m.handleDM)
92+
// syncer.OnEventType(event.AccountDataDirectChats, m.handleDM)
9193
syncer.OnEventType(event.StateCanonicalAlias, m.handleCanonicalAlias)
9294
syncer.OnEvent(func(source mautrix.EventSource, evt *event.Event) {
9395
// sync is almost complete
@@ -147,6 +149,7 @@ func (m *Matrix) handleMatrix(onConnect func()) {
147149
go onConnect()
148150
}
149151

152+
//nolint:unparam
150153
func (m *Matrix) handleDM(source mautrix.EventSource, ev *event.Event) {
151154
m.Lock()
152155

@@ -176,7 +179,7 @@ func (m *Matrix) handleDM(source mautrix.EventSource, ev *event.Event) {
176179
}
177180

178181
m.channels[roomID].Unlock()
179-
//m.dmChannels[room] = []id.UserID{u}
182+
// m.dmChannels[room] = []id.UserID{u}
180183
}
181184
}
182185

@@ -211,7 +214,6 @@ func (m *Matrix) handleMember(source mautrix.EventSource, ev *event.Event) {
211214

212215
spew.Dump(m.channels)
213216
spew.Dump(m.users)
214-
215217
}
216218
}
217219

@@ -253,7 +255,7 @@ func (m *Matrix) handleCanonicalAlias(source mautrix.EventSource, ev *event.Even
253255
m.channels[ev.RoomID].AltAliases = ev.Content.AsCanonicalAlias().AltAliases
254256
m.channels[ev.RoomID].Unlock()
255257

256-
//m.mc.JoinedMembers(ev.RoomID)
258+
// m.mc.JoinedMembers(ev.RoomID)
257259
}
258260

259261
func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
@@ -270,35 +272,35 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
270272
m.RUnlock()
271273

272274
if ok {
273-
event := &bridge.Event{
275+
event := &bridge.Event{ //nolint:gocritic
274276
Type: "direct_message",
275277
Data: &bridge.DirectMessageEvent{
276278
Text: text,
277279
ChannelID: ev.RoomID.String(),
278280
Sender: ghost,
279281
Receiver: m.GetMe(),
280-
//Files: m.getFilesFromData(data),
282+
// Files: m.getFilesFromData(data),
281283
MessageID: string(ev.ID),
282-
//Event: rmsg.Event,
283-
//ParentID: mxEvent
284+
// Event: rmsg.Event,
285+
// ParentID: mxEvent
284286
},
285287
}
286288

287289
m.eventChan <- event
288290
return
289291
}
290292

291-
event := &bridge.Event{
293+
event := &bridge.Event{ //nolint:gocritic
292294
Type: "channel_message",
293295
Data: &bridge.ChannelMessageEvent{
294296
Text: text,
295297
ChannelID: ev.RoomID.String(),
296298
Sender: ghost,
297299
ChannelType: "P",
298-
//Files: m.getFilesFromData(data),
300+
// Files: m.getFilesFromData(data),
299301
MessageID: string(ev.ID),
300-
//Event: rmsg.Event,
301-
//ParentID: mxEvent
302+
// Event: rmsg.Event,
303+
// ParentID: mxEvent
302304
},
303305
}
304306

@@ -374,7 +376,7 @@ func (m *Matrix) MsgUserThread(userID, parentID, text string) (string, error) {
374376
fmt.Println("msguserthread sending message: error,resp", err, resp)
375377

376378
m.Lock()
377-
m.dmChannels[id.RoomID(resp.RoomID)] = invites
379+
m.dmChannels[resp.RoomID] = invites
378380
m.Unlock()
379381

380382
roomID = resp.RoomID
@@ -432,7 +434,7 @@ func (m *Matrix) SetTopic(channelID, text string) error {
432434

433435
func (m *Matrix) StatusUser(userID string) (string, error) {
434436
return "", nil
435-
//return m.mc.GetStatus(userID), nil
437+
// return m.mc.GetStatus(userID), nil
436438
}
437439

438440
func (m *Matrix) StatusUsers() (map[string]string, error) {
@@ -473,7 +475,7 @@ func (m *Matrix) SetStatus(status string) error {
473475

474476
func (m *Matrix) Nick(name string) error {
475477
return nil
476-
//return m.mc.UpdateUserNick(name)
478+
// return m.mc.UpdateUserNick(name)
477479
}
478480

479481
func (m *Matrix) GetChannelName(channelID string) string {
@@ -487,16 +489,15 @@ func (m *Matrix) GetChannelName(channelID string) string {
487489
}
488490

489491
func (m *Matrix) GetChannelUsers(channelID string) ([]*bridge.UserInfo, error) {
490-
491-
//return m.channels[id.RoomID(channelID)].Members
492+
// return m.channels[id.RoomID(channelID)].Members
492493
var users []*bridge.UserInfo
493494

494495
resp, err := m.mc.JoinedMembers(id.RoomID(channelID))
495496
if err != nil {
496497
return nil, err
497498
}
498499

499-
//fmt.Println("getchannelusers", channelID, len(resp.Joined))
500+
// fmt.Println("getchannelusers", channelID, len(resp.Joined))
500501

501502
for user := range resp.Joined {
502503
users = append(users, m.createUser(user))
@@ -514,7 +515,7 @@ func (m *Matrix) GetUsers() []*bridge.UserInfo {
514515

515516
m.RLock()
516517
for userID := range m.users {
517-
users = append(users, m.createUser(id.UserID(userID)))
518+
users = append(users, m.createUser(userID))
518519
}
519520

520521
m.RUnlock()
@@ -616,19 +617,20 @@ func (m *Matrix) createUser(userID id.UserID) *bridge.UserInfo {
616617
User: userID.String(),
617618
Real: displayName,
618619
Host: host,
619-
//Roles: mmuser.Roles,
620+
// Roles: mmuser.Roles,
620621
Ghost: true,
621622
Me: me,
622-
//TeamID: teamID,
623+
// TeamID: teamID,
623624
Username: nick,
624-
//FirstName: mmuser.FirstName,
625-
//LastName: mmuser.LastName,
626-
//MentionKeys: strings.Split(mentionkeys, ","),
625+
// FirstName: mmuser.FirstName,
626+
// LastName: mmuser.LastName,
627+
// MentionKeys: strings.Split(mentionkeys, ","),
627628
}
628629

629630
return info
630631
}
631632

633+
//nolint:unused
632634
func isValidNick(s string) bool {
633635
/* IRC RFC ([0] - see below) mentions a limit of 9 chars for
634636
* IRC nicks, but modern clients allow more than that. Let's
@@ -668,6 +670,8 @@ func isValidNick(s string) bool {
668670
// maybeShorten returns a prefix of msg that is approximately newLen
669671
// characters long, followed by "...". Words that start with uncounted
670672
// are included in the result but are not reckoned against newLen.
673+
//
674+
//nolint:unused
671675
func maybeShorten(msg string, newLen int, uncounted string, unicode bool) string {
672676
if newLen == 0 || len(msg) < newLen {
673677
return msg
@@ -723,8 +727,6 @@ func (m *Matrix) GetPostsSince(channelID string, since int64) interface{} {
723727
}
724728

725729
func (m *Matrix) UpdateLastViewed(channelID string) {
726-
return
727-
728730
}
729731

730732
func (m *Matrix) UpdateLastViewedUser(userID string) error {

‎bridge/matrix/sync.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/davecgh/go-spew/spew"
87
"maunium.net/go/mautrix"
98
"maunium.net/go/mautrix/event"
109
"maunium.net/go/mautrix/id"
10+
11+
"github.com/davecgh/go-spew/spew"
1112
)
1213

1314
type Syncer struct {
@@ -28,7 +29,7 @@ func (s *Syncer) ProcessResponse(resp *mautrix.RespSync, since string) error {
2829
append(sync.State.Events, sync.Timeline.Events...),
2930
sync.Ephemeral.Events...),
3031
sync.AccountData.Events...) {
31-
ev.Content.ParseRaw(ev.Type)
32+
ev.Content.ParseRaw(ev.Type) //nolint:errcheck
3233
ev.RoomID = room
3334
spew.Dump(ev)
3435

‎mm-go-irckit/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ outerloop:
447447
case irc.PASS:
448448
u.Pass = msg.Params
449449
case irc.JOIN:
450-
s.EncodeMessage(u, irc.ERR_NOTREGISTERED, []string{"*"}, "Please register first")
450+
s.EncodeMessage(u, irc.ERR_NOTREGISTERED, []string{"*"}, "Please register first") //nolint:errcheck
451451
// https://ircv3.net/specs/extensions/capability-negotiation.html
452452
case irc.CAP:
453453
subcommand := msg.Params[0]
@@ -475,7 +475,7 @@ outerloop:
475475

476476
ok := s.add(u)
477477
if !ok {
478-
s.EncodeMessage(u, irc.ERR_NICKNAMEINUSE, []string{u.Nick}, "Nickname is already in use")
478+
s.EncodeMessage(u, irc.ERR_NICKNAMEINUSE, []string{u.Nick}, "Nickname is already in use") //nolint:errcheck
479479
continue
480480
}
481481
s.u = u

‎mm-go-irckit/server_commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ func CmdPrivMsg(s Server, u *User, msg *irc.Message) error {
392392

393393
msgID, err2 := u.br.MsgChannel(ch.ID(), msg.Trailing)
394394
if err2 != nil {
395-
u.MsgSpoofUser(u, u.br.Protocol(), "msg: "+msg.Trailing+" could not be sent "+err2.Error())
395+
u.MsgSpoofUser(u, u.br.Protocol(), "msg: "+msg.Trailing+" could not be sent "+err2.Error()) //nolint:goconst
396396
return err2
397397
}
398398

‎mm-go-irckit/service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func login(u *User, toUser *User, args []string, service string) {
4040
return
4141
}
4242

43-
if service == "matrix" {
43+
if service == "matrix" { //nolint:nestif
4444
var err error
4545

4646
if len(args) != 1 && len(args) != 3 {
@@ -84,7 +84,7 @@ func login(u *User, toUser *User, args []string, service string) {
8484

8585
u.MsgUser(toUser, "login OK")
8686
if u.Credentials.Token != "" {
87-
u.MsgUser(toUser, "token used: "+u.Credentials.Token)
87+
u.MsgUser(toUser, "token used: "+u.Credentials.Token) //nolint:goconst
8888
}
8989

9090
return
@@ -182,7 +182,7 @@ func login(u *User, toUser *User, args []string, service string) {
182182
datalen--
183183
}
184184

185-
if len(args) >= datalen { // nolint:nestif
185+
if len(args) >= datalen { //nolint:nestif
186186
logger.Debugf("args_len: %d", len(args))
187187
logger.Debugf("team: %s", cred.Team)
188188
logger.Debugf("server: %s", cred.Server)
@@ -299,7 +299,7 @@ func search(u *User, toUser *User, args []string, service string) {
299299

300300
if len(postlist.Posts[postlist.Order[i]].FileIds) > 0 {
301301
for _, fname := range u.br.GetFileLinks(postlist.Posts[postlist.Order[i]].FileIds) {
302-
u.MsgUser(toUser, "\x1ddownload file - "+fname+"\x1d")
302+
u.MsgUser(toUser, "\x1ddownload file - "+fname+"\x1d") //nolint:goconst
303303
}
304304
}
305305

‎mm-go-irckit/userbridge.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
bolt "go.etcd.io/bbolt"
1616

1717
"github.com/42wim/matterircd/bridge"
18-
"github.com/42wim/matterircd/bridge/matrix"
1918
"github.com/42wim/matterircd/bridge/mastodon"
19+
"github.com/42wim/matterircd/bridge/matrix"
2020
"github.com/42wim/matterircd/bridge/mattermost"
2121
"github.com/42wim/matterircd/bridge/slack"
2222
"github.com/alecthomas/chroma/v2/quick"
@@ -1027,7 +1027,7 @@ func (u *User) prefixContext(channelID, messageID, parentID, event string) strin
10271027
prefixChar = "↪"
10281028
}
10291029

1030-
if u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost" || u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost+post" {
1030+
if u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost" || u.v.GetString(u.br.Protocol()+".threadcontext") == "mattermost+post" { //nolint:goconst
10311031
if parentID == "" {
10321032
return fmt.Sprintf("[@@%s]", messageID)
10331033
}

0 commit comments

Comments
 (0)