mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-05-17 21:16:33 +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
|
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)
|
message, err := client.RunUntilMessage(ctx)
|
||||||
if err := checkUnexpectedClose(err); err != nil {
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -153,14 +153,21 @@ func checkReceiveClientMessageWithSender(ctx context.Context, client *TestClient
|
||||||
if sender != nil {
|
if sender != nil {
|
||||||
*sender = message.Message.Sender
|
*sender = message.Message.Sender
|
||||||
}
|
}
|
||||||
|
if recipient != nil {
|
||||||
|
*recipient = message.Message.Recipient
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkReceiveClientMessage(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}) error {
|
func checkReceiveClientMessageWithSender(ctx context.Context, client *TestClient, senderType string, hello *HelloServerMessage, payload interface{}, sender **MessageServerMessageSender) error {
|
||||||
return checkReceiveClientMessageWithSender(ctx, client, senderType, hello, payload, nil)
|
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)
|
message, err := client.RunUntilMessage(ctx)
|
||||||
if err := checkUnexpectedClose(err); err != nil {
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -176,11 +183,18 @@ func checkReceiveClientControlWithSender(ctx context.Context, client *TestClient
|
||||||
if sender != nil {
|
if sender != nil {
|
||||||
*sender = message.Control.Sender
|
*sender = message.Control.Sender
|
||||||
}
|
}
|
||||||
|
if recipient != nil {
|
||||||
|
*recipient = message.Control.Recipient
|
||||||
|
}
|
||||||
return nil
|
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 {
|
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 {
|
func checkReceiveClientEvent(ctx context.Context, client *TestClient, eventType string, msg **EventServerMessage) error {
|
||||||
|
|
Loading…
Reference in a new issue