mirror of
https://github.com/cwinfo/matterbridge.git
synced 2024-11-22 14:00:27 +00:00
Fix Nextcloud Talk connection failure (#1179)
Fix #1177 Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
parent
e1629994bd
commit
2d2bebe976
2
go.mod
2
go.mod
@ -54,7 +54,7 @@ require (
|
|||||||
github.com/zfjagann/golang-ring v0.0.0-20190304061218-d34796e0a6c2
|
github.com/zfjagann/golang-ring v0.0.0-20190304061218-d34796e0a6c2
|
||||||
golang.org/x/image v0.0.0-20200618115811-c13761719519
|
golang.org/x/image v0.0.0-20200618115811-c13761719519
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
|
||||||
gomod.garykim.dev/nc-talk v0.0.1
|
gomod.garykim.dev/nc-talk v0.0.2
|
||||||
gopkg.in/fsnotify.v1 v1.4.7 // indirect
|
gopkg.in/fsnotify.v1 v1.4.7 // indirect
|
||||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
||||||
|
2
go.sum
2
go.sum
@ -450,6 +450,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
|
|||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
gomod.garykim.dev/nc-talk v0.0.1 h1:6mgjcAf5/HMkV0CFGeXVfYHG7FAUCQcGR8eg9oM6fCc=
|
gomod.garykim.dev/nc-talk v0.0.1 h1:6mgjcAf5/HMkV0CFGeXVfYHG7FAUCQcGR8eg9oM6fCc=
|
||||||
gomod.garykim.dev/nc-talk v0.0.1/go.mod h1:0/Ksg0osAYmnWKs1OcCG+gBQ4HU1xiF1699g9B6jWZw=
|
gomod.garykim.dev/nc-talk v0.0.1/go.mod h1:0/Ksg0osAYmnWKs1OcCG+gBQ4HU1xiF1699g9B6jWZw=
|
||||||
|
gomod.garykim.dev/nc-talk v0.0.2 h1:QagJzL1Ie/sJDachAC42fEXlIh2mK8IDk1/ue0u8IcI=
|
||||||
|
gomod.garykim.dev/nc-talk v0.0.2/go.mod h1:0/Ksg0osAYmnWKs1OcCG+gBQ4HU1xiF1699g9B6jWZw=
|
||||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
||||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
||||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
||||||
|
10
vendor/gomod.garykim.dev/nc-talk/README.md
vendored
10
vendor/gomod.garykim.dev/nc-talk/README.md
vendored
@ -5,6 +5,16 @@
|
|||||||
|
|
||||||
A Go library that can be used to communicate with [Nextcloud Talk](https://github.com/nextcloud/spreed) instances.
|
A Go library that can be used to communicate with [Nextcloud Talk](https://github.com/nextcloud/spreed) instances.
|
||||||
|
|
||||||
|
### Installing
|
||||||
|
|
||||||
|
You can use this library in your Go projects by installing it with go mod:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
GO111MODULE=on go get gomod.garykim.dev/nc-talk
|
||||||
|
```
|
||||||
|
|
||||||
|
Check out the documentation for the package [here](https://pkg.go.dev/gomod.garykim.dev/nc-talk).
|
||||||
|
|
||||||
### License
|
### License
|
||||||
|
|
||||||
Copyright © 2020 Gary Kim <<gary@garykim.dev>>, All Rights Reserved
|
Copyright © 2020 Gary Kim <<gary@garykim.dev>>, All Rights Reserved
|
||||||
|
2
vendor/gomod.garykim.dev/nc-talk/gonctalk.go
vendored
2
vendor/gomod.garykim.dev/nc-talk/gonctalk.go
vendored
@ -20,6 +20,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// NewUser returns a TalkUser instance
|
// NewUser returns a TalkUser instance
|
||||||
|
// The url should be the full URL of the Nextcloud instance (e.g. https://cloud.mydomain.me)
|
||||||
func NewUser(url string, username string, password string) *user.TalkUser {
|
func NewUser(url string, username string, password string) *user.TalkUser {
|
||||||
return &user.TalkUser{
|
return &user.TalkUser{
|
||||||
NextcloudURL: url,
|
NextcloudURL: url,
|
||||||
@ -29,6 +30,7 @@ func NewUser(url string, username string, password string) *user.TalkUser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewRoom returns a new TalkRoom instance
|
// NewRoom returns a new TalkRoom instance
|
||||||
|
// Token should be the Nextcloud Room Token (e.g. "d6zoa2zs" if the room URL is https://cloud.mydomain.me/call/d6zoa2zs)
|
||||||
func NewRoom(tuser *user.TalkUser, token string) *room.TalkRoom {
|
func NewRoom(tuser *user.TalkUser, token string) *room.TalkRoom {
|
||||||
tr := &room.TalkRoom{
|
tr := &room.TalkRoom{
|
||||||
User: tuser,
|
User: tuser,
|
||||||
|
42
vendor/gomod.garykim.dev/nc-talk/ocs/capabilities.go
vendored
Normal file
42
vendor/gomod.garykim.dev/nc-talk/ocs/capabilities.go
vendored
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
// Copyright (c) 2020 Gary Kim <gary@garykim.dev>, All Rights Reserved
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package ocs
|
||||||
|
|
||||||
|
// Capabilities describes the response from the capabilities request
|
||||||
|
type Capabilities struct {
|
||||||
|
ocs
|
||||||
|
Data struct {
|
||||||
|
Capabilities struct {
|
||||||
|
SpreedCapabilities SpreedCapabilities `json:"spreed"`
|
||||||
|
} `json:"capabilities"`
|
||||||
|
} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpreedCapabilities describes the Nextcloud Talk capabilities response
|
||||||
|
type SpreedCapabilities struct {
|
||||||
|
Features []string `json:"features"`
|
||||||
|
Config struct {
|
||||||
|
Attachments struct {
|
||||||
|
Allowed bool `json:"allowed"`
|
||||||
|
Folder string `json:"folder"`
|
||||||
|
} `json:"attachments"`
|
||||||
|
Chat struct {
|
||||||
|
MaxLength int `json:"max-length"`
|
||||||
|
} `json:"chat"`
|
||||||
|
Conversations struct {
|
||||||
|
CanCreate bool `json:"can-create"`
|
||||||
|
} `json:"conversations"`
|
||||||
|
} `json:"config"`
|
||||||
|
}
|
84
vendor/gomod.garykim.dev/nc-talk/user/user.go
vendored
84
vendor/gomod.garykim.dev/nc-talk/user/user.go
vendored
@ -15,10 +15,12 @@
|
|||||||
package user
|
package user
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/xml"
|
"encoding/json"
|
||||||
"reflect"
|
"strings"
|
||||||
|
|
||||||
"github.com/monaco-io/request"
|
"github.com/monaco-io/request"
|
||||||
|
|
||||||
|
"gomod.garykim.dev/nc-talk/ocs"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -35,6 +37,8 @@ type TalkUser struct {
|
|||||||
|
|
||||||
// Capabilities describes the capabilities that the Nextcloud Talk instance is capable of. Visit https://nextcloud-talk.readthedocs.io/en/latest/capabilities/ for more info.
|
// Capabilities describes the capabilities that the Nextcloud Talk instance is capable of. Visit https://nextcloud-talk.readthedocs.io/en/latest/capabilities/ for more info.
|
||||||
type Capabilities struct {
|
type Capabilities struct {
|
||||||
|
AttachmentsFolder string `ocscapability:"config => attachments => folder"`
|
||||||
|
ChatMaxLength int
|
||||||
Audio bool `ocscapability:"audio"`
|
Audio bool `ocscapability:"audio"`
|
||||||
Video bool `ocscapability:"video"`
|
Video bool `ocscapability:"video"`
|
||||||
Chat bool `ocscapability:"chat"`
|
Chat bool `ocscapability:"chat"`
|
||||||
@ -60,18 +64,12 @@ type Capabilities struct {
|
|||||||
ChatReplies bool `ocscapability:"chat-replies"`
|
ChatReplies bool `ocscapability:"chat-replies"`
|
||||||
CirclesSupport bool `ocscapability:"circles-support"`
|
CirclesSupport bool `ocscapability:"circles-support"`
|
||||||
AttachmentsAllowed bool `ocscapability:"config => attachments => allowed"`
|
AttachmentsAllowed bool `ocscapability:"config => attachments => allowed"`
|
||||||
AttachmentsFolder bool `ocscapability:"config => attachments => folder"`
|
|
||||||
ConversationsCanCreate bool `ocscapability:"config => conversations => can-create"`
|
ConversationsCanCreate bool `ocscapability:"config => conversations => can-create"`
|
||||||
ForceMute bool `ocscapability:"force-mute"`
|
ForceMute bool `ocscapability:"force-mute"`
|
||||||
ConversationV2 bool `ocscapability:"conversation-v2"`
|
ConversationV2 bool `ocscapability:"conversation-v2"`
|
||||||
ChatReferenceID bool `ocscapability:"chat-reference-id"`
|
ChatReferenceID bool `ocscapability:"chat-reference-id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type capabilitiesRequest struct {
|
|
||||||
XMLName xml.Name `xml:"ocs"`
|
|
||||||
Capabilities []string `xml:"ocs>data>capabilities>spreed>features>element"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// RequestClient returns a monaco-io that is preconfigured to make OCS API calls
|
// RequestClient returns a monaco-io that is preconfigured to make OCS API calls
|
||||||
func (t *TalkUser) RequestClient(client request.Client) *request.Client {
|
func (t *TalkUser) RequestClient(client request.Client) *request.Client {
|
||||||
if client.Header == nil {
|
if client.Header == nil {
|
||||||
@ -87,6 +85,12 @@ func (t *TalkUser) RequestClient(client request.Client) *request.Client {
|
|||||||
Username: t.User,
|
Username: t.User,
|
||||||
Password: t.Pass,
|
Password: t.Pass,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set Nextcloud URL if there is no host
|
||||||
|
if !strings.HasPrefix(client.URL, t.NextcloudURL) {
|
||||||
|
client.URL = t.NextcloudURL + "/" + client.URL
|
||||||
|
}
|
||||||
|
|
||||||
return &client
|
return &client
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,35 +102,67 @@ func (t *TalkUser) Capabilities() (*Capabilities, error) {
|
|||||||
|
|
||||||
client := t.RequestClient(request.Client{
|
client := t.RequestClient(request.Client{
|
||||||
URL: ocsCapabilitiesEndpoint,
|
URL: ocsCapabilitiesEndpoint,
|
||||||
Header: map[string]string{
|
|
||||||
"Accept": "application/xml",
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
res, err := client.Do()
|
res, err := client.Do()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
capabilities := &capabilitiesRequest{}
|
capabilitiesRequest := &struct {
|
||||||
err = xml.Unmarshal(res.Data, capabilities)
|
Ocs ocs.Capabilities `json:"ocs"`
|
||||||
|
}{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res.Data, capabilitiesRequest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
tr := &Capabilities{}
|
sc := capabilitiesRequest.Ocs.Data.Capabilities.SpreedCapabilities
|
||||||
|
|
||||||
c := reflect.ValueOf(tr)
|
tr := &Capabilities{
|
||||||
for i := 0; i < c.NumField(); i++ {
|
Audio: sliceContains(sc.Features, "audio"),
|
||||||
field := c.Field(i)
|
Video: sliceContains(sc.Features, "video"),
|
||||||
tag := field.Type().Field(0).Tag.Get("ocscapability")
|
Chat: sliceContains(sc.Features, "chat"),
|
||||||
|
GuestSignaling: sliceContains(sc.Features, "guest-signaling"),
|
||||||
for _, capability := range capabilities.Capabilities {
|
EmptyGroupRoom: sliceContains(sc.Features, "empty-group-room"),
|
||||||
if capability == tag && field.CanSet() {
|
GuestDisplayNames: sliceContains(sc.Features, "guest-display-names"),
|
||||||
field.SetBool(true)
|
MultiRoomUsers: sliceContains(sc.Features, "multi-room-users"),
|
||||||
}
|
ChatV2: sliceContains(sc.Features, "chat-v2"),
|
||||||
}
|
Favorites: sliceContains(sc.Features, "favorites"),
|
||||||
|
LastRoomActivity: sliceContains(sc.Features, "last-room-activity"),
|
||||||
|
NoPing: sliceContains(sc.Features, "no-ping"),
|
||||||
|
SystemMessages: sliceContains(sc.Features, "system-messages"),
|
||||||
|
MentionFlag: sliceContains(sc.Features, "mention-flag"),
|
||||||
|
InCallFlags: sliceContains(sc.Features, "in-call-flags"),
|
||||||
|
InviteByMail: sliceContains(sc.Features, "invite-by-mail"),
|
||||||
|
NotificationLevels: sliceContains(sc.Features, "notification-levels"),
|
||||||
|
InviteGroupsAndMails: sliceContains(sc.Features, "invite-groups-and-mails"),
|
||||||
|
LockedOneToOneRooms: sliceContains(sc.Features, "locked-one-to-one-rooms"),
|
||||||
|
ReadOnlyRooms: sliceContains(sc.Features, "read-only-rooms"),
|
||||||
|
ChatReadMarker: sliceContains(sc.Features, "chat-read-marker"),
|
||||||
|
WebinaryLobby: sliceContains(sc.Features, "webinary-lobby"),
|
||||||
|
StartCallFlag: sliceContains(sc.Features, "start-call-flag"),
|
||||||
|
ChatReplies: sliceContains(sc.Features, "chat-replies"),
|
||||||
|
CirclesSupport: sliceContains(sc.Features, "circles-support"),
|
||||||
|
AttachmentsAllowed: sc.Config.Attachments.Allowed,
|
||||||
|
AttachmentsFolder: sc.Config.Attachments.Folder,
|
||||||
|
ConversationsCanCreate: sc.Config.Conversations.CanCreate,
|
||||||
|
ForceMute: sliceContains(sc.Features, "force-mute"),
|
||||||
|
ConversationV2: sliceContains(sc.Features, "conversation-v2"),
|
||||||
|
ChatReferenceID: sliceContains(sc.Features, "chat-reference-id"),
|
||||||
|
ChatMaxLength: sc.Config.Chat.MaxLength,
|
||||||
}
|
}
|
||||||
|
|
||||||
t.capabilities = tr
|
t.capabilities = tr
|
||||||
return tr, nil
|
return tr, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sliceContains does the slice contain the string
|
||||||
|
func sliceContains(s []string, search string) bool {
|
||||||
|
for _, n := range s {
|
||||||
|
if n == search {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -274,7 +274,7 @@ golang.org/x/text/secure/bidirule
|
|||||||
golang.org/x/text/transform
|
golang.org/x/text/transform
|
||||||
golang.org/x/text/unicode/bidi
|
golang.org/x/text/unicode/bidi
|
||||||
golang.org/x/text/unicode/norm
|
golang.org/x/text/unicode/norm
|
||||||
# gomod.garykim.dev/nc-talk v0.0.1
|
# gomod.garykim.dev/nc-talk v0.0.2
|
||||||
gomod.garykim.dev/nc-talk
|
gomod.garykim.dev/nc-talk
|
||||||
gomod.garykim.dev/nc-talk/constants
|
gomod.garykim.dev/nc-talk/constants
|
||||||
gomod.garykim.dev/nc-talk/ocs
|
gomod.garykim.dev/nc-talk/ocs
|
||||||
|
Loading…
Reference in New Issue
Block a user