commit c8f3411c9f1eb610bf8549db768557f1a4803739
Author: Wim <wim@42.be>
Date: Mon Jun 12 20:30:30 2017 +0000
Use cache for teamid
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
index 859c94b..43446bc 100644
--- a/matterclient/matterclient.go
+++ b/matterclient/matterclient.go
@@ -2958 +2957 @@ func (m *MMClient) parseActionPost(rmsg *Message) {
// edit messsages have no team_id for some reason
if teamid == "" {
// we can find the team_id from the channelid
- result, _ := m.Client.GetChannel(data.ChannelId, "")
- teamid = result.Data.(*model.ChannelData).Channel.TeamId
+ teamid = m.GetChannelTeamId(data.ChannelId)
rmsg.Raw.Data["team_id"] = teamid
}
if teamid != "" {
@@ -3746 +37319 @@ func (m *MMClient) GetChannelId(name string, teamId string) string {
return ""
}
+func (m *MMClient) GetChannelTeamId(id string) string {
+ m.RLock()
+ defer m.RUnlock()
+ for _, t := range append(m.OtherTeams, m.Team) {
+ for _, channel := range append(*t.Channels, *t.MoreChannels...) {
+ if channel.Id == id {
+ return channel.TeamId
+ }
+ }
+ }
+ return ""
+}
+
func (m *MMClient) GetChannelHeader(channelId string) string {
m.RLock()
defer m.RUnlock()
