lug/matterbridge
10
0
Fork 2
Code Issues 3 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gofmt bridge/mumble

Browse Source
This commit is contained in:
s3lph
2020-09-24 02:03:13 +02:00
parent db8187b7e5
commit 02b7c37df1
2 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridge/mumble/handlers.go
View File

@@ -6,12 +6,10 @@ import (
"layeh.com/gumble/gumbleutil"
)
func (b *Bmumble) handleServerConfig(event *gumble.ServerConfigEvent) {
b.serverConfigUpdate <- *event
}
func (b *Bmumble) handleTextMessage(event *gumble.TextMessageEvent) {
rmsg := config.Message{
Text: event.TextMessage.Message,
@@ -24,7 +22,6 @@ func (b *Bmumble) handleTextMessage(event *gumble.TextMessageEvent) {
b.Remote <- rmsg
}
func (b *Bmumble) handleConnect(event *gumble.ConnectEvent) {
// Set the user's "bio"/comment
if comment := b.GetString("UserComment"); comment != "" {
@@ -46,7 +43,6 @@ func (b *Bmumble) handleConnect(event *gumble.ConnectEvent) {
}
}
func (b *Bmumble) handleUserChange(event *gumble.UserChangeEvent) {
// Only care about changes to self
if event.User != event.Client.Self {
@@ -58,13 +54,11 @@ func (b *Bmumble) handleUserChange(event *gumble.UserChangeEvent) {
}
}
func (b *Bmumble) handleDisconnect(event *gumble.DisconnectEvent) {
b.connected <- *event
}
func (b *Bmumble) makeDebugHandler() (*gumbleutil.Listener) {
func (b *Bmumble) makeDebugHandler() *gumbleutil.Listener {
handler := gumbleutil.Listener{
Connect: func(e *gumble.ConnectEvent) { b.Log.Debugf("Received connect event: %+v", e) },
Disconnect: func(e *gumble.DisconnectEvent) { b.Log.Debugf("Received disconnect event: %+v", e) },

9
bridge/mumble/mumble.go
View File

@@ -12,16 +12,15 @@ import (
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
stripmd "github.com/writeas/go-strip-markdown"
"layeh.com/gumble/gumble"
"layeh.com/gumble/gumbleutil"
stripmd "github.com/writeas/go-strip-markdown"
// We need to import the 'data' package as an implicit dependency.
// See: https://godoc.org/github.com/paulrosania/go-charset/charset
_ "github.com/paulrosania/go-charset/data"
)
type Bmumble struct {
client *gumble.Client
Nick string
@@ -37,7 +36,6 @@ type Bmumble struct {
*bridge.Config
}
func New(cfg *bridge.Config) bridge.Bridger {
b := &Bmumble{}
b.Config = cfg
@@ -49,7 +47,6 @@ func New(cfg *bridge.Config) bridge.Bridger {
return b
}
func (b *Bmumble) Connect() error {
b.Log.Infof("Connecting %s", b.GetString("Server"))
host, portstr, err := net.SplitHostPort(b.GetString("Server"))
@@ -105,7 +102,6 @@ func (b *Bmumble) JoinChannel(channel config.ChannelInfo) error {
return b.doJoin(b.client, channel.Name)
}
func (b *Bmumble) Send(msg config.Message) (string, error) {
// Only process text messages
b.Log.Debugf("=> Received local message %#v", msg)
@@ -117,7 +113,6 @@ func (b *Bmumble) Send(msg config.Message) (string, error) {
return "", nil
}
func (b *Bmumble) connectLoop() {
firstConnect := true
for {
@@ -193,7 +188,6 @@ func (b *Bmumble) doJoin(client *gumble.Client, name string) error {
return nil
}
func (b *Bmumble) doSend() {
// Message sending loop that makes sure server-side
// restrictions and client-side message traits don't conflict
@@ -209,7 +203,6 @@ func (b *Bmumble) doSend() {
}
}
func (b *Bmumble) processMessage(msg *config.Message) {
b.Log.Debugf("Processing message %s", msg.Text)