fixes

Author: danog

…etStickerSetFromDocumentAttributesOp.php …eRefExtractor/Ops/GetInputStickerSet.phptools/FileRefExtractor/Ops/GetStickerSetFromDocumentAttributesOp.php renamed to tools/FileRefExtractor/Ops/GetInputStickerSet.php tools/FileRefExtractor/Ops/GetStickerSetFromDocumentAttributesOp.php renamed to tools/FileRefExtractor/Ops/GetInputStickerSet.php

@@ -23,7 +23,7 @@
 use danog\MadelineProto\FileRefExtractor\TLContext;
 use Webmozart\Assert\Assert;
 
-final readonly class GetStickerSetFromDocumentAttributesOp implements FieldTransformationOp
+final readonly class GetInputStickerSet implements FieldTransformationOp
 {
     public function __construct(
         private Path $path,
@@ -49,13 +49,24 @@ public function getType(TLContext $tl): string
 
     public function build(TLContext $tl): array
     {
-        Assert::eq($this->path->getType($tl), 'Vector<DocumentAttribute>');
+        $t = $this->path->getType($tl);
+        if ($t === 'StickerSet') {
+            return [
+                '_' => 'typedOp',
+                'type' => 'InputStickerSet',
+                'op' => [
+                    '_' => 'copyOp',
+                    'path' => $this->path->buildPath($tl, 'extractInputStickerSetFromStickerSetAndStore'),
+                ],
+            ];
+        }
+        Assert::eq($t, 'Vector<DocumentAttribute>');
         return [
             '_' => 'typedOp',
             'type' => $this->getType($tl),
             'op' => [
                 '_' => 'copyOp',
-                'path' => $this->path->buildPath($tl, 'extractStickerSetFromDocumentAttributesAndStore'),
+                'path' => $this->path->buildPath($tl, 'extractInputStickerSetFromDocumentAttributesAndStore'),
             ],
         ];
     }

tools/FileRefExtractor/Path.php

@@ -124,9 +124,12 @@ public function buildPath(TLContext $tl, string $extractor): array
             $type = $this->getType($tl);
             if ($extractor === 'extractAndStore') {
 
-            } elseif ($extractor === 'extractStickerSetFromDocumentAttributesAndStore') {
+            } elseif ($extractor === 'extractInputStickerSetFromDocumentAttributesAndStore') {
                 Assert::eq($type, 'Vector<DocumentAttribute>');
                 $type = 'InputStickerSet';
+            } elseif ($extractor === 'extractInputStickerSetFromStickerSetAndStore') {
+                Assert::eq($type, 'StickerSet');
+                $type = 'InputStickerSet';
             } elseif ($extractor === 'extractPeerIdFromPeerAndStore') {
                 Assert::eq($type, 'Peer');
                 $type = 'long';

tools/FileRefExtractor/TLWrapper.php

@@ -18,6 +18,7 @@
 
 namespace danog\MadelineProto\FileRefExtractor;
 
+use danog\MadelineProto\TL\TL;
 use danog\MadelineProto\TL\TLInterface;
 use Webmozart\Assert\Assert;
 
@@ -27,7 +28,7 @@ final class TLWrapper
     private readonly array $methodsOfType;
 
     public function __construct(
-        public readonly TLInterface $tl,
+        public readonly TL $tl,
     ) {
         $constructorsOfType = [];
         $methodsOfType = [];

tools/gen_filerefmap.php

@@ -8,6 +8,7 @@
 use danog\MadelineProto\FileRefExtractor\Ops\CopyOp;
 use danog\MadelineProto\FileRefExtractor\Ops\GetInputChannelOp;
 use danog\MadelineProto\FileRefExtractor\Ops\GetInputPeerOp;
+use danog\MadelineProto\FileRefExtractor\Ops\GetInputStickerSet;
 use danog\MadelineProto\FileRefExtractor\Ops\GetInputUserOp;
 use danog\MadelineProto\FileRefExtractor\Ops\GetMessageOp;
 use danog\MadelineProto\FileRefExtractor\Ops\GetStickerSetFromDocumentAttributesOp;
@@ -319,13 +320,7 @@
     $locations[$c][] = new CallOp(
         'messages.getStickerSet',
         [
-            'stickerset' => new ConstructorOp(
-                'inputStickerSetID',
-                [
-                    'id' => new CopyOp([[$c, 'set'], ['stickerSet', 'id']]),
-                    'access_hash' => new CopyOp([[$c, 'set'], ['stickerSet', 'access_hash']]),
-                ],
-            ),
+            'stickerset' => new GetInputStickerSet(new Path([[$c, 'set']])),
             'hash' => new PrimitiveLiteralOp('int', 0),
         ],
         'fileSourceStickerSet'
@@ -334,13 +329,7 @@
 $locations['messages.stickerSet'][] = new CallOp(
     'messages.getStickerSet',
     [
-        'stickerset' => new ConstructorOp(
-            'inputStickerSetID',
-            [
-                'id' => new CopyOp([['messages.stickerSet', 'set'], ['stickerSet', 'id']]),
-                'access_hash' => new CopyOp([['messages.stickerSet', 'set'], ['stickerSet', 'access_hash']]),
-            ],
-        ),
+        'stickerset' => new GetInputStickerSet(new Path([['messages.stickerSet', 'set']])),
         'hash' => new PrimitiveLiteralOp('int', 0),
     ],
     'fileSourceStickerSet'
@@ -431,7 +420,7 @@
 $locations['document'][] = new CallOp(
     'messages.getStickerSet',
     [
-        'stickerset' => new GetStickerSetFromDocumentAttributesOp(new Path([['document', 'attributes']])),
+        'stickerset' => new GetInputStickerSet(new Path([['document', 'attributes']])),
         'hash' => new PrimitiveLiteralOp('int', 0),
     ],
     'fileSourceStickerSet'