danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2025-01-22 16:31:11 +01:00
Code Issues Projects Releases Wiki Activity

Allow inclusion of traits, interfaces in plugins, fix creation of sessions, improve addReaction/delReaction/getOurReactions methods

Browse Source
This commit is contained in:
Daniil Gentili 2023-07-26 17:36:53 +02:00
parent 34431630d9
commit 3d6186235f
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
12 changed files with 75 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs

@ -1 +1 @@
Subproject commit 84c66b69ecdb6407ce254f1d901a253f6b6c00a0
Subproject commit 8b4df61a4eee0d9783086bcc15014759ac927b03

13
examples/bot.php
View File

@ -32,6 +32,7 @@ use danog\MadelineProto\EventHandler\Message;
use danog\MadelineProto\EventHandler\Message\Service\DialogPhotoChanged;
use danog\MadelineProto\EventHandler\SimpleFilter\FromAdmin;
use danog\MadelineProto\EventHandler\SimpleFilter\Incoming;
use danog\MadelineProto\EventHandler\SimpleFilter\IsReply;
use danog\MadelineProto\Logger;
use danog\MadelineProto\ParseMode;
use danog\MadelineProto\Settings;
@ -239,6 +240,18 @@ class MyEventHandler extends SimpleEventHandler
$message->reply('test reply');
}
#[FilterCommand('react')]
public function reactCommand(Message&IsReply $message): void
{
$message->getReply(Message::class)->addReaction('👌');
}
#[FilterCommand('unreact')]
public function unreactCommand(Message&IsReply $message): void
{
$message->getReply(Message::class)->delReaction('👌');
}
#[FilterTextCaseInsensitive('hi')]
public function pingCommandCaseInsensitive(Message $message): void
{

3
langs/fa.json
View File

@ -152,5 +152,6 @@
"waveform_must_have_100_values": "آرایه waveformباید 100 مقدار داشته باشد(سایز مورد انتظار 100 است ) !",
"waveform_value": "مقدار عددیwaveform باید بین 0 تا 31 باشد!",
"could_not_convert_object": "نمیتوان مقدار آبجکت تایپ %s را تبدیل کرد",
"mmapErrorPart1": "بیشترین مقدار حافظه تخصیص داده شده (mmap ) پر شده است (%s ) : لطفا از داخل کانفیگ های مربوط به کرنل مقدار vm.max_map_count را به مقدار 262144 افزایش دهیدتا مشکل رفع گردد."
"mmapErrorPart1": "بیشترین مقدار حافظه تخصیص داده شده (mmap ) پر شده است (%s ) : لطفا از داخل کانفیگ های مربوط به کرنل مقدار vm.max_map_count را به مقدار 262144 افزایش دهیدتا مشکل رفع گردد.",
"could_not_connect_to_MadelineProto": "نمی توان به MadelineProto متصل شد، لطفاً proc_open را فعال کنید یا بازنویسی مسیر وب سرور را غیرفعال کنید تا مشکل رفع شود!"
}

2
src/API.php
View File

