commit 50e3f9dc0bd3953765419c903f20ccec697adffb
Author: Wim <wim@42.be>
Date: Thu Jun 15 01:30:05 2017 +0000
Add 3.10.0 support (mattermost)
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
index 43446bc..1466c07 100644
--- a/matterclient/matterclient.go
+++ b/matterclient/matterclient.go
@@ -3277 +3277 @@ func (m *MMClient) UpdateChannels() error {
return errors.New(err.DetailedError)
}
var mmchannels2 *model.Result
- if m.mmVersion() >= 3.8 {
+ if m.mmVersion() >= 3.08 {
mmchannels2, err = m.Client.GetMoreChannelsPage(0, 5000)
} else {
mmchannels2, err = m.Client.GetMoreChannels("")
@@ -4797 +4797 @@ func (m *MMClient) UpdateChannelHeader(channelId string, header string) {
func (m *MMClient) UpdateLastViewed(channelId string) {
m.log.Debugf("posting lastview %#v", channelId)
- if m.mmVersion() >= 3.8 {
+ if m.mmVersion() >= 3.08 {
view := model.ChannelView{ChannelId: channelId}
res, _ := m.Client.ViewChannel(view)
if res == false {
@@ -7289 +72811 @@ func (m *MMClient) initUser() error {
return errors.New(err.DetailedError)
}
t.Channels = mmchannels.Data.(*model.ChannelList)
- if m.mmVersion() >= 3.8 {
+ if m.mmVersion() >= 3.08 {
+ m.log.Debug("hier")
mmchannels, err = m.Client.GetMoreChannelsPage(0, 5000)
} else {
+ m.log.Debug("nee hier", m.mmVersion())
mmchannels, err = m.Client.GetMoreChannels("")
}
if err != nil {
@@ -7627 +76410 @@ func (m *MMClient) sendWSRequest(action string, data map[string]interface{}) err
}
func (m *MMClient) mmVersion() float64 {
- v, _ := strconv.ParseFloat(m.ServerVersion[0:3], 64)
+ v, _ := strconv.ParseFloat(string(m.ServerVersion[0:2])+"0"+string(m.ServerVersion[2]), 64)
+ if string(m.ServerVersion[4]) == "." {
+ v, _ = strconv.ParseFloat(m.ServerVersion[0:4], 64)
+ }
return v
}
@@ -7717 +7768 @@ func supportedVersion(version string) bool {
strings.HasPrefix(version, "3.6.0") ||
strings.HasPrefix(version, "3.7.0") ||
strings.HasPrefix(version, "3.8.0") ||
- strings.HasPrefix(version, "3.9.0") {
+ strings.HasPrefix(version, "3.9.0") ||
+ strings.HasPrefix(version, "3.10.0") {
return true
}
return false
