Nosial/tgbotlib
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 6 Packages Wiki Activity Actions

Enhance reply_markup handling and add SendPaidMedia method.

Browse source
This commit is contained in:
netkas 2024-10-09 15:25:19 -04:00
parent b58943c7c2
commit 744771445e
8 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/TgBotLib/Enums/Methods.php
View file

@ -16,6 +16,7 @@
use TgBotLib\Methods\SendAudio; use TgBotLib\Methods\SendAudio;
use TgBotLib\Methods\SendDocument; use TgBotLib\Methods\SendDocument;
use TgBotLib\Methods\SendMessage; use TgBotLib\Methods\SendMessage;
use TgBotLib\Methods\SendPaidMedia;
use TgBotLib\Methods\SendPhoto; use TgBotLib\Methods\SendPhoto;
use TgBotLib\Methods\SendVideo; use TgBotLib\Methods\SendVideo;
use TgBotLib\Methods\SendVideoNote; use TgBotLib\Methods\SendVideoNote;
@ -38,6 +39,7 @@
case SEND_ANIMATION = 'sendAnimation'; case SEND_ANIMATION = 'sendAnimation';
case SEND_VOICE = 'sendVoice'; case SEND_VOICE = 'sendVoice';
case SEND_VIDEO_NOTE = 'sendVideoNote'; case SEND_VIDEO_NOTE = 'sendVideoNote';
case SEND_PAID_MEDIA = 'sendPaidMedia';
/** /**
* Executes a command on the provided bot with the given parameters. * Executes a command on the provided bot with the given parameters.
@ -65,7 +67,8 @@
self::SEND_VIDEO => SendVideo::execute($bot, $parameters), self::SEND_VIDEO => SendVideo::execute($bot, $parameters),
self::SEND_ANIMATION => SendAnimation::execute($bot, $parameters), self::SEND_ANIMATION => SendAnimation::execute($bot, $parameters),
self::SEND_VOICE => SendVoice::execute($bot, $parameters), self::SEND_VOICE => SendVoice::execute($bot, $parameters),
self::SEND_VIDEO_NOTE => SendVideoNote::execute($bot, $parameters) self::SEND_VIDEO_NOTE => SendVideoNote::execute($bot, $parameters),
self::SEND_PAID_MEDIA => SendPaidMedia::execute($bot, $parameters),
}; };
} }
} }

11
src/TgBotLib/Methods/CopyMessage.php
View file

@ -58,9 +58,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }

11
src/TgBotLib/Methods/SendAnimation.php
View file

@ -48,9 +48,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
// Handle different photo input types // Handle different photo input types

11
src/TgBotLib/Methods/SendAudio.php
View file

@ -56,9 +56,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
// Handle file uploads // Handle file uploads

11
src/TgBotLib/Methods/SendDocument.php
View file

@ -53,9 +53,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
// Handle file uploads // Handle file uploads

11
src/TgBotLib/Methods/SendMessage.php
View file

@ -60,9 +60,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
return Message::fromArray(self::executeCurl(self::buildPost($bot, Methods::SEND_MESSAGE->value, $parameters))); return Message::fromArray(self::executeCurl(self::buildPost($bot, Methods::SEND_MESSAGE->value, $parameters)));

11
src/TgBotLib/Methods/SendPhoto.php
View file

@ -53,9 +53,16 @@
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
// Handle different photo input types // Handle different photo input types

11
src/TgBotLib/Methods/SendVideo.php
View file

@ -54,9 +54,16 @@ class SendVideo extends Method
$parameters['reply_parameters'] = $parameters['reply_parameters']->toArray(); $parameters['reply_parameters'] = $parameters['reply_parameters']->toArray();
} }
if(isset($parameters['reply_markup']) && $parameters['reply_markup'] instanceof ObjectTypeInterface) if (isset($parameters['reply_markup']))
{ {
$parameters['reply_markup'] = $parameters['reply_markup']->toArray(); if ($parameters['reply_markup'] instanceof ObjectTypeInterface)
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']->toArray());
}
elseif (is_array($parameters['reply_markup']))
{
$parameters['reply_markup'] = json_encode($parameters['reply_markup']);
}
} }
// Handle file uploads // Handle file uploads