@ -51,7 +51,7 @@ final class API extends AbstractAPI
*
* @var string
*/
public const RELEASE = '8.0.0-beta125';
public const RELEASE = '8.0.0-beta126';
/**
* Secret chat was not found.
*

12
src/Connection.php
View File

@ -281,13 +281,13 @@ final class Connection
unset($this->new_outgoing[$message_id], $this->outgoing_messages[$message_id]);
}
}
Assert::true($this->writer->start());
Assert::true($this->reader->start());
Assert::true($this->checker->start());
Assert::true($this->cleanup->start());
Assert::true($this->waiter->start());
Assert::true($this->writer->start(), "Could not start writer stream");
Assert::true($this->reader->start(), "Could not start reader stream");
Assert::true($this->checker->start(), "Could not start checker stream");
Assert::true($this->cleanup->start(), "Could not start cleanup stream");
Assert::true($this->waiter->start(), "Could not start waiter stream");
if ($this->pinger) {
Assert::true($this->pinger->start());
Assert::true($this->pinger->start(), "Could not start pinger stream");
}
}
/**

6
src/EventHandler.php
View File

@ -410,7 +410,7 @@ abstract class EventHandler extends AbstractAPI
continue;
}
$class = $namespace.'\\'.$fileName;
if (!\class_exists($class)) {
if (!\class_exists($class) && !\interface_exists($class) && !\trait_exists($class) && !\enum_exists($class)) {
throw new AssertionError("$class was not defined when including $file!");
}
if ((new ReflectionClass($class))->getFileName() !== $file) {
@ -441,7 +441,9 @@ abstract class EventHandler extends AbstractAPI
$file = $path.\str_replace('\\', DIRECTORY_SEPARATOR, \substr($class, 14)).'.php';
if (\file_exists($file)) {
require $file;
Assert::classExists($class, "The $class class wasn't defined while including $file!");
if (!\class_exists($class) && !\interface_exists($class) && !\trait_exists($class) && !\enum_exists($class)) {
throw new AssertionError("$class was not defined when including $file!");
}
}
});

79
src/EventHandler/Message.php
View File

@ -26,7 +26,7 @@ abstract class Message extends AbstractMessage
public readonly string $message;
/** @var list<int|string> list of our message reactions */
protected ?array $reactions = [];
protected array $reactions = [];
/** Info about a forwarded message */
public readonly ?ForwardedInfo $fwdInfo;
@ -138,6 +138,13 @@ abstract class Message extends AbstractMessage
$this->commandArgs = null;
$this->commandType = null;
}
foreach ($rawMessage['reactions']['results'] ?? [] as $r) {
if (isset($r['chosen_order'])) {
// Todo: live synchronization using a message database...
$this->reactions []= $r['reaction']['emoticon'] ?? $r['reaction']['document_id'];
}
}
}
/**
@ -183,23 +190,12 @@ abstract class Message extends AbstractMessage
}
/**
* Get our reaction on message return null if message deleted.
* Get our reactions on the message.
*
* @return list<string|int>|null
* @return list<string|int>
*/
public function getReactions(): ?array
public function getOurReactions(): array
{
$myReactions = \array_filter(
$this->getClient()->methodCallAsyncRead(
'messages.getMessageReactionsList',
[
'peer' => $this->chatId,
'id' => $this->id
]
)['reactions'],
fn (array $r): bool => $r['my']
);
$this->reactions += \array_map(fn (array $r) => $r['reaction']['emoticon'] ?? $r['reaction']['document_id'], $myReactions);
return $this->reactions;
}
@ -209,49 +205,56 @@ abstract class Message extends AbstractMessage
* @param string|int $reaction reaction
* @param bool $big Whether a bigger and longer reaction should be shown
* @param bool $addToRecent Add this reaction to the recent reactions list.
*
* @return list<string|int>
*/
public function addReaction(int|string $reaction, bool $big = false, bool $addToRecent = true): ?Update
public function addReaction(int|string $reaction, bool $big = false, bool $addToRecent = true): array
{
$result = $this->getClient()->methodCallAsyncRead(
if (\in_array($reaction, $this->reactions, true)) {
return $this->reactions;
}
$this->getClient()->methodCallAsyncRead(
'messages.sendReaction',
[
'peer' => $this->chatId,
'msg_id' => $this->id,
'reaction' => match (\is_int($reaction)) {
true => [['_' => 'reactionCustomEmoji', 'document_id' => $reaction]],
default => [['_' => 'reactionEmoji', 'emoticon' => $reaction]]
},
'reaction' => \is_int($reaction)
? [['_' => 'reactionCustomEmoji', 'document_id' => $reaction]]
: [['_' => 'reactionEmoji', 'emoticon' => $reaction]],
'big' => $big,
'add_to_recent' => $addToRecent
]
);
$this->reactions[] = $reaction;
return $this->getClient()->wrapUpdate($result);
return $this->reactions;
}
/**
* Delete reaction from message.
*
* @param string|int $reaction string or int Reaction
*
* @return list<string|int>
*/
public function delReaction(int|string $reaction): ?Update
public function delReaction(int|string $reaction): array
{
$this->getReactions();
if (($key = \array_search($reaction, $this->reactions)) !== false) {
unset($this->reactions[$key]);
$r = \array_map(fn ($reactions) => \is_int($reactions) ? ['_' => 'reactionCustomEmoji', 'document_id' => $reactions] : ['_' => 'reactionEmoji', 'emoticon' => $reactions], $this->reactions);
$r[]= ['_' => 'reactionEmpty'];
$result = $this->getClient()->methodCallAsyncRead(
'messages.sendReaction',
[
'peer' => $this->chatId,
'msg_id' => $this->id,
'reaction' => $r,
]
);
return $this->getClient()->wrapUpdate($result);
$key = \array_search($reaction, $this->reactions, true);
if ($key === false) {
return $this->reactions;
}
return null;
unset($this->reactions[$key]);
$this->reactions = \array_values($this->reactions);
$r = \array_map(fn (string|int $r): array => \is_int($r) ? ['_' => 'reactionCustomEmoji', 'document_id' => $r] : ['_' => 'reactionEmoji', 'emoticon' => $r], $this->reactions);
$r[]= ['_' => 'reactionEmpty'];
$this->getClient()->methodCallAsyncRead(
'messages.sendReaction',
[
'peer' => $this->chatId,
'msg_id' => $this->id,
'reaction' => $r,
]
);
return $this->reactions;
}
protected readonly string $html;

3
src/Ipc/Runner/ProcessRunner.php
View File

@ -96,7 +96,8 @@ final class ProcessRunner extends RunnerAbstract
if (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
try {
$root = WebRunner::getAbsoluteRootDir();
} catch (Throwable) {}
} catch (Throwable) {
}
}
$envVars = \array_merge(
\array_filter($_SERVER, fn ($v, $k): bool => \is_string($v) && !\in_array($k, self::CGI_VARS, true), ARRAY_FILTER_USE_BOTH),

2
src/Lang.php
View File

@ -399,7 +399,7 @@ If you intentionally deleted this account, ignore this message.',
'call_error_3' => 'نمیتوان تماس %s را یافت و کامل کرد',
'cli_need_dl.php_link' => 'لطفا هنگام استفاده از getDownloadLink روی CLI (محیط ترمینال)، لینک اسکریپت دانلود را مشخص کنید!',
'constructor_not_found' => 'سازنده برای این نوع پیدا نشد: ',
'could_not_connect_to_MadelineProto' => 'Could not connect to MadelineProto, please enable proc_open or disable webserver path rewrites to fix!',
'could_not_connect_to_MadelineProto' => 'نمی توان به MadelineProto متصل شد، لطفاً proc_open را فعال کنید یا بازنویسی مسیر وب سرور را غیرفعال کنید تا مشکل رفع شود!',
'could_not_convert_object' => 'نمیتوان مقدار آبجکت تایپ %s را تبدیل کرد',
'deserialization_error' => 'مشکلی در سریال‌زدایی پیش آمد',
'dl.php_check_logs_make_sure_session_running' => 'هم ربات ایونت‌هندلر مدلین‌پروتو مرتبط و هم سرور IPC مدلین‌پروتو آفلاین هستند، لطفا لاگ‌ها را بررسی کنید و مطمئن شوید حداقل یکی از آنها در حال اجراست!',

2
src/MTProtoTools/PeerHandler.php
View File

@ -627,7 +627,7 @@ trait PeerHandler
}
if (\is_numeric($id)) {
$id = (int) $id;
Assert::true($id !== 0);
Assert::true($id !== 0, "An invalid ID was specified!");
if (!$this->chats[$id]) {
try {
$this->logger->logger("Try fetching {$id} with access hash 0");

2
src/Serialization.php
View File

@ -199,7 +199,7 @@ abstract class Serialization
} elseif (\is_subclass_of($class, EventHandler::class)) {
EventHandler::cachePlugins($class);
}
} else {
} elseif ($lightState) {
$class = $lightState->getEventHandler();
if ($class && !\class_exists($class)) {
// Have lock, can't use it

4
src/Stream/Proxy/HttpProxy.php
View File

@ -62,8 +62,8 @@ final class HttpProxy implements RawProxyStreamInterface, BufferedProxyStreamInt
}
$ctx->setUri('tcp://'.$this->extra['address'].':'.$this->extra['port'])->secure(false);
$this->stream = $ctx->getStream();
Assert::true($this->stream instanceof BufferedStreamInterface);
Assert::true($this->stream instanceof RawStreamInterface);
Assert::isInstanceOf($this->stream, BufferedStreamInterface::class);
Assert::isInstanceOf($this->stream, RawStreamInterface::class);
$address = $uri->getHost();
$port = $uri->getPort();
try {