danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-26 23:34:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix getFullInfo and getPwrChat for users
Some checks failed
ci/woodpecker/push/build Pipeline failed
Details
ci/woodpecker/tag/build Pipeline failed
Details
ci/woodpecker/tag/deploy unknown status
Details

Browse Source
This commit is contained in:
Daniil Gentili 2022-07-26 18:41:15 +02:00
parent ea7015d120
commit e654e40d08
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
8 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/danog/MadelineProto/AnnotationsBuilder.php
View File

@ -226,7 +226,11 @@ class AnnotationsBuilder
}
$name = StrTools::toCamelCase($name);
$name = \str_ireplace(['mtproto', 'api'], ['MTProto', 'API'], $name);
$doc = 'public function ';
$doc = 'public ';
if ($static) {
$doc .= 'static ';
}
$doc .= 'function ';
$doc .= $name;
$doc .= '(';
$paramList = '';

122
src/danog/MadelineProto/InternalDoc.php
View File

@ -5869,7 +5869,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function after($a, $b)
public static function after($a, $b)
{
return \danog\MadelineProto\Tools::after($a, $b);
}
@ -5881,7 +5881,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function all(array $promises)
public static function all(array $promises)
{
return \danog\MadelineProto\Tools::all($promises);
}
@ -5892,7 +5892,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function any(array $promises)
public static function any(array $promises)
{
return \danog\MadelineProto\Tools::any($promises);
}
@ -5903,7 +5903,7 @@ class InternalDoc extends APIFactory
*
* @return array
*/
public function arr(...$params): array
public static function arr(...$params): array
{
return \danog\MadelineProto\Tools::arr(...$params);
}
@ -5914,7 +5914,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function base64urlDecode(string $data): string
public static function base64urlDecode(string $data): string
{
return \danog\MadelineProto\Tools::base64urlDecode($data);
}
@ -5925,7 +5925,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function base64urlEncode(string $data): string
public static function base64urlEncode(string $data): string
{
return \danog\MadelineProto\Tools::base64urlEncode($data);
}
@ -5962,7 +5962,7 @@ class InternalDoc extends APIFactory
* @return \Amp\Promise
* @psalm-return Promise<TReturn>
*/
public function call($promise)
public static function call($promise)
{
return \danog\MadelineProto\Tools::call($promise);
}
@ -5977,7 +5977,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise|mixed
*/
public function callFork($promise, $actual = null, $file = '')
public static function callFork($promise, $actual = null, $file = '')
{
return \danog\MadelineProto\Tools::callFork($promise, $actual, $file);
}
@ -5988,7 +5988,7 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function callForkDefer($promise): void
public static function callForkDefer($promise): void
{
\danog\MadelineProto\Tools::callForkDefer($promise);
}
@ -6029,7 +6029,7 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function closeConnection($message)
public static function closeConnection($message)
{
return \danog\MadelineProto\Tools::closeConnection($message);
}
@ -6244,7 +6244,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function echo(string $string)
public static function echo(string $string)
{
return \danog\MadelineProto\Tools::echo($string);
}
@ -6255,7 +6255,7 @@ class InternalDoc extends APIFactory
*
* @return mixed
*/
public function end(array $what)
public static function end(array $what)
{
return \danog\MadelineProto\Tools::end($what);
}
@ -6277,7 +6277,7 @@ class InternalDoc extends APIFactory
*
* @return ?array
*/
public function extractBotAPIFile(array $info): ?array
public static function extractBotAPIFile(array $info): ?array
{
return \danog\MadelineProto\MTProto::extractBotAPIFile($info);
}
@ -6301,7 +6301,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function first(array $promises)
public static function first(array $promises)
{
return \danog\MadelineProto\Tools::first($promises);
}
@ -6317,7 +6317,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise<$token is null ? callable : ?callable>
*/
public function flock(string $file, int $operation, float $polling = 0.1, ?\Amp\Promise $token = null, $failureCb = null)
public static function flock(string $file, int $operation, float $polling = 0.1, ?\Amp\Promise $token = null, $failureCb = null)
{
return \danog\MadelineProto\Tools::flock($file, $operation, $polling, $token, $failureCb);
}
@ -6328,7 +6328,7 @@ class InternalDoc extends APIFactory
*
* @return int
*/
public function fromSupergroup($id): int
public static function fromSupergroup($id): int
{
return \danog\MadelineProto\MTProto::fromSupergroup($id);
}
@ -6359,7 +6359,7 @@ class InternalDoc extends APIFactory
*
* @return string Vector hash
*/
public function genVectorHash(array $ints): string
public static function genVectorHash(array $ints): string
{
return \danog\MadelineProto\Tools::genVectorHash($ints);
}
@ -6507,7 +6507,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getExtensionFromLocation($location, string $default): string
public static function getExtensionFromLocation($location, string $default): string
{
return \danog\MadelineProto\TL\Conversion\Extension::getExtensionFromLocation($location, $default);
}
@ -6518,7 +6518,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getExtensionFromMime(string $mime): string
public static function getExtensionFromMime(string $mime): string
{
return \danog\MadelineProto\TL\Conversion\Extension::getExtensionFromMime($mime);
}
@ -6540,7 +6540,7 @@ class InternalDoc extends APIFactory
*
* @return ?int
*/
public function getFolderId($id): ?int
public static function getFolderId($id): ?int
{
return \danog\MadelineProto\MTProto::getFolderId($id);
}
@ -6672,7 +6672,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getMimeFromBuffer(string $buffer): string
public static function getMimeFromBuffer(string $buffer): string
{
return \danog\MadelineProto\TL\Conversion\Extension::getMimeFromBuffer($buffer);
}
@ -6684,7 +6684,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getMimeFromExtension(string $extension, string $default): string
public static function getMimeFromExtension(string $extension, string $default): string
{
return \danog\MadelineProto\TL\Conversion\Extension::getMimeFromExtension($extension, $default);
}
@ -6695,7 +6695,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function getMimeFromFile(string $file): string
public static function getMimeFromFile(string $file): string
{
return \danog\MadelineProto\TL\Conversion\Extension::getMimeFromFile($file);
}
@ -6804,7 +6804,7 @@ class InternalDoc extends APIFactory
* @return mixed
* @access public
*/
public function getVar($obj, string $var)
public static function getVar($obj, string $var)
{
return \danog\MadelineProto\Tools::getVar($obj, $var);
}
@ -6880,7 +6880,7 @@ class InternalDoc extends APIFactory
* @return bool
* @access public
*/
public function hasVar($obj, string $var): bool
public static function hasVar($obj, string $var): bool
{
return \danog\MadelineProto\Tools::hasVar($obj, $var);
}
@ -6903,7 +6903,7 @@ class InternalDoc extends APIFactory
*
* @return string JPG payload
*/
public function inflateStripped(string $stripped): string
public static function inflateStripped(string $stripped): string
{
return \danog\MadelineProto\Tools::inflateStripped($stripped);
}
@ -6922,7 +6922,7 @@ class InternalDoc extends APIFactory
*
* @return boolean
*/
public function isAltervista(): bool
public static function isAltervista(): bool
{
return \danog\MadelineProto\Tools::isAltervista();
}
@ -6933,7 +6933,7 @@ class InternalDoc extends APIFactory
*
* @return boolean
*/
public function isArrayOrAlike($var): bool
public static function isArrayOrAlike($var): bool
{
return \danog\MadelineProto\Tools::isArrayOrAlike($var);
}
@ -6971,7 +6971,7 @@ class InternalDoc extends APIFactory
*
* @return boolean
*/
public function isSupergroup($id): bool
public static function isSupergroup($id): bool
{
return \danog\MadelineProto\MTProto::isSupergroup($id);
}
@ -7025,7 +7025,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function markdownEscape(string $hwat): string
public static function markdownEscape(string $hwat): string
{
return \danog\MadelineProto\StrTools::markdownEscape($hwat);
}
@ -7035,9 +7035,9 @@ class InternalDoc extends APIFactory
* @param string $text Text
* @param integer $length Length
*
* @return array
* @return array<string>
*/
public function mbStrSplit(string $text, int $length): array
public static function mbStrSplit(string $text, int $length): array
{
return \danog\MadelineProto\StrTools::mbStrSplit($text, $length);
}
@ -7048,7 +7048,7 @@ class InternalDoc extends APIFactory
*
* @return float|int
*/
public function mbStrlen(string $text)
public static function mbStrlen(string $text)
{
return \danog\MadelineProto\StrTools::mbStrlen($text);
}
@ -7061,7 +7061,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function mbSubstr(string $text, int $offset, $length = null): string
public static function mbSubstr(string $text, int $offset, $length = null): string
{
return \danog\MadelineProto\StrTools::mbSubstr($text, $offset, $length);
}
@ -7110,7 +7110,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function methodEscape(string $method): string
public static function methodEscape(string $method): string
{
return \danog\MadelineProto\StrTools::methodEscape($method);
}
@ -7121,7 +7121,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function packDouble(float $value): string
public static function packDouble(float $value): string
{
return \danog\MadelineProto\Tools::packDouble($value);
}
@ -7132,7 +7132,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function packSignedInt(int $value): string
public static function packSignedInt(int $value): string
{
return \danog\MadelineProto\Tools::packSignedInt($value);
}
@ -7143,7 +7143,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function packSignedLong(int $value): string
public static function packSignedLong(int $value): string
{
return \danog\MadelineProto\Tools::packSignedLong($value);
}
@ -7154,7 +7154,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function packUnsignedInt(int $value): string
public static function packUnsignedInt(int $value): string
{
return \danog\MadelineProto\Tools::packUnsignedInt($value);
}
@ -7192,7 +7192,7 @@ class InternalDoc extends APIFactory
*
* @return int Modulo
*/
public function posmod(int $a, int $b): int
public static function posmod(int $a, int $b): int
{
return \danog\MadelineProto\Tools::posmod($a, $b);
}
@ -7203,7 +7203,7 @@ class InternalDoc extends APIFactory
*
* @return string Random string
*/
public function random(int $length): string
public static function random(int $length): string
{
return \danog\MadelineProto\Tools::random($length);
}
@ -7214,7 +7214,7 @@ class InternalDoc extends APIFactory
*
* @return int
*/
public function randomInt(int $modulus = 0): int
public static function randomInt(int $modulus = 0): int
{
return \danog\MadelineProto\Tools::randomInt($modulus);
}
@ -7225,7 +7225,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise<string>
*/
public function readLine(string $prompt = '')
public static function readLine(string $prompt = '')
{
return \danog\MadelineProto\Tools::readLine($prompt);
}
@ -7334,7 +7334,7 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function rethrow(\Throwable $e, $file = ''): void
public static function rethrow(\Throwable $e, $file = ''): void
{
\danog\MadelineProto\Tools::rethrow($e, $file);
}
@ -7345,7 +7345,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function rleDecode(string $string): string
public static function rleDecode(string $string): string
{
return \danog\MadelineProto\Tools::rleDecode($string);
}
@ -7356,7 +7356,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function rleEncode(string $string): string
public static function rleEncode(string $string): string
{
return \danog\MadelineProto\Tools::rleEncode($string);
}
@ -7379,7 +7379,7 @@ class InternalDoc extends APIFactory
*
* @return void
*/
public function serializeAll(): void
public static function serializeAll(): void
{
\danog\MadelineProto\MTProto::serializeAll();
}
@ -7440,7 +7440,7 @@ class InternalDoc extends APIFactory
*
* @access public
*/
public function setVar($obj, string $var, &$val): void
public static function setVar($obj, string $var, &$val): void
{
\danog\MadelineProto\Tools::setVar($obj, $var, $val);
}
@ -7486,7 +7486,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function sleep($time)
public static function sleep($time)
{
return \danog\MadelineProto\Tools::sleep($time);
}
@ -7498,7 +7498,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function some(array $promises)
public static function some(array $promises)
{
return \danog\MadelineProto\Tools::some($promises);
}
@ -7563,7 +7563,7 @@ class InternalDoc extends APIFactory
*
* @return \Amp\Promise
*/
public function timeout($promise, int $timeout)
public static function timeout($promise, int $timeout)
{
return \danog\MadelineProto\Tools::timeout($promise, $timeout);
}
@ -7589,7 +7589,7 @@ class InternalDoc extends APIFactory
*
* @throws \TypeError If $promise is not an instance of \Amp\Promise, \Generator or \React\Promise\PromiseInterface.
*/
public function timeoutWithDefault($promise, int $timeout, $default = null)
public static function timeoutWithDefault($promise, int $timeout, $default = null)
{
return \danog\MadelineProto\Tools::timeoutWithDefault($promise, $timeout, $default);
}
@ -7600,7 +7600,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function toCamelCase(string $input): string
public static function toCamelCase(string $input): string
{
return \danog\MadelineProto\StrTools::toCamelCase($input);
}
@ -7611,7 +7611,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function toSnakeCase(string $input): string
public static function toSnakeCase(string $input): string
{
return \danog\MadelineProto\StrTools::toSnakeCase($input);
}
@ -7622,7 +7622,7 @@ class InternalDoc extends APIFactory
*
* @return int
*/
public function toSupergroup($id): int
public static function toSupergroup($id): int
{
return \danog\MadelineProto\MTProto::toSupergroup($id);
}
@ -7633,7 +7633,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function typeEscape(string $type): string
public static function typeEscape(string $type): string
{
return \danog\MadelineProto\StrTools::typeEscape($type);
}
@ -7644,7 +7644,7 @@ class InternalDoc extends APIFactory
*
* @return float
*/
public function unpackDouble(string $value): float
public static function unpackDouble(string $value): float
{
return \danog\MadelineProto\Tools::unpackDouble($value);
}
@ -7667,7 +7667,7 @@ class InternalDoc extends APIFactory
*
* @return integer
*/
public function unpackSignedInt(string $value): int
public static function unpackSignedInt(string $value): int
{
return \danog\MadelineProto\Tools::unpackSignedInt($value);
}
@ -7678,7 +7678,7 @@ class InternalDoc extends APIFactory
*
* @return integer
*/
public function unpackSignedLong(string $value): int
public static function unpackSignedLong(string $value): int
{
return \danog\MadelineProto\Tools::unpackSignedLong($value);
}
@ -7689,7 +7689,7 @@ class InternalDoc extends APIFactory
*
* @return string
*/
public function unpackSignedLongString($value): string
public static function unpackSignedLongString($value): string
{
return \danog\MadelineProto\Tools::unpackSignedLongString($value);
}
@ -7852,7 +7852,7 @@ class InternalDoc extends APIFactory
*
* @return mixed
*/
public function wait($promise, $ignoreSignal = false)
public static function wait($promise, $ignoreSignal = false)
{
return \danog\MadelineProto\Tools::wait($promise, $ignoreSignal);
}

