Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6134571

Browse filesBrowse files
alexsoftalexsoft
committed
[Notifier] Added support to answer Telegram callback queries
1 parent 69f46f2 commit 6134571
Copy full SHA for 6134571

File tree

Expand file treeCollapse file tree

5 files changed

+111
-4
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+111
-4
lines changed

‎src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.2
5+
---
6+
7+
* Added support to answer callback queries
8+
49
5.3
510
---
611

‎src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
+15Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,19 @@ public function edit(int $messageId): static
109109

110110
return $this;
111111
}
112+
113+
/**
114+
* @return $this
115+
*/
116+
public function answerCallbackQuery(string $callbackQueryId, bool $showAlert = false, int $cacheTime = 0): static
117+
{
118+
$this->options['callback_query_id'] = $callbackQueryId;
119+
$this->options['show_alert'] = $showAlert;
120+
121+
if ($cacheTime > 0) {
122+
$this->options['cache_time'] = $cacheTime;
123+
}
124+
125+
return $this;
126+
}
112127
}

‎src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
+23-4Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ protected function doSend(MessageInterface $message): SentMessage
8484
$options['text'] = preg_replace('/([_*\[\]()~`>#+\-=|{}.!])/', '\\\\$1', $message->getSubject());
8585
}
8686

87-
$path = isset($options['message_id']) ? 'editMessageText' : 'sendMessage';
88-
$endpoint = sprintf('https://%s/bot%s/%s', $this->getEndpoint(), $this->token, $path);
87+
$endpoint = sprintf('https://%s/bot%s/%s', $this->getEndpoint(), $this->token, $this->getPath($options));
8988

9089
$response = $this->client->request('POST', $endpoint, [
9190
'json' => array_filter($options),
@@ -100,14 +99,34 @@ protected function doSend(MessageInterface $message): SentMessage
10099
if (200 !== $statusCode) {
101100
$result = $response->toArray(false);
102101

103-
throw new TransportException('Unable to '.(isset($options['message_id']) ? 'edit' : 'post').' the Telegram message: '.$result['description'].sprintf(' (code %d).', $result['error_code']), $response);
102+
throw new TransportException('Unable to '.$this->getAction($options).' the Telegram message: '.$result['description'].sprintf(' (code %d).', $result['error_code']), $response);
104103
}
105104

106105
$success = $response->toArray(false);
107106

108107
$sentMessage = new SentMessage($message, (string) $this);
109-
$sentMessage->setMessageId($success['result']['message_id']);
108+
if (isset($success['result']['message_id'])) {
109+
$sentMessage->setMessageId($success['result']['message_id']);
110+
}
110111

111112
return $sentMessage;
112113
}
114+
115+
private function getPath(array $options): string
116+
{
117+
return match (true) {
118+
isset($options['message_id']) => 'editMessageText',
119+
isset($options['callback_query_id']) => 'answerCallbackQuery',
120+
default => 'sendMessage',
121+
};
122+
}
123+
124+
private function getAction(array $options): string
125+
{
126+
return match (true) {
127+
isset($options['message_id']) => 'edit',
128+
isset($options['callback_query_id']) => 'answer callback query',
129+
default => 'post',
130+
};
131+
}
113132
}

‎src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php

Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/*
6+
* This file is part of the Symfony package.
7+
*
8+
* (c) Fabien Potencier <fabien@symfony.com>
9+
*
10+
* For the full copyright and license information, please view the LICENSE
11+
* file that was distributed with this source code.
12+
*/
13+
14+
namespace Symfony\Component\Notifier\Bridge\Telegram\Tests;
15+
16+
use PHPUnit\Framework\TestCase;
17+
use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
18+
19+
final class TelegramOptionsTest extends TestCase
20+
{
21+
public function testAnswerCallbackQuery()
22+
{
23+
$sut = new TelegramOptions();
24+
25+
$returnedSut = $sut->answerCallbackQuery('123', true, 1);
26+
27+
$this->assertSame($sut, $returnedSut);
28+
$this->assertEquals(
29+
[
30+
'callback_query_id' => '123',
31+
'show_alert' => true,
32+
'cache_time' => 1,
33+
],
34+
$sut->toArray(),
35+
);
36+
}
37+
}

‎src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
+31Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,37 @@ public function testSendWithOptionForEditMessage()
193193
$transport->send(new ChatMessage('testMessage', $options));
194194
}
195195

196+
public function testSendWithOptionToAnswerCallbackQuery()
197+
{
198+
$response = $this->createMock(ResponseInterface::class);
199+
$response->expects($this->exactly(2))
200+
->method('getStatusCode')
201+
->willReturn(200);
202+
203+
$content = <<<JSON
204+
{
205+
"ok": true,
206+
"result": true
207+
}
208+
JSON;
209+
210+
$response->expects($this->once())
211+
->method('getContent')
212+
->willReturn($content)
213+
;
214+
215+
$client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
216+
$this->assertStringEndsWith('/answerCallbackQuery', $url);
217+
218+
return $response;
219+
});
220+
221+
$transport = $this->createTransport($client, 'testChannel');
222+
$options = (new TelegramOptions())->answerCallbackQuery('123', true, 1);
223+
224+
$transport->send(new ChatMessage('testMessage', $options));
225+
}
226+
196227
public function testSendWithChannelOverride()
197228
{
198229
$channelOverride = 'channelOverride';

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.