Skip to content

Commit f0ab710

Browse files
42wimkolsys
42wim
authored and
kolsys
committed
Update mattermost library (#2152)
* Update mattermost library * Fix linting
1 parent 65d78e3 commit f0ab710

File tree

1,003 files changed

+89434
-114008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,003 files changed

+89434
-114008
lines changed

‎.golangci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ linters:
214214
- exhaustive
215215
- testifylint
216216
- mnd
217+
- depguard
217218
# rules to deal with reported isues
218219
issues:
219220
# List of regexps of issue texts to exclude, empty list by default.

‎bridge/mattermost/handlers.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package bmattermost
22

33
import (
4+
"context"
5+
46
"github.com/42wim/matterbridge/bridge/config"
57
"github.com/42wim/matterbridge/bridge/helper"
68
"github.com/matterbridge/matterclient"
7-
"github.com/mattermost/mattermost-server/v6/model"
9+
"github.com/mattermost/mattermost/server/public/model"
810
)
911

1012
// handleDownloadAvatar downloads the avatar of userid from channel
@@ -25,7 +27,7 @@ func (b *Bmattermost) handleDownloadAvatar(userid string, channel string) {
2527
data []byte
2628
err error
2729
)
28-
data, _, err = b.mc.Client.GetProfileImage(userid, "")
30+
data, _, err = b.mc.Client.GetProfileImage(context.TODO(), userid, "")
2931
if err != nil {
3032
b.Log.Errorf("ProfileImage download failed for %#v %s", userid, err)
3133
return
@@ -43,16 +45,16 @@ func (b *Bmattermost) handleDownloadAvatar(userid string, channel string) {
4345

4446
//nolint:wrapcheck
4547
func (b *Bmattermost) handleDownloadFile(rmsg *config.Message, id string) error {
46-
url, _, _ := b.mc.Client.GetFileLink(id)
47-
finfo, _, err := b.mc.Client.GetFileInfo(id)
48+
url, _, _ := b.mc.Client.GetFileLink(context.TODO(), id)
49+
finfo, _, err := b.mc.Client.GetFileInfo(context.TODO(), id)
4850
if err != nil {
4951
return err
5052
}
5153
err = helper.HandleDownloadSize(b.Log, rmsg, finfo.Name, finfo.Size, b.General)
5254
if err != nil {
5355
return err
5456
}
55-
data, _, err := b.mc.Client.DownloadFile(id, true)
57+
data, _, err := b.mc.Client.DownloadFile(context.TODO(), id, true)
5658
if err != nil {
5759
return err
5860
}

‎bridge/mattermost/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/42wim/matterbridge/bridge/helper"
99
"github.com/42wim/matterbridge/matterhook"
1010
"github.com/matterbridge/matterclient"
11-
"github.com/mattermost/mattermost-server/v6/model"
11+
"github.com/mattermost/mattermost/server/public/model"
1212
)
1313

1414
func (b *Bmattermost) doConnectWebhookBind() error {

‎bridge/mattermost/mattermost.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package bmattermost
22

33
import (
4+
"context"
45
"errors"
56
"fmt"
67
"strings"
@@ -157,7 +158,7 @@ func (b *Bmattermost) Send(msg config.Message) (string, error) {
157158

158159
// we only can reply to the root of the thread, not to a specific ID (like discord for example does)
159160
if msg.ParentID != "" {
160-
post, _, err := b.mc.Client.GetPost(msg.ParentID, "")
161+
post, _, err := b.mc.Client.GetPost(context.TODO(), msg.ParentID, "")
161162
if err != nil {
162163
b.Log.Errorf("getting post %s failed: %s", msg.ParentID, err)
163164
}

‎go.mod

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/google/gops v0.3.27
1515
github.com/gorilla/schema v1.3.0
1616
github.com/harmony-development/shibshib v0.0.0-20220101224523-c98059d09cfa
17-
github.com/hashicorp/golang-lru v0.6.0
17+
github.com/hashicorp/golang-lru v1.0.2
1818
github.com/jpillora/backoff v1.0.0
1919
github.com/keybase/go-keybase-chat-bot v0.0.0-20221220212439-e48d9abd2c20
2020
github.com/kyokomi/emoji/v2 v2.2.13
@@ -25,9 +25,9 @@ require (
2525
github.com/matterbridge/gomatrix v0.0.0-20220411225302-271e5088ea27
2626
github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
2727
github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
28-
github.com/matterbridge/matterclient v0.0.0-20230329213635-bc6e42a4a84a
28+
github.com/matterbridge/matterclient v0.0.0-20240523235056-57f299489168
2929
github.com/matterbridge/telegram-bot-api/v6 v6.5.0
30-
github.com/mattermost/mattermost-server/v6 v6.7.2
30+
github.com/mattermost/mattermost/server/public v0.1.3
3131
github.com/mattn/godown v0.0.1
3232
github.com/mdp/qrterminal v1.0.1
3333
github.com/mitchellh/mapstructure v1.5.0
@@ -62,51 +62,50 @@ require (
6262
github.com/Jeffail/gabs v1.4.0 // indirect
6363
github.com/apex/log v1.9.0 // indirect
6464
github.com/av-elier/go-decimal-to-rational v0.0.0-20191127152832-89e6aad02ecf // indirect
65-
github.com/blang/semver v3.5.1+incompatible // indirect
65+
github.com/blang/semver/v4 v4.0.0 // indirect
6666
github.com/dustin/go-humanize v1.0.1 // indirect
67-
github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 // indirect
67+
github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a // indirect
68+
github.com/fatih/color v1.16.0 // indirect
6869
github.com/francoispqt/gojay v1.2.13 // indirect
69-
github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
70+
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
7071
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
7172
github.com/golang/protobuf v1.5.4 // indirect
7273
github.com/google/uuid v1.6.0 // indirect
7374
github.com/gopackage/ddp v0.0.3 // indirect
74-
github.com/gorilla/websocket v1.5.0 // indirect
75-
github.com/graph-gophers/graphql-go v1.3.0 // indirect
75+
github.com/gorilla/websocket v1.5.1 // indirect
76+
github.com/hashicorp/errwrap v1.1.0 // indirect
77+
github.com/hashicorp/go-hclog v1.6.2 // indirect
78+
github.com/hashicorp/go-multierror v1.1.1 // indirect
79+
github.com/hashicorp/go-plugin v1.6.0 // indirect
7680
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
7781
github.com/hashicorp/hcl v1.0.0 // indirect
78-
github.com/json-iterator/go v1.1.12 // indirect
82+
github.com/hashicorp/yamux v0.1.1 // indirect
7983
github.com/kettek/apng v0.0.0-20191108220231-414630eed80f // indirect
80-
github.com/klauspost/compress v1.17.0 // indirect
81-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
84+
github.com/klauspost/compress v1.17.7 // indirect
8285
github.com/labstack/gommon v0.4.2 // indirect
8386
github.com/magiconair/properties v1.8.7 // indirect
8487
github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect
85-
github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d // indirect
86-
github.com/mattermost/logr/v2 v2.0.15 // indirect
88+
github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956 // indirect
89+
github.com/mattermost/logr/v2 v2.0.21 // indirect
8790
github.com/mattn/go-colorable v0.1.13 // indirect
8891
github.com/mattn/go-isatty v0.0.20 // indirect
89-
github.com/mattn/go-runewidth v0.0.13 // indirect
92+
github.com/mattn/go-runewidth v0.0.15 // indirect
9093
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
91-
github.com/minio/md5-simd v1.1.2 // indirect
92-
github.com/minio/minio-go/v7 v7.0.24 // indirect
93-
github.com/minio/sha256-simd v1.0.0 // indirect
94-
github.com/mitchellh/go-homedir v1.1.0 // indirect
95-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
96-
github.com/modern-go/reflect2 v1.0.2 // indirect
94+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
9795
github.com/monaco-io/request v1.0.5 // indirect
9896
github.com/ncruces/go-strftime v0.1.9 // indirect
99-
github.com/opentracing/opentracing-go v1.2.0 // indirect
97+
github.com/nxadm/tail v1.4.11 // indirect
98+
github.com/oklog/run v1.1.0 // indirect
10099
github.com/pborman/uuid v1.2.1 // indirect
101100
github.com/pelletier/go-toml v1.9.5 // indirect
102-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
103-
github.com/philhofer/fwd v1.1.1 // indirect
101+
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
102+
github.com/philhofer/fwd v1.1.2 // indirect
104103
github.com/pkg/errors v0.9.1 // indirect
105104
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
106105
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
107106
github.com/rickb777/date v1.12.4 // indirect
108107
github.com/rickb777/plural v1.2.0 // indirect
109-
github.com/rivo/uniseg v0.2.0 // indirect
108+
github.com/rivo/uniseg v0.4.7 // indirect
110109
github.com/rs/zerolog v1.32.0 // indirect
111110
github.com/sagikazarmark/locafero v0.4.0 // indirect
112111
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -118,25 +117,26 @@ require (
118117
github.com/spf13/cast v1.6.0 // indirect
119118
github.com/spf13/pflag v1.0.5 // indirect
120119
github.com/subosito/gotenv v1.6.0 // indirect
121-
github.com/tinylib/msgp v1.1.6 // indirect
120+
github.com/tinylib/msgp v1.1.9 // indirect
122121
github.com/valyala/bytebufferpool v1.0.0 // indirect
123122
github.com/valyala/fasttemplate v1.2.2 // indirect
124-
github.com/vmihailenco/msgpack/v5 v5.4.0 // indirect
123+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
125124
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
126-
github.com/wiggin77/merror v1.0.3 // indirect
125+
github.com/wiggin77/merror v1.0.5 // indirect
127126
github.com/wiggin77/srslog v1.0.1 // indirect
128127
go.mau.fi/libsignal v0.1.0 // indirect
129128
go.mau.fi/util v0.4.1 // indirect
130-
go.uber.org/atomic v1.9.0 // indirect
131-
go.uber.org/multierr v1.9.0 // indirect
129+
go.uber.org/multierr v1.11.0 // indirect
132130
golang.org/x/crypto v0.23.0 // indirect
133131
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
134132
golang.org/x/net v0.25.0 // indirect
135133
golang.org/x/sys v0.20.0 // indirect
136134
golang.org/x/term v0.20.0 // indirect
137135
golang.org/x/time v0.5.0 // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
137+
google.golang.org/grpc v1.62.0 // indirect
138138
gopkg.in/ini.v1 v1.67.0 // indirect
139-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
139+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
140140
gopkg.in/yaml.v2 v2.4.0 // indirect
141141
gopkg.in/yaml.v3 v3.0.1 // indirect
142142
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect

0 commit comments

Comments
 (0)