Skip to content

Commit

Permalink
Fix gofumpt failures
Browse files Browse the repository at this point in the history
  • Loading branch information
hloeung committed Feb 17, 2024
1 parent c2f7992 commit 62833e6
Showing 1 changed file with 19 additions and 21 deletions.
40 changes: 19 additions & 21 deletions bridge/matrix/matrix.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,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
Expand All @@ -88,7 +88,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
Expand Down Expand Up @@ -177,7 +177,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}
}
}

Expand Down Expand Up @@ -254,7 +254,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) {
Expand All @@ -278,10 +278,10 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
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
},
} //nolint:gocritic

Expand All @@ -296,10 +296,10 @@ func (m *Matrix) handleEvent(source mautrix.EventSource, ev *event.Event) {
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
},
} //nolint:gocritic

Expand Down Expand Up @@ -433,7 +433,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) {
Expand Down Expand Up @@ -474,7 +474,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 {
Expand All @@ -488,16 +488,15 @@ 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))
if err != nil {
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))
Expand Down Expand Up @@ -617,14 +616,14 @@ 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
Expand Down Expand Up @@ -725,7 +724,6 @@ func (m *Matrix) GetPostsSince(channelID string, since int64) interface{} {

func (m *Matrix) UpdateLastViewed(channelID string) {
return

}

func (m *Matrix) UpdateLastViewedUser(userID string) error {
Expand Down

0 comments on commit 62833e6

Please sign in to comment.