summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bridge/mattermost/mattermost.go5
-rw-r--r--matterclient/matterclient.go4
2 files changed, 8 insertions, 1 deletions
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index ce506638..2a9749d2 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -31,6 +31,7 @@ type Bmattermost struct {
name string
origin string
protocol string
+ TeamId string
}
var flog *log.Entry
@@ -75,6 +76,7 @@ func (b *Bmattermost) Connect() error {
go b.mc.WsReceiver()
}
go b.handleMatter()
+ b.TeamId = b.mc.GetTeamId()
return nil
}
@@ -153,7 +155,8 @@ func (b *Bmattermost) handleMatter() {
func (b *Bmattermost) handleMatterClient(mchan chan *MMMessage) {
for message := range b.mc.MessageChan {
// do not post our own messages back to irc
- if message.Raw.Event == "posted" && b.mc.User.Username != message.Username {
+ // only listen to message from our team
+ if message.Raw.Event == "posted" && b.mc.User.Username != message.Username && message.Raw.TeamId == b.TeamId {
flog.Debugf("Receiving from matterclient %#v", message)
m := &MMMessage{}
m.Username = message.Username
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
index 1bac634e..37530480 100644
--- a/matterclient/matterclient.go
+++ b/matterclient/matterclient.go
@@ -576,6 +576,10 @@ func (m *MMClient) GetStatus(userId string) string {
return "offline"
}
+func (m *MMClient) GetTeamId() string {
+ return m.Team.Id
+}
+
func (m *MMClient) StatusLoop() {
for {
if m.WsQuit {