Fix rebase breakage.

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -63,7 +63,8 @@ NSError *SSKEnsureError(NSError *_Nullable error, OWSErrorCode fallbackCode, NSS
     if (error) {
         return error;
     }
-    OWSFailDebug(@"Using fallback error.") return OWSErrorWithCodeDescription(fallbackCode, fallbackErrorDescription);
+    OWSCFailDebug(@"Using fallback error.");
+    return OWSErrorWithCodeDescription(fallbackCode, fallbackErrorDescription);
 }
 
 #pragma mark -
@@ -1004,7 +1005,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         [request useUDAuth:messageSend.udAccessKey];
     }
 
-    OWSWebSocketType webSocketType = (isUDSend ? OWSWebSocketTypeUD : OWSWebSocketTypeDefault);
+    OWSWebSocketType webSocketType = (messageSend.isUDSend ? OWSWebSocketTypeUD : OWSWebSocketTypeDefault);
     BOOL canMakeWebsocketRequests = ([TSSocketManager.shared canMakeRequestsOfType:webSocketType] &&
                                      !messageSend.hasWebsocketSendFailed);
     if (canMakeWebsocketRequests) {

SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m

@@ -892,7 +892,7 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
     switch (self.webSocketType) {
         case OWSWebSocketTypeUD:
             // UD socket is unauthenticated.
-            return @"?";
+            return @"";
         case OWSWebSocketTypeDefault:
             return
                 [NSString stringWithFormat:@"?login=%@&password=%@",