Skip to content

Commit

Permalink
Fix formatting / lint failures
Browse files Browse the repository at this point in the history
  • Loading branch information
hloeung committed Feb 24, 2024
1 parent 74ae87e commit d7a88a4
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 53 deletions.
86 changes: 44 additions & 42 deletions bridge/matrix/matrix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -68,14 +69,15 @@ 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

return true
}

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

Expand All @@ -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
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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}
}
}

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

spew.Dump(m.channels)
spew.Dump(m.users)

}
}

Expand Down Expand Up @@ -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) {
Expand All @@ -270,35 +272,35 @@ 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
},
}

m.eventChan <- 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
},
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand All @@ -487,16 +489,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 All @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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
}

Expand All @@ -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{}
}
5 changes: 3 additions & 2 deletions bridge/matrix/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions mm-go-irckit/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mm-go-irckit/server_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
8 changes: 4 additions & 4 deletions mm-go-irckit/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
}
}

Expand Down
4 changes: 2 additions & 2 deletions mm-go-irckit/userbridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit d7a88a4

Please sign in to comment.