2
src/danog/MadelineProto/MTProtoTools/PeerHandler.php
View File

@ -871,7 +871,7 @@ trait PeerHandler
switch ($partial['type']) {
case 'user':
case 'bot':
$full = yield from $this->methodCallAsyncRead('users.getFullUser', ['id' => $partial['InputUser']]);
$full = (yield from $this->methodCallAsyncRead('users.getFullUser', ['id' => $partial['InputUser']]))['full_user'];
break;
case 'chat':
$full = (yield from $this->methodCallAsyncRead('messages.getFullChat', $partial))['full_chat'];

10
src/danog/MadelineProto/StrTools.php
View File

@ -58,9 +58,9 @@ abstract class StrTools extends Extension
*/
public static function mbSubstr(string $text, int $offset, $length = null): string
{
return mb_convert_encoding(
substr(
mb_convert_encoding($text, 'UTF-16'),
return \mb_convert_encoding(
\substr(
\mb_convert_encoding($text, 'UTF-16'),
$offset<<1,
$length === null ? null : ($length<<1)
),
@ -79,8 +79,8 @@ abstract class StrTools extends Extension
public static function mbStrSplit(string $text, int $length): array
{
$result = [];
foreach (str_split(mb_convert_encoding($text, 'UTF-16'), $length<<1) as $chunk) {
$result []= mb_convert_encoding($chunk, 'UTF-8', 'UTF-16');
foreach (\str_split(\mb_convert_encoding($text, 'UTF-16'), $length<<1) as $chunk) {
$result []= \mb_convert_encoding($chunk, 'UTF-8', 'UTF-16');
}
return $result;
}

4
src/danog/MadelineProto/TL/Conversion/BotAPI.php
View File

@ -21,7 +21,7 @@ namespace danog\MadelineProto\TL\Conversion;
use danog\Decoder\FileId;
use danog\MadelineProto\Logger;
use danog\MadelineProto\MTProtoTools\PeerHandler;
use danog\MadelineProto\MTProto;
use danog\MadelineProto\StrTools;
use danog\MadelineProto\Tools;
@ -171,7 +171,7 @@ trait BotAPI
}
if (isset($data['fwd_from']['channel_id'])) {
try {
$newd['forward_from_chat'] = yield from $this->getPwrChat(PeerHandler::toSupergroup($data['fwd_from']['channel_id']));
$newd['forward_from_chat'] = yield from $this->getPwrChat(MTProto::toSupergroup($data['fwd_from']['channel_id']));
} catch (\Throwable $e) {
}
}

4
src/danog/MadelineProto/TL/Conversion/BotAPIFiles.php
View File

@ -24,7 +24,7 @@ use danog\Decoder\PhotoSizeSource\PhotoSizeSourceDialogPhoto;
use danog\Decoder\PhotoSizeSource\PhotoSizeSourceLegacy;
use danog\Decoder\PhotoSizeSource\PhotoSizeSourceStickersetThumbnail;
use danog\Decoder\PhotoSizeSource\PhotoSizeSourceThumbnail;
use danog\MadelineProto\MTProtoTools\PeerHandler;
use danog\MadelineProto\API;
use const danog\Decoder\ANIMATION;
use const danog\Decoder\AUDIO;
@ -102,7 +102,7 @@ trait BotAPIFiles
if ($photoSize->getDialogId() < 0) {
$res['Chat'] = [
'_' => $photoSize->getDialogId() < -1000000000000 ? 'channel' : 'chat',
'id' => $photoSize->getDialogId() < -1000000000000 ? PeerHandler::fromSupergroup($photoSize->getDialogId()) : -$photoSize->getDialogId(),
'id' => $photoSize->getDialogId() < -1000000000000 ? API::fromSupergroup($photoSize->getDialogId()) : -$photoSize->getDialogId(),
'access_hash' => $photoSize->getDialogAccessHash(),
'photo' => [
'_' => 'chatPhoto',

5
tests/danog/MadelineProto/FileIdTest.php
View File

@ -105,7 +105,8 @@ class FileIdTest extends TestCase
public function testDownload(string $type, string $fileIdStr, string $uniqueFileIdStr, array $fullInfo)
{
self::$MadelineProto->logger("Trying to download $fileIdStr");
self::$MadelineProto->downloadToFile($fileIdStr, '/dev/null');
self::$MadelineProto->downloadToFile($fileIdStr, "/tmp/$fileIdStr");
\unlink("/tmp/$fileIdStr");
$this->assertTrue(true);
}
/**
@ -237,7 +238,7 @@ class FileIdTest extends TestCase
}
public function provideChats(): array
{
return [\getenv('DEST'), '@MadelineProto', -559184257];
return [\getenv('DEST'), '@MadelineProto'];
}
public function provideUrls(): array
{

4
tests/testing.php
View File

@ -257,8 +257,8 @@ $MadelineProto->loop(function () use ($MadelineProto) {
if (!\getenv('TEST_USERNAME')) {
throw new Exception('No TEST_USERNAME environment variable was provided!');
}
yield $MadelineProto->refreshPeerCache(\getenv('TEST_USERNAME'));
yield $MadelineProto->refreshFullPeerCache(\getenv('TEST_USERNAME'));
/*yield $MadelineProto->refreshPeerCache(\getenv('TEST_USERNAME'));
yield $MadelineProto->refreshFullPeerCache(\getenv('TEST_USERNAME'));*/
$mention = yield $MadelineProto->getInfo(\getenv('TEST_USERNAME')); // Returns an array with all of the constructors that can be extracted from a username or an id
$mention = $mention['user_id']; // Selects only the numeric user id
$media = [];