danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-27 03:14:39 +01:00
Code Issues Projects Releases Wiki Activity

add editReplyMarkup, Improve logic

Browse Source
This commit is contained in:
AhJ 2023-12-31 23:04:46 +03:30
parent 0898d7cc68
commit 44f3f81282
1 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/EventHandler/Message.php
View File

@ -16,23 +16,23 @@
namespace danog\MadelineProto\EventHandler;
use danog\MadelineProto\EventHandler\Keyboard\InlineKeyboard;
use danog\MadelineProto\EventHandler\Keyboard\ReplyKeyboard;
use danog\MadelineProto\EventHandler\Media\Audio;
use danog\MadelineProto\EventHandler\Media\Document;
use danog\MadelineProto\EventHandler\Media\DocumentPhoto;
use danog\MadelineProto\EventHandler\Media\Gif;
use danog\MadelineProto\EventHandler\Media\MaskSticker;
use danog\MadelineProto\EventHandler\Media\Photo;
use danog\MadelineProto\EventHandler\Media\RoundVideo;
use danog\MadelineProto\EventHandler\Media\Sticker;
use danog\MadelineProto\EventHandler\Media\Video;
use danog\MadelineProto\EventHandler\Media\Voice;
use danog\MadelineProto\EventHandler\Message\Entities\MessageEntity;
use danog\MadelineProto\EventHandler\Message\ReportReason;
use danog\MadelineProto\MTProto;
use danog\MadelineProto\ParseMode;
use danog\MadelineProto\StrTools;
use danog\MadelineProto\ParseMode;
use danog\MadelineProto\EventHandler\Media\Gif;
use danog\MadelineProto\EventHandler\Media\Audio;
use danog\MadelineProto\EventHandler\Media\Voice;
use danog\MadelineProto\EventHandler\Media\Video;
use danog\MadelineProto\EventHandler\Media\Photo;
use danog\MadelineProto\EventHandler\Media\Sticker;
use danog\MadelineProto\EventHandler\Media\Document;
use danog\MadelineProto\EventHandler\Media\RoundVideo;
use danog\MadelineProto\EventHandler\Media\MaskSticker;
use danog\MadelineProto\EventHandler\Media\DocumentPhoto;
use danog\MadelineProto\EventHandler\Message\ReportReason;
use danog\MadelineProto\EventHandler\Keyboard\ReplyKeyboard;
use danog\MadelineProto\EventHandler\Keyboard\InlineKeyboard;
use danog\MadelineProto\EventHandler\Message\Entities\MessageEntity;
/**
* Represents an incoming or outgoing message.
@ -50,8 +50,10 @@ abstract class Message extends AbstractMessage
/** Bot command (if present) */
public readonly ?string $command;
/** Bot command type (if present) */
public readonly ?CommandType $commandType;
/** @var list<string> Bot command arguments (if present) */
public readonly ?array $commandArgs;
@ -94,8 +96,10 @@ abstract class Message extends AbstractMessage
/** View counter for messages from channels or forwarded from channels */
public readonly ?int $views;
/** Forward counter for messages from channels or forwarded from channels */
public readonly ?int $forwards;
/** Author of the post, if signatures are enabled for messages from channels or forwarded from channels */
public readonly ?string $signature;
@ -126,18 +130,20 @@ abstract class Message extends AbstractMessage
$this->forwards = $rawMessage['forwards'] ?? null;
$this->signature = $rawMessage['post_author'] ?? null;
$this->groupedId = $rawMessage['grouped_id'] ?? null;
$this->entities = MessageEntity::fromRawEntities($rawMessage['entities'] ?? []);
$this->editDate = $rawMessage['edit_date'] ?? null;
$this->message = $rawMessage['message'];
$this->fromScheduled = $rawMessage['from_scheduled'] ?? false;
$this->entities = MessageEntity::fromRawEntities($rawMessage['entities'] ?? []);
$this->viaBotId = $rawMessage['via_bot_id'] ??
(isset($rawMessage['via_bot_name']) ? $this->getClient()->getId($rawMessage['via_bot_name']) : null);
$this->editDate = $rawMessage['edit_date'] ?? null;
$this->keyboard = isset($rawMessage['reply_markup'])
? Keyboard::fromRawReplyMarkup($rawMessage['reply_markup'])
: null;
if (isset($rawMessage['fwd_from'])) {
if (isset($rawMessage['fwd_from']))
{
$fwdFrom = $rawMessage['fwd_from'];
$this->fwdInfo = new ForwardedInfo(
$fwdFrom['date'],
@ -164,19 +170,14 @@ abstract class Message extends AbstractMessage
? $API->wrapMedia($rawMessage['media'], $this->protected)
: null;
if (\in_array($this->message[0] ?? '', ['/', '.', '!'], true)) {
$space = strpos($this->message, ' ', 1) ?: \strlen($this->message);
$this->command = substr($this->message, 1, $space-1);
$args = explode(
' ',
substr($this->message, $space+1)
);
if ($this->commandType = CommandType::tryFrom($this->message[0] ?? '')) {
$space = \strpos($this->message, ' ', 1) ?: \strlen($this->message);
$args = \explode(' ', \substr($this->message, $space+1));
$this->command = \substr($this->message, 1, $space-1);
$this->commandArgs = $args === [''] ? [] : $args;
$this->commandType = CommandType::from($this->message[0]);
} else {
$this->command = null;
$this->commandArgs = null;
$this->commandType = null;
}
foreach ($rawMessage['reactions']['results'] ?? [] as $r) {
@ -425,6 +426,24 @@ abstract class Message extends AbstractMessage
return $this->getClient()->wrapMessage($this->getClient()->extractMessage($result));
}
/**
* Edit message keyboard.
*
* @param array $replyMarkup Reply markup for inline keyboards
*/
public function editReplyMarkup(array $replyMarkup): Message
{
$result = $this->getClient()->methodCallAsyncRead(
'messages.editMessage',
[
'peer' => $this->chatId,
'id' => $this->id,
'reply_markup' => $replyMarkup,
],
);
return $this->getClient()->wrapMessage($this->getClient()->extractMessage($result));
}
/**
* If the message is outgoing, will edit the message's text, otherwise will reply to the message.
*