summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQais Patankar <qaisjp@gmail.com>2020-03-15 22:43:25 +0000
committerWim <wim@42.be>2020-03-22 00:02:48 +0100
commit802c80f40c709ba4967de317e40a8d6abe57f6be (patch)
tree710dfeee382f21716653844cf21789d98e42b3ce
parenta51c5bd905bcac25609d06e20095aef1cd187dbe (diff)
downloadmatterbridge-msglm-802c80f40c709ba4967de317e40a8d6abe57f6be.tar.gz
matterbridge-msglm-802c80f40c709ba4967de317e40a8d6abe57f6be.tar.bz2
matterbridge-msglm-802c80f40c709ba4967de317e40a8d6abe57f6be.zip
Update vendor yaegashi/msgraph.go to v0.1.2 (1)
-rw-r--r--bridge/msteams/handler.go2
-rw-r--r--bridge/msteams/msteams.go2
-rw-r--r--go.mod5
-rw-r--r--go.sum8
-rw-r--r--vendor/modules.txt11
5 files changed, 20 insertions, 8 deletions
diff --git a/bridge/msteams/handler.go b/bridge/msteams/handler.go
index 394a9ac0..c8f0c468 100644
--- a/bridge/msteams/handler.go
+++ b/bridge/msteams/handler.go
@@ -9,7 +9,7 @@ import (
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
- msgraph "github.com/matterbridge/msgraph.go/beta"
+ msgraph "github.com/yaegashi/msgraph.go/beta"
)
func (b *Bmsteams) findFile(weburl string) (string, error) {
diff --git a/bridge/msteams/msteams.go b/bridge/msteams/msteams.go
index b096cb04..06964085 100644
--- a/bridge/msteams/msteams.go
+++ b/bridge/msteams/msteams.go
@@ -12,9 +12,9 @@ import (
"github.com/42wim/matterbridge/bridge/config"
// "github.com/davecgh/go-spew/spew"
- msgraph "github.com/matterbridge/msgraph.go/beta"
"github.com/matterbridge/msgraph.go/msauth"
"github.com/mattn/godown"
+ msgraph "github.com/yaegashi/msgraph.go/beta"
"golang.org/x/oauth2"
)
diff --git a/go.mod b/go.mod
index 9688dbde..63ed540d 100644
--- a/go.mod
+++ b/go.mod
@@ -51,9 +51,10 @@ require (
github.com/stretchr/testify v1.4.0
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
+ github.com/yaegashi/msgraph.go v0.1.2
github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447
golang.org/x/image v0.0.0-20191214001246-9130b4cfad52
- golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
@@ -61,6 +62,4 @@ require (
//replace github.com/bwmarrin/discordgo v0.20.2 => github.com/matterbridge/discordgo v0.18.1-0.20200109173909-ed873362fa43
-//replace github.com/yaegashi/msgraph.go => github.com/matterbridge/msgraph.go v0.0.0-20191226214848-9e5d9c08a4e1
-
go 1.13
diff --git a/go.sum b/go.sum
index 2bf88059..d7770880 100644
--- a/go.sum
+++ b/go.sum
@@ -194,6 +194,10 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rickb777/date v1.12.4 h1:+6IzcCCS/1t17DrmnEvrznyq7nM8vPwir6/UhlyohKw=
+github.com/rickb777/date v1.12.4/go.mod h1:xP0eo/I5qmUt97yRGClHZfyLZ3ikMw6v6SU5MOGZTE0=
+github.com/rickb777/plural v1.2.0 h1:5tvEc7UBCZ7l8h/2UeybSkt/uu1DQsZFOFdNevmUhlE=
+github.com/rickb777/plural v1.2.0/go.mod h1:UdpyWFCGbo3mvK3f/PfZOAOrkjzJlYN/sD46XNWJ+Es=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -251,6 +255,8 @@ github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7V
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yaegashi/msgraph.go v0.1.2 h1:83uVRQaj8YBsVqOUGj0WRwzxdgGF69jRpg5IQYaTvoY=
+github.com/yaegashi/msgraph.go v0.1.2/go.mod h1:Lp39e9oo596G5FcmMKI0cXR3mg/QikSdabgZdbMqbAM=
github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447 h1:CHgPZh8bFkZmislPrr/0gd7MciDAX+JJB70A2/5Lvmo=
github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447/go.mod h1:0MsIttMJIF/8Y7x0XjonJP7K99t3sR6bjj4m5S4JmqU=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -286,6 +292,8 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 35ced388..05336076 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -112,8 +112,6 @@ github.com/matterbridge/gozulipbot
# github.com/matterbridge/logrus-prefixed-formatter v0.0.0-20180806162718-01618749af61
github.com/matterbridge/logrus-prefixed-formatter
# github.com/matterbridge/msgraph.go v0.0.0-20200308150230-9e043fe9dbaa
-github.com/matterbridge/msgraph.go/beta
-github.com/matterbridge/msgraph.go/jsonx
github.com/matterbridge/msgraph.go/msauth
# github.com/mattermost/mattermost-server v5.5.0+incompatible
github.com/mattermost/mattermost-server/mlog
@@ -154,6 +152,10 @@ github.com/pelletier/go-toml
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
+# github.com/rickb777/date v1.12.4
+github.com/rickb777/date/period
+# github.com/rickb777/plural v1.2.0
+github.com/rickb777/plural
# github.com/rs/xid v1.2.1
github.com/rs/xid
# github.com/russross/blackfriday v1.5.2
@@ -200,6 +202,9 @@ github.com/technoweenie/multipartstreamer
github.com/valyala/bytebufferpool
# github.com/valyala/fasttemplate v1.1.0
github.com/valyala/fasttemplate
+# github.com/yaegashi/msgraph.go v0.1.2
+github.com/yaegashi/msgraph.go/beta
+github.com/yaegashi/msgraph.go/jsonx
# github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447
github.com/zfjagann/golang-ring
# go.uber.org/atomic v1.4.0
@@ -241,7 +246,7 @@ golang.org/x/net/html
golang.org/x/net/html/atom
golang.org/x/net/idna
golang.org/x/net/websocket
-# golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+# golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/oauth2
golang.org/x/oauth2/clientcredentials
golang.org/x/oauth2/internal