Simplify latest build number retrieval function

Doubled build number in the name is Microsoft's fault and I can't be bothered to make a hackfix that.

fetchupd.php

@@ -34,20 +34,31 @@ function uupApiPrivateParseFlags($str) {
 }
 
 function uupApiPrivateGetLatestBuild() {
-    $builds = array('22000.1');
-
     $ids = uupListIds();
-    if(isset($ids['error'])) {
-        $ids['builds'] = array();
+
+    if(!isset($ids['builds']) || empty($ids['builds'])) {
+        return '26100.1';
     }
 
-    if(empty($ids['builds'])) {
-        $build = $builds[0];
-    } else {
-        $build = $ids['builds'][0]['build'];
+    return $ids['builds'][0]['build'];
 }
 
-    return $build;
+function uupApiPrivateGetLatestPatch($build) {
+    $ids = uupListIds();
+
+    if(!isset($ids['builds']) || empty($ids['builds'])) {
+        return 0;
+    }
+
+    foreach($ids['builds'] as $val) {
+        $valBuild = explode('.', $val['build']);
+
+        if($valBuild[0] == $build && isset($valBuild[1])) {
+            return intval($valBuild[1]);
+        }
+    }
+
+    return 0;
 }
 
 function uupApiPrivateIsAcceptableBranch($branch) {
@@ -83,7 +94,7 @@ function uupApiPrivateNormalizeFetchParams($params) {
         'arch' => 'amd64',
         'ring' => 'WIF',
         'flight' => 'Active',
-        'branch' => 'ge_release',
+        'branch' => 'auto',
         'build' => 'latest',
         'minor' => 0,
         'sku' => 48,
@@ -154,9 +165,15 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
     }
 
     $build = explode('.', $build);
-    if(isset($build[1])) $minor = intval($build[1]);
+    if(isset($build[1])) $minor = $build[1];
     $build = intval($build[0]);
 
+    if($minor == 'latest') {
+        $minor = uupApiPrivateGetLatestPatch($build);
+    } else {
+        $minor = intval($minor);
+    }
+
     if(!($arch == 'amd64' || $arch == 'x86' || $arch == 'arm64' || $arch == 'arm' || $arch == 'all')) {
         return array('error' => 'UNKNOWN_ARCH');
     }
@@ -329,8 +346,9 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
 
     $isCumulativeUpdate = 0;
-    if(preg_match('/\d{4}-\d{2}.+Update|Cumulative Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
+    if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
         $isCumulativeUpdate = 1;
+
         if($isNet) {
             $updateTitle = preg_replace("/3.5 and 4.8.1 |3.5 and 4.8 | for $foundArch| for x64| \(KB.*?\)/i", '', $updateTitle);
         } else {
@@ -345,6 +363,11 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
     }
 
+    if(preg_match('/Windows 1\d|Server|Azure Stack HCI|Windows CPC OS/i', $updateTitle) !== 1) {
+        $osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system';
+        $updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
+    }
+
     if($sku == 406)
         $updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
 
@@ -354,7 +377,7 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
     if($foundType == 'hololens' || $foundType == 'wcosdevice0')
         $updateTitle = $updateTitle.' - '.$type;
 
-    if(!preg_match("/$foundBuild/i", $updateTitle))
+    if(!str_contains($updateTitle, $foundBuild))
         $updateTitle = $updateTitle.' ('.$foundBuild.')';
 
     preg_match('/UpdateID=".*?"/', $updateInfo, $updateId);

shared/requests.php

@@ -320,6 +320,10 @@ function branchFromBuild($build) {
             $branch = 'ge_release';
             break;
 
+        case 28000:
+            $branch = 'br_release';
+            break;
+
         default:
             $branch = 'rs_prerelease';
             break;