Remove question mark and any extra data after it, if present. efserve…

…rs.com uses that space for server name and map information.
stefansundin · May 31, 2023 · d24ff2a · d24ff2a
1 parent 3c7fe6b
commit d24ff2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/linux/stvef-protocol b/linux/stvef-protocol
@@ -28,9 +28,15 @@ else
   exit 1
 fi
 
+# Remove extra data
+if [[ "$arg" == *"?"* ]]; then
+  arg="${arg%\?*}"
+fi
+
 if [[ "$arg" == "connect/"* ]]; then
   SERVER="${arg:8}"
 else
+  # Legacy format
   # Example arg: 74.91.116.133;27961;BeerGardenSuperFFAv;hm_noon;0;
   IFS=';' read -r SERVER_IP SERVER_PORT SERVER_NAME MAP_NAME REST <<< "$arg"
   SERVER="$SERVER_IP:$SERVER_PORT"

diff --git a/mac/stvef-protocol.m b/mac/stvef-protocol.m
@@ -29,13 +29,20 @@ - (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent: (NSAppl
     return;
   }
 
+  // Remove extra data
+  if ([arg containsString:@"?"]) {
+    NSRange questionMark = [arg rangeOfString:@"?"];
+    arg = [arg substringToIndex:questionMark.location];
+  }
+
   // Parse arg
   // TODO: Maybe validate the input a bit better
   NSString *server;
   if ([arg hasPrefix:@"connect/"]) {
     server = [arg substringFromIndex:8];
   }
   else {
+    // Legacy format
     NSArray *args = [arg componentsSeparatedByString:@";"];
     server = [NSString stringWithFormat: @"%@:%@", args[0], args[1]];
   }