Skip to content

Commit 62833e6

Browse files
committed
Fix gofumpt failures
1 parent c2f7992 commit 62833e6

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

bridge/matrix/matrix.go

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func New(v *viper.Viper, cred bridge.Credentials, eventChan chan *bridge.Event,
6868
}
6969

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

7474
m.firstSync = true
@@ -88,7 +88,7 @@ func (m *Matrix) handleMatrix(onConnect func()) {
8888
syncer.OnEventType(event.StateMember, m.handleMember)
8989
syncer.OnEventType(event.StateCreate, m.handleCreate)
9090
syncer.OnEventType(event.StateRoomName, m.handleRoomName)
91-
//syncer.OnEventType(event.AccountDataDirectChats, m.handleDM)
91+
// syncer.OnEventType(event.AccountDataDirectChats, m.handleDM)
9292
syncer.OnEventType(event.StateCanonicalAlias, m.handleCanonicalAlias)
9393
syncer.OnEvent(func(source mautrix.EventSource, evt *event.Event) {
9494
// sync is almost complete
@@ -177,7 +177,7 @@ func (m *Matrix) handleDM(source mautrix.EventSource, ev *event.Event) {
177177
}
178178

179179
m.channels[roomID].Unlock()
180-
//m.dmChannels[room] = []id.UserID{u}
180+
// m.dmChannels[room] = []id.UserID{u}
181181
}
182182
}
183183

@@ -254,7 +254,7 @@ func (m *Matrix) handleCanonicalAlias(source mautrix.EventSource, ev *event.Even
254254
m.channels[ev.RoomID].AltAliases = ev.Content.AsCanonicalAlias().AltAliases
255255
m.channels[ev.RoomID].Unlock()
256256

257-
//m.mc.JoinedMembers(ev.RoomID)
257+
// m.mc.JoinedMembers(ev.RoomID)
258258
}
259259

260260
func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
@@ -278,10 +278,10 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
278278
ChannelID: ev.RoomID.String(),
279279
Sender: ghost,
280280
Receiver: m.GetMe(),
281-
//Files: m.getFilesFromData(data),
281+
// Files: m.getFilesFromData(data),
282282
MessageID: string(ev.ID),
283-
//Event: rmsg.Event,
284-
//ParentID: mxEvent
283+
// Event: rmsg.Event,
284+
// ParentID: mxEvent
285285
},
286286
} //nolint:gocritic
287287

@@ -296,10 +296,10 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
296296
ChannelID: ev.RoomID.String(),
297297
Sender: ghost,
298298
ChannelType: "P",
299-
//Files: m.getFilesFromData(data),
299+
// Files: m.getFilesFromData(data),
300300
MessageID: string(ev.ID),
301-
//Event: rmsg.Event,
302-
//ParentID: mxEvent
301+
// Event: rmsg.Event,
302+
// ParentID: mxEvent
303303
},
304304
} //nolint:gocritic
305305

@@ -433,7 +433,7 @@ func (m *Matrix) SetTopic(channelID, text string) error {
433433

434434
func (m *Matrix) StatusUser(userID string) (string, error) {
435435
return "", nil
436-
//return m.mc.GetStatus(userID), nil
436+
// return m.mc.GetStatus(userID), nil
437437
}
438438

439439
func (m *Matrix) StatusUsers() (map[string]string, error) {
@@ -474,7 +474,7 @@ func (m *Matrix) SetStatus(status string) error {
474474

475475
func (m *Matrix) Nick(name string) error {
476476
return nil
477-
//return m.mc.UpdateUserNick(name)
477+
// return m.mc.UpdateUserNick(name)
478478
}
479479

480480
func (m *Matrix) GetChannelName(channelID string) string {
@@ -488,16 +488,15 @@ func (m *Matrix) GetChannelName(channelID string) string {
488488
}
489489

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

495494
resp, err := m.mc.JoinedMembers(id.RoomID(channelID))
496495
if err != nil {
497496
return nil, err
498497
}
499498

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

502501
for user := range resp.Joined {
503502
users = append(users, m.createUser(user))
@@ -617,14 +616,14 @@ func (m *Matrix) createUser(userID id.UserID) *bridge.UserInfo {
617616
User: userID.String(),
618617
Real: displayName,
619618
Host: host,
620-
//Roles: mmuser.Roles,
619+
// Roles: mmuser.Roles,
621620
Ghost: true,
622621
Me: me,
623-
//TeamID: teamID,
622+
// TeamID: teamID,
624623
Username: nick,
625-
//FirstName: mmuser.FirstName,
626-
//LastName: mmuser.LastName,
627-
//MentionKeys: strings.Split(mentionkeys, ","),
624+
// FirstName: mmuser.FirstName,
625+
// LastName: mmuser.LastName,
626+
// MentionKeys: strings.Split(mentionkeys, ","),
628627
}
629628

630629
return info
@@ -725,7 +724,6 @@ func (m *Matrix) GetPostsSince(channelID string, since int64) interface{} {
725724

726725
func (m *Matrix) UpdateLastViewed(channelID string) {
727726
return
728-
729727
}
730728

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

0 commit comments

Comments
 (0)