mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-08 00:42:25 +02:00
Add methods to get recipient of control/message messages.
This commit is contained in:
parent
4f84d3ad0d
commit
faf7544f2d
|
@ -137,7 +137,7 @@ func checkMessageSender(hub *Hub, sender *MessageServerMessageSender, senderType
|
|||
return nil
|
||||
}
|
||||
|
||||
func checkReceiveClientMessageWithSender(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender) error {
|
||||
func checkReceiveClientMessageWithSenderAndRecipient(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender, recipient **MessageClientMessageRecipient) error {
|
||||
message, err := client.RunUntilMessage(ctx)
|
||||
if err := checkUnexpectedClose(err); err != nil {
|
||||
return err
|
||||
|
@ -153,14 +153,21 @@ func checkReceiveClientMessageWithSender(ctx context.Context, client *TestClient
|
|||
if sender != nil {
|
||||
*sender = message.Message.Sender
|
||||
}
|
||||
if recipient != nil {
|
||||
*recipient = message.Message.Recipient
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkReceiveClientMessage(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}) error {
|
||||
return checkReceiveClientMessageWithSender(ctx, client, senderType, hello, payload, nil)
|
||||
func checkReceiveClientMessageWithSender(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender) error {
|
||||
return checkReceiveClientMessageWithSenderAndRecipient(ctx, client, senderType, hello, payload, sender, nil)
|
||||
}
|
||||
|
||||
func checkReceiveClientControlWithSender(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender) error {
|
||||
func checkReceiveClientMessage(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}) error {
|
||||
return checkReceiveClientMessageWithSenderAndRecipient(ctx, client, senderType, hello, payload, nil, nil)
|
||||
}
|
||||
|
||||
func checkReceiveClientControlWithSenderAndRecipient(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender, recipient **MessageClientMessageRecipient) error {
|
||||
message, err := client.RunUntilMessage(ctx)
|
||||
if err := checkUnexpectedClose(err); err != nil {
|
||||
return err
|
||||
|
@ -176,11 +183,18 @@ func checkReceiveClientControlWithSender(ctx context.Context, client *TestClient
|
|||
if sender != nil {
|
||||
*sender = message.Control.Sender
|
||||
}
|
||||
if recipient != nil {
|
||||
*recipient = message.Control.Recipient
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkReceiveClientControlWithSender(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender) error { // nolint
|
||||
return checkReceiveClientControlWithSenderAndRecipient(ctx, client, senderType, hello, payload, sender, nil)
|
||||
}
|
||||
|
||||
func checkReceiveClientControl(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}) error {
|
||||
return checkReceiveClientControlWithSender(ctx, client, senderType, hello, payload, nil)
|
||||
return checkReceiveClientControlWithSenderAndRecipient(ctx, client, senderType, hello, payload, nil, nil)
|
||||
}
|
||||
|
||||
func checkReceiveClientEvent(ctx context.Context, client *TestClient, eventType string, msg **EventServerMessage) error {
|
||||
|
|
Loading…
Reference in a new issue