Fixes

Author: danog

tools/gen_filerefmap.php

@@ -1022,6 +1022,10 @@ public function build(TLContext $tl): array
     $found = false;
     foreach ([...$TL->getConstructors()->by_id, ...$TL->getMethods()->by_id] as $constructor) {
         $predicate = $constructor['predicate'] ?? $constructor['method'];
+        if ($predicate === 'updateShortMessage' || $predicate === 'updateShortChatMessage' || $predicate === 'updateShortSentMessage') {
+            // Assume these are converted to message constructors by the client.
+            continue;
+        }
         $t = $constructor['type'];
         if (isset($stackTypes[$t])) {
             continue;
@@ -1036,22 +1040,22 @@ public function build(TLContext $tl): array
                 $stack[$pos] = $predicate;
                 $recurse($onStackEnd, $t, $stack, $stackTypes);
                 $found = true;
-                unset($stack[$pos]);
-                unset($stack[$posName]);
+                unset($stack[$pos], $stack[$posName]);
+
             }
         }
         unset($stackTypes[$t]);
     }
-    unset($stack[$pos]);
-    unset($stack[$posName]);
+    unset($stack[$pos], $stack[$posName]);
+
     if (!$found) {
         foreach (TLContext::getConstructorsOfType($TL, $type, true, true) as $method => $data) {
             $stack[$posName] = '';
             $stack[$pos] = $method;
             $onStackEnd($stack);
         }
-        unset($stack[$posName]);
-        unset($stack[$pos]);
+        unset($stack[$posName], $stack[$pos]);
+
     } elseif ($type === 'Update') {
         $onStackEnd($stack);
     }
@@ -1111,17 +1115,16 @@ public function build(TLContext $tl): array
     $stackTypes = [$type => true];
     $recurse(
         static function (array $stack) use ($locations, $TL, &$normalizedLocations): void {
-            if (array_intersect(
-                    [
-                        'updateShortSentMessage',
-                        'updateShortMessage',
-                        'updateShortChatMessage',
-                    ],
-                    $stack,
-                )
+            if (count($stack) >= 5 &&
+                $stack[count($stack)-1] === 'messages.getWebPagePreview' &&
+                $stack[count($stack)-2] === '' &&
+                $stack[count($stack)-3] === 'messages.webPagePreview' &&
+                $stack[count($stack)-4] === 'media' &&
+                $stack[count($stack)-5] !== 'messageMediaWebPage'
             ) {
                 return;
             }
+
             $slice = [];
             $had = false;
             $top = end($stack);
@@ -1153,4 +1156,4 @@ static function (array $stack) use ($locations, $TL, &$normalizedLocations): voi
     );
 }
 
-var_dump($normalizedLocations);
+var_dump($normalizedLocations);