mirror of
https://github.com/42wim/matterbridge.git
synced 2024-11-23 19:22:03 -08:00
Add support for message deletion (nctalk) (#1492)
* nctalk: add message deletion support Signed-off-by: Gary Kim <gary@garykim.dev> * nctalk: seperate out deletion and sending logic Signed-off-by: Gary Kim <gary@garykim.dev> * nctalk: update library to v0.2.0 Signed-off-by: Gary Kim <gary@garykim.dev> * Rename functions to be clearer Signed-off-by: Gary Kim <gary@garykim.dev> * Update to go-nc-talk v0.2.1 Signed-off-by: Gary Kim <gary@garykim.dev> * Update to go-nc-talk v0.2.2 Signed-off-by: Gary Kim <gary@garykim.dev> * Make deletions easier to debug Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
parent
c7897cca5d
commit
1d50da4b1c
@ -74,12 +74,6 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
|
|||||||
}
|
}
|
||||||
b.rooms = append(b.rooms, newRoom)
|
b.rooms = append(b.rooms, newRoom)
|
||||||
|
|
||||||
// Config
|
|
||||||
guestSuffix := " (Guest)"
|
|
||||||
if b.IsKeySet("GuestSuffix") {
|
|
||||||
guestSuffix = b.GetString("GuestSuffix")
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for msg := range c {
|
for msg := range c {
|
||||||
msg := msg
|
msg := msg
|
||||||
@ -90,35 +84,23 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// ignore messages that are one of the following
|
// Ignore messages that are from the bot user
|
||||||
// * not a message from a user
|
if msg.ActorID == b.user.User {
|
||||||
// * from ourselves
|
continue
|
||||||
if msg.MessageType != ocs.MessageComment || msg.ActorID == b.user.User {
|
}
|
||||||
continue
|
|
||||||
}
|
// Handle deleting messages
|
||||||
remoteMessage := config.Message{
|
if msg.MessageType == ocs.MessageSystem && msg.Parent != nil && msg.Parent.MessageType == ocs.MessageDelete {
|
||||||
Text: formatRichObjectString(msg.Message, msg.MessageParameters),
|
b.handleDeletingMessage(&msg, &newRoom)
|
||||||
Channel: newRoom.room.Token,
|
continue
|
||||||
Username: DisplayName(msg, guestSuffix),
|
}
|
||||||
UserID: msg.ActorID,
|
|
||||||
Account: b.Account,
|
// Handle sending messages
|
||||||
}
|
if msg.MessageType == ocs.MessageComment {
|
||||||
// It is possible for the ID to not be set on older versions of Talk so we only set it if
|
b.handleSendingMessage(&msg, &newRoom)
|
||||||
// the ID is not blank
|
|
||||||
if msg.ID != 0 {
|
|
||||||
remoteMessage.ID = strconv.Itoa(msg.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle Files
|
|
||||||
err = b.handleFiles(&remoteMessage, &msg)
|
|
||||||
if err != nil {
|
|
||||||
b.Log.Errorf("Error handling file: %#v", msg)
|
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
b.Log.Debugf("<= Message is %#v", remoteMessage)
|
|
||||||
b.Remote <- remoteMessage
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
return nil
|
return nil
|
||||||
@ -131,26 +113,40 @@ func (b *Btalk) Send(msg config.Message) (string, error) {
|
|||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Talk currently only supports sending normal messages
|
// Standard Message Send
|
||||||
if msg.Event != "" {
|
if msg.Event == "" {
|
||||||
return "", nil
|
// Handle sending files if they are included
|
||||||
|
err := b.handleSendingFile(&msg, r)
|
||||||
|
if err != nil {
|
||||||
|
b.Log.Errorf("Could not send files in message to room %v from %v: %v", msg.Channel, msg.Username, err)
|
||||||
|
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
sentMessage, err := r.room.SendMessage(msg.Username + msg.Text)
|
||||||
|
if err != nil {
|
||||||
|
b.Log.Errorf("Could not send message to room %v from %v: %v", msg.Channel, msg.Username, err)
|
||||||
|
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
return strconv.Itoa(sentMessage.ID), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle sending files if they are included
|
// Message Deletion
|
||||||
err := b.handleSendingFile(&msg, r)
|
if msg.Event == config.EventMsgDelete {
|
||||||
if err != nil {
|
messageID, err := strconv.Atoi(msg.ID)
|
||||||
b.Log.Errorf("Could not send files in message to room %v from %v: %v", msg.Channel, msg.Username, err)
|
if err != nil {
|
||||||
|
return "", err
|
||||||
return "", nil
|
}
|
||||||
|
data, err := r.room.DeleteMessage(messageID)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return strconv.Itoa(data.ID), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
sentMessage, err := r.room.SendMessage(msg.Username + msg.Text)
|
// Message is not a type that is currently supported
|
||||||
if err != nil {
|
return "", nil
|
||||||
b.Log.Errorf("Could not send message to room %v from %v: %v", msg.Channel, msg.Username, err)
|
|
||||||
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
return strconv.Itoa(sentMessage.ID), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Btalk) getRoom(token string) *Broom {
|
func (b *Btalk) getRoom(token string) *Broom {
|
||||||
@ -208,6 +204,53 @@ func (b *Btalk) handleSendingFile(msg *config.Message, r *Broom) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *Btalk) handleSendingMessage(msg *ocs.TalkRoomMessageData, r *Broom) {
|
||||||
|
remoteMessage := config.Message{
|
||||||
|
Text: formatRichObjectString(msg.Message, msg.MessageParameters),
|
||||||
|
Channel: r.room.Token,
|
||||||
|
Username: DisplayName(msg, b.guestSuffix()),
|
||||||
|
UserID: msg.ActorID,
|
||||||
|
Account: b.Account,
|
||||||
|
}
|
||||||
|
// It is possible for the ID to not be set on older versions of Talk so we only set it if
|
||||||
|
// the ID is not blank
|
||||||
|
if msg.ID != 0 {
|
||||||
|
remoteMessage.ID = strconv.Itoa(msg.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle Files
|
||||||
|
err := b.handleFiles(&remoteMessage, msg)
|
||||||
|
if err != nil {
|
||||||
|
b.Log.Errorf("Error handling file: %#v", msg)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
b.Log.Debugf("<= Message is %#v", remoteMessage)
|
||||||
|
b.Remote <- remoteMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *Btalk) handleDeletingMessage(msg *ocs.TalkRoomMessageData, r *Broom) {
|
||||||
|
remoteMessage := config.Message{
|
||||||
|
Event: config.EventMsgDelete,
|
||||||
|
Text: config.EventMsgDelete,
|
||||||
|
Channel: r.room.Token,
|
||||||
|
ID: strconv.Itoa(msg.Parent.ID),
|
||||||
|
Account: b.Account,
|
||||||
|
}
|
||||||
|
b.Log.Debugf("<= Message being deleted is %#v", remoteMessage)
|
||||||
|
b.Remote <- remoteMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *Btalk) guestSuffix() string {
|
||||||
|
guestSuffix := " (Guest)"
|
||||||
|
if b.IsKeySet("GuestSuffix") {
|
||||||
|
guestSuffix = b.GetString("GuestSuffix")
|
||||||
|
}
|
||||||
|
|
||||||
|
return guestSuffix
|
||||||
|
}
|
||||||
|
|
||||||
// Spec: https://github.com/nextcloud/server/issues/1706#issue-182308785
|
// Spec: https://github.com/nextcloud/server/issues/1706#issue-182308785
|
||||||
func formatRichObjectString(message string, parameters map[string]ocs.RichObjectString) string {
|
func formatRichObjectString(message string, parameters map[string]ocs.RichObjectString) string {
|
||||||
for id, parameter := range parameters {
|
for id, parameter := range parameters {
|
||||||
@ -228,7 +271,7 @@ func formatRichObjectString(message string, parameters map[string]ocs.RichObject
|
|||||||
return message
|
return message
|
||||||
}
|
}
|
||||||
|
|
||||||
func DisplayName(msg ocs.TalkRoomMessageData, suffix string) string {
|
func DisplayName(msg *ocs.TalkRoomMessageData, suffix string) string {
|
||||||
if msg.ActorType == ocs.ActorGuest {
|
if msg.ActorType == ocs.ActorGuest {
|
||||||
if msg.ActorDisplayName == "" {
|
if msg.ActorDisplayName == "" {
|
||||||
return "Guest"
|
return "Guest"
|
||||||
|
2
go.mod
2
go.mod
@ -57,7 +57,7 @@ require (
|
|||||||
github.com/zfjagann/golang-ring v0.0.0-20210116075443-7c86fdb43134
|
github.com/zfjagann/golang-ring v0.0.0-20210116075443-7c86fdb43134
|
||||||
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e
|
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e
|
||||||
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
|
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
|
||||||
gomod.garykim.dev/nc-talk v0.1.7
|
gomod.garykim.dev/nc-talk v0.2.2
|
||||||
gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
|
gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
|
||||||
layeh.com/gumble v0.0.0-20200818122324-146f9205029b
|
layeh.com/gumble v0.0.0-20200818122324-146f9205029b
|
||||||
)
|
)
|
||||||
|
4
go.sum
4
go.sum
@ -1278,8 +1278,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=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
gomod.garykim.dev/nc-talk v0.1.7 h1:G2qsiRcyaj5FEADQlulsBAFJHs27tPmH9VtKK+at9SM=
|
gomod.garykim.dev/nc-talk v0.2.2 h1:+U+daJFPPuwM7yRXYazeMHZgIBSGP6SeQURO0O5a32I=
|
||||||
gomod.garykim.dev/nc-talk v0.1.7/go.mod h1:DNucAJ6zeaumBEwV5NiYk+Eea8Ca+Q5f+plhz9F7d58=
|
gomod.garykim.dev/nc-talk v0.2.2/go.mod h1:q/Adot/H7iqi+H4lANopV7/xcMf+sX3AZXUXqiITwok=
|
||||||
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
||||||
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
||||||
google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
||||||
|
@ -33,10 +33,14 @@ type SpreedCapabilities struct {
|
|||||||
Folder string `json:"folder"`
|
Folder string `json:"folder"`
|
||||||
} `json:"attachments"`
|
} `json:"attachments"`
|
||||||
Chat struct {
|
Chat struct {
|
||||||
MaxLength int `json:"max-length"`
|
MaxLength int `json:"max-length"`
|
||||||
|
ReadPrivacy int `json:"read-privacy"`
|
||||||
} `json:"chat"`
|
} `json:"chat"`
|
||||||
Conversations struct {
|
Conversations struct {
|
||||||
CanCreate bool `json:"can-create"`
|
CanCreate bool `json:"can-create"`
|
||||||
} `json:"conversations"`
|
} `json:"conversations"`
|
||||||
|
Previews struct {
|
||||||
|
MaxGifSize int `json:"max-gif-size"`
|
||||||
|
} `json:"previews"`
|
||||||
} `json:"config"`
|
} `json:"config"`
|
||||||
}
|
}
|
||||||
|
11
vendor/gomod.garykim.dev/nc-talk/ocs/message.go
vendored
11
vendor/gomod.garykim.dev/nc-talk/ocs/message.go
vendored
@ -35,6 +35,15 @@ const (
|
|||||||
// MessageCommand is a Nextcloud Talk message that is a command
|
// MessageCommand is a Nextcloud Talk message that is a command
|
||||||
MessageCommand MessageType = "command"
|
MessageCommand MessageType = "command"
|
||||||
|
|
||||||
|
// MessageDelete is a Nextcloud Talk message indicating a message that was deleted
|
||||||
|
//
|
||||||
|
// If a message has been deleted, a message of MessageType MessageSystem is
|
||||||
|
// sent through the channel for which the parent message's MessageType is MessageDelete.
|
||||||
|
// So, in order to check if a new message is a message deletion request, a check
|
||||||
|
// like this can be used:
|
||||||
|
// msg.MessageType == ocs.MessageSystem && msg.Parent != nil && msg.Parent.MessageType == ocs.MessageDelete
|
||||||
|
MessageDelete MessageType = "comment_deleted"
|
||||||
|
|
||||||
// ActorUser is a Nextcloud Talk message sent by a user
|
// ActorUser is a Nextcloud Talk message sent by a user
|
||||||
ActorUser ActorType = "users"
|
ActorUser ActorType = "users"
|
||||||
|
|
||||||
@ -55,6 +64,8 @@ type TalkRoomMessageData struct {
|
|||||||
SystemMessage string `json:"systemMessage"`
|
SystemMessage string `json:"systemMessage"`
|
||||||
Timestamp int `json:"timestamp"`
|
Timestamp int `json:"timestamp"`
|
||||||
MessageType MessageType `json:"messageType"`
|
MessageType MessageType `json:"messageType"`
|
||||||
|
Deleted bool `json:"deleted"`
|
||||||
|
Parent *TalkRoomMessageData `json:"parent"`
|
||||||
MessageParameters map[string]RichObjectString `json:"-"`
|
MessageParameters map[string]RichObjectString `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
61
vendor/gomod.garykim.dev/nc-talk/room/room.go
vendored
61
vendor/gomod.garykim.dev/nc-talk/room/room.go
vendored
@ -18,6 +18,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -41,6 +42,12 @@ var (
|
|||||||
ErrUnexpectedReturnCode = errors.New("unexpected return code")
|
ErrUnexpectedReturnCode = errors.New("unexpected return code")
|
||||||
// ErrTooManyRequests is returned if the server returns a 429
|
// ErrTooManyRequests is returned if the server returns a 429
|
||||||
ErrTooManyRequests = errors.New("too many requests")
|
ErrTooManyRequests = errors.New("too many requests")
|
||||||
|
// ErrLackingCapabilities is returned if the server lacks the required capability for the given function
|
||||||
|
ErrLackingCapabilities = errors.New("lacking required capabilities")
|
||||||
|
// ErrForbidden is returned if the user is forbidden from accessing the requested resource
|
||||||
|
ErrForbidden = errors.New("request forbidden")
|
||||||
|
// ErrUnexpectedResponse is returned if the response from the Nextcloud Talk server is not formatted as expected
|
||||||
|
ErrUnexpectedResponse = errors.New("unexpected response")
|
||||||
)
|
)
|
||||||
|
|
||||||
// TalkRoom represents a room in Nextcloud Talk
|
// TalkRoom represents a room in Nextcloud Talk
|
||||||
@ -90,6 +97,39 @@ func (t *TalkRoom) SendMessage(msg string) (*ocs.TalkRoomMessageData, error) {
|
|||||||
return &msgInfo.OCS.TalkRoomMessage, err
|
return &msgInfo.OCS.TalkRoomMessage, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteMessage deletes the message with the given messageID on the server.
|
||||||
|
//
|
||||||
|
// Requires "delete-messages" capability on the Nextcloud Talk server
|
||||||
|
func (t *TalkRoom) DeleteMessage(messageID int) (*ocs.TalkRoomMessageData, error) {
|
||||||
|
// Check for required capability
|
||||||
|
capable, err := t.User.Capabilities()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !capable.DeleteMessages {
|
||||||
|
return nil, ErrLackingCapabilities
|
||||||
|
}
|
||||||
|
|
||||||
|
url := t.User.NextcloudURL + constants.BaseEndpoint + "/chat/" + t.Token + "/" + strconv.Itoa(messageID)
|
||||||
|
|
||||||
|
client := t.User.RequestClient(request.Client{
|
||||||
|
URL: url,
|
||||||
|
Method: "DELETE",
|
||||||
|
})
|
||||||
|
res, err := client.Do()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if res.StatusCode() != http.StatusOK && res.StatusCode() != http.StatusAccepted {
|
||||||
|
return nil, ErrUnexpectedReturnCode
|
||||||
|
}
|
||||||
|
msgInfo, err := ocs.TalkRoomSentResponseUnmarshal(&res.Data)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &msgInfo.OCS.TalkRoomMessage, nil
|
||||||
|
}
|
||||||
|
|
||||||
// ReceiveMessages starts watching for new messages
|
// ReceiveMessages starts watching for new messages
|
||||||
func (t *TalkRoom) ReceiveMessages(ctx context.Context) (chan ocs.TalkRoomMessageData, error) {
|
func (t *TalkRoom) ReceiveMessages(ctx context.Context) (chan ocs.TalkRoomMessageData, error) {
|
||||||
c := make(chan ocs.TalkRoomMessageData)
|
c := make(chan ocs.TalkRoomMessageData)
|
||||||
@ -133,23 +173,28 @@ func (t *TalkRoom) ReceiveMessages(ctx context.Context) (chan ocs.TalkRoomMessag
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If it seems that we no longer have access to the chat for one reason or another, stop the goroutine and set error in the next return.
|
// If it seems that we no longer have access to the chat for one reason or another, stop the goroutine and set error in the next return.
|
||||||
if res.StatusCode == 404 {
|
if res.StatusCode == http.StatusNotFound {
|
||||||
_ = res.Body.Close()
|
_ = res.Body.Close()
|
||||||
c <- ocs.TalkRoomMessageData{Error: ErrRoomNotFound}
|
c <- ocs.TalkRoomMessageData{Error: ErrRoomNotFound}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if res.StatusCode == 401 {
|
if res.StatusCode == http.StatusUnauthorized {
|
||||||
_ = res.Body.Close()
|
_ = res.Body.Close()
|
||||||
c <- ocs.TalkRoomMessageData{Error: ErrUnauthorized}
|
c <- ocs.TalkRoomMessageData{Error: ErrUnauthorized}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if res.StatusCode == 429 {
|
if res.StatusCode == http.StatusTooManyRequests {
|
||||||
_ = res.Body.Close()
|
_ = res.Body.Close()
|
||||||
c <- ocs.TalkRoomMessageData{Error: ErrTooManyRequests}
|
c <- ocs.TalkRoomMessageData{Error: ErrTooManyRequests}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if res.StatusCode == http.StatusForbidden {
|
||||||
|
_ = res.Body.Close()
|
||||||
|
c <- ocs.TalkRoomMessageData{Error: ErrForbidden}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if res.StatusCode == 200 {
|
if res.StatusCode == http.StatusOK {
|
||||||
lastKnown = res.Header.Get("X-Chat-Last-Given")
|
lastKnown = res.Header.Get("X-Chat-Last-Given")
|
||||||
data, err := ioutil.ReadAll(res.Body)
|
data, err := ioutil.ReadAll(res.Body)
|
||||||
_ = res.Body.Close()
|
_ = res.Body.Close()
|
||||||
@ -192,13 +237,13 @@ func (t *TalkRoom) TestConnection() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
switch res.StatusCode() {
|
switch res.StatusCode() {
|
||||||
case 200:
|
case http.StatusOK:
|
||||||
return nil
|
return nil
|
||||||
case 304:
|
case http.StatusNotModified:
|
||||||
return nil
|
return nil
|
||||||
case 404:
|
case http.StatusNotFound:
|
||||||
return ErrRoomNotFound
|
return ErrRoomNotFound
|
||||||
case 412:
|
case http.StatusPreconditionFailed:
|
||||||
return ErrNotModeratorInLobby
|
return ErrNotModeratorInLobby
|
||||||
}
|
}
|
||||||
return ErrUnexpectedReturnCode
|
return ErrUnexpectedReturnCode
|
||||||
|
117
vendor/gomod.garykim.dev/nc-talk/user/user.go
vendored
117
vendor/gomod.garykim.dev/nc-talk/user/user.go
vendored
@ -28,12 +28,16 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
ocsCapabilitiesEndpoint = "/ocs/v2.php/cloud/capabilities"
|
ocsCapabilitiesEndpoint = "/ocs/v2.php/cloud/capabilities"
|
||||||
ocsRoomsEndpoint = "/ocs/v2.php/apps/spreed/api/v2/room"
|
ocsRoomsv2Endpoint = "/ocs/v2.php/apps/spreed/api/v2/room"
|
||||||
|
ocsRoomsv4Endpoint = "/ocs/v2.php/apps/spreed/api/v4/room"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// ErrUserIsNil is returned when a funciton is called with an nil user.
|
// ErrUserIsNil is returned when a function is called with an nil user.
|
||||||
ErrUserIsNil = errors.New("user is nil")
|
ErrUserIsNil = errors.New("user is nil")
|
||||||
|
|
||||||
|
// ErrCannotDownloadFile is returned when a function cannot download the requested file
|
||||||
|
ErrCannotDownloadFile = errors.New("cannot download file")
|
||||||
)
|
)
|
||||||
|
|
||||||
// TalkUser represents a user of Nextcloud Talk
|
// TalkUser represents a user of Nextcloud Talk
|
||||||
@ -53,36 +57,52 @@ type TalkUserConfig 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"`
|
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"`
|
GuestSignaling bool `ocscapability:"guest-signaling"`
|
||||||
GuestSignaling bool `ocscapability:"guest-signaling"`
|
EmptyGroupRoom bool `ocscapability:"empty-group-room"`
|
||||||
EmptyGroupRoom bool `ocscapability:"empty-group-room"`
|
GuestDisplayNames bool `ocscapability:"guest-display-names"`
|
||||||
GuestDisplayNames bool `ocscapability:"guest-display-names"`
|
MultiRoomUsers bool `ocscapability:"multi-room-users"`
|
||||||
MultiRoomUsers bool `ocscapability:"multi-room-users"`
|
ChatV2 bool `ocscapability:"chat-v2"`
|
||||||
ChatV2 bool `ocscapability:"chat-v2"`
|
Favorites bool `ocscapability:"favorites"`
|
||||||
Favorites bool `ocscapability:"favorites"`
|
LastRoomActivity bool `ocscapability:"last-room-activity"`
|
||||||
LastRoomActivity bool `ocscapability:"last-room-activity"`
|
NoPing bool `ocscapability:"no-ping"`
|
||||||
NoPing bool `ocscapability:"no-ping"`
|
SystemMessages bool `ocscapability:"system-messages"`
|
||||||
SystemMessages bool `ocscapability:"system-messages"`
|
MentionFlag bool `ocscapability:"mention-flag"`
|
||||||
MentionFlag bool `ocscapability:"mention-flag"`
|
InCallFlags bool `ocscapability:"in-call-flags"`
|
||||||
InCallFlags bool `ocscapability:"in-call-flags"`
|
InviteByMail bool `ocscapability:"invite-by-mail"`
|
||||||
InviteByMail bool `ocscapability:"invite-by-mail"`
|
NotificationLevels bool `ocscapability:"notification-levels"`
|
||||||
NotificationLevels bool `ocscapability:"notification-levels"`
|
InviteGroupsAndMails bool `ocscapability:"invite-groups-and-mails"`
|
||||||
InviteGroupsAndMails bool `ocscapability:"invite-groups-and-mails"`
|
LockedOneToOneRooms bool `ocscapability:"locked-one-to-one-rooms"`
|
||||||
LockedOneToOneRooms bool `ocscapability:"locked-one-to-one-rooms"`
|
ReadOnlyRooms bool `ocscapability:"read-only-rooms"`
|
||||||
ReadOnlyRooms bool `ocscapability:"read-only-rooms"`
|
ChatReadMarker bool `ocscapability:"chat-read-marker"`
|
||||||
ChatReadMarker bool `ocscapability:"chat-read-marker"`
|
WebinaryLobby bool `ocscapability:"webinary-lobby"`
|
||||||
WebinaryLobby bool `ocscapability:"webinary-lobby"`
|
StartCallFlag bool `ocscapability:"start-call-flag"`
|
||||||
StartCallFlag bool `ocscapability:"start-call-flag"`
|
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"`
|
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"`
|
ConversationV3 bool `ocscapability:"conversation-v3"`
|
||||||
|
ConversationV4 bool `ocscapability:"conversation-v4"`
|
||||||
|
SIPSupport bool `ocscapability:"sip-support"`
|
||||||
|
ChatReadStatus bool `ocscapability:"chat-read-status"`
|
||||||
|
ListableRooms bool `ocscapability:"listable-rooms"`
|
||||||
|
PhonebookSearch bool `ocscapability:"phonebook-search"`
|
||||||
|
RaiseHand bool `ocscapability:"raise-hand"`
|
||||||
|
RoomDescription bool `ocscapability:"room-description"`
|
||||||
|
DeleteMessages bool `ocscapability:"delete-messages"`
|
||||||
|
RichObjectSharing bool `ocscapability:"rich-object-sharing"`
|
||||||
|
ConversationCallFlags bool `ocscapability:"conversation-call-flags"`
|
||||||
|
GeoLocationSharing bool `ocscapability:"geo-location-sharing"`
|
||||||
|
ReadPrivacyConfig bool `ocscapability:"config => chat => read-privacy"`
|
||||||
|
SignalingV3 bool `ocscapability:"signaling-v3"`
|
||||||
|
TempUserAvatarAPI bool `ocscapability:"temp-user-avatar-api"`
|
||||||
|
MaxGifSizeConfig int `ocscapability:"config => previews => max-gif-size"`
|
||||||
|
ChatMaxLength int `ocscapability:"config => chat => max-length"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// RoomInfo contains information about a room
|
// RoomInfo contains information about a room
|
||||||
@ -160,8 +180,17 @@ func (t *TalkUser) RequestClient(client request.Client) *request.Client {
|
|||||||
|
|
||||||
// GetRooms returns a list of all rooms the user is in
|
// GetRooms returns a list of all rooms the user is in
|
||||||
func (t *TalkUser) GetRooms() (*[]RoomInfo, error) {
|
func (t *TalkUser) GetRooms() (*[]RoomInfo, error) {
|
||||||
|
endpoint := ocsRoomsv2Endpoint
|
||||||
|
capabilities, err := t.Capabilities()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if capabilities.ConversationV4 {
|
||||||
|
endpoint = ocsRoomsv4Endpoint
|
||||||
|
}
|
||||||
|
|
||||||
client := t.RequestClient(request.Client{
|
client := t.RequestClient(request.Client{
|
||||||
URL: ocsRoomsEndpoint,
|
URL: endpoint,
|
||||||
})
|
})
|
||||||
res, err := client.Do()
|
res, err := client.Do()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -239,6 +268,22 @@ func (t *TalkUser) Capabilities() (*Capabilities, error) {
|
|||||||
ConversationV2: sliceContains(sc.Features, "conversation-v2"),
|
ConversationV2: sliceContains(sc.Features, "conversation-v2"),
|
||||||
ChatReferenceID: sliceContains(sc.Features, "chat-reference-id"),
|
ChatReferenceID: sliceContains(sc.Features, "chat-reference-id"),
|
||||||
ChatMaxLength: sc.Config.Chat.MaxLength,
|
ChatMaxLength: sc.Config.Chat.MaxLength,
|
||||||
|
ConversationV3: sliceContains(sc.Features, "conversation-v3"),
|
||||||
|
ConversationV4: sliceContains(sc.Features, "conversation-v4"),
|
||||||
|
SIPSupport: sliceContains(sc.Features, "sip-support"),
|
||||||
|
ChatReadStatus: sliceContains(sc.Features, "chat-read-status"),
|
||||||
|
ListableRooms: sliceContains(sc.Features, "listable-rooms"),
|
||||||
|
PhonebookSearch: sliceContains(sc.Features, "phonebook-search"),
|
||||||
|
RaiseHand: sliceContains(sc.Features, "raise-hand"),
|
||||||
|
RoomDescription: sliceContains(sc.Features, "room-description"),
|
||||||
|
ReadPrivacyConfig: sc.Config.Chat.ReadPrivacy != 0,
|
||||||
|
MaxGifSizeConfig: sc.Config.Previews.MaxGifSize,
|
||||||
|
DeleteMessages: sliceContains(sc.Features, "delete-messages"),
|
||||||
|
RichObjectSharing: sliceContains(sc.Features, "rich-object-sharing"),
|
||||||
|
ConversationCallFlags: sliceContains(sc.Features, "conversation-call-flags"),
|
||||||
|
GeoLocationSharing: sliceContains(sc.Features, "geo-location-sharing"),
|
||||||
|
SignalingV3: sliceContains(sc.Features, "signaling-v3"),
|
||||||
|
TempUserAvatarAPI: sliceContains(sc.Features, "temp-user-avatar-api"),
|
||||||
}
|
}
|
||||||
|
|
||||||
t.capabilities = tr
|
t.capabilities = tr
|
||||||
@ -264,7 +309,11 @@ func (t *TalkUser) DownloadFile(path string) (data *[]byte, err error) {
|
|||||||
URL: url,
|
URL: url,
|
||||||
})
|
})
|
||||||
res, err := c.Do()
|
res, err := c.Do()
|
||||||
if err != nil || res.StatusCode() != 200 {
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if res.StatusCode() != 200 {
|
||||||
|
err = ErrCannotDownloadFile
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
data = &res.Data
|
data = &res.Data
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -395,7 +395,7 @@ golang.org/x/text/unicode/norm
|
|||||||
golang.org/x/text/width
|
golang.org/x/text/width
|
||||||
# golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
|
# golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
|
||||||
golang.org/x/time/rate
|
golang.org/x/time/rate
|
||||||
# gomod.garykim.dev/nc-talk v0.1.7
|
# gomod.garykim.dev/nc-talk v0.2.2
|
||||||
## explicit
|
## explicit
|
||||||
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