Skip to content

Commit

Permalink
fixes #1 and fixes #4
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuliusPC
JuliusPC committed May 9, 2020
1 parent f9d28cd commit 63d85f4
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ $commands = [
'description'=>'stops bot'
]
];
$bot->setMyCommands(json_encode());
$bot->setMyCommands(json_encode($commands));
~~~

If you want to implement your own command, the easiest way to do this is extending the use `TelegramBot` class. In this little example we add a commad that echos the message:
Expand Down
71 changes: 44 additions & 27 deletions TelegramBot.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public function __construct(\PDO $dbh, string $token) {

$dbh->exec('DELETE FROM `tgnb_updates` WHERE `date_added` < '.$dbh->quote((time()- 3600*24*7)));

$dbh->exec('DELETE FROM `tgnb_messages` WHERE `date_added` < '.$dbh->quote((time()- 3600*24*7)));

$this->httpclient = new Client([
'base_uri' => 'https://api.telegram.org/bot'.$this->token.'/',
'timeout' => 2.0,
Expand Down Expand Up @@ -111,7 +113,9 @@ public function queryApi(string $endpoint, array $parameters = []) {
* @return bool success
*/
protected function removeId(string $id) : bool {
return $this->dbh->exec('DELETE FROM `tgnb_chats` WHERE `chat_id` = '.$this->dbh->quote($id));
$sth = $this->dbh->prepare('DELETE FROM `tgnb_chats` WHERE `chat_id` = ?');
$sth->bindValue(1, $id, \PDO::PARAM_STR);
return $sth->execute();
}

/**
Expand All @@ -124,10 +128,15 @@ protected function removeId(string $id) : bool {
public function sendBroadcastMessage(string $message, string $chosen_id) : int {
$count = 0;
$result = $this->dbh->query('SELECT `chat_id` FROM `tgnb_chats`');
$sth = $this->dbh->prepare('INSERT INTO `tgnb_messages` (`chat_id`, `message_id`, `date_added`, `chosen_id`)
VALUES (?, ?, ?, ?)');
while($row = $result->fetch(\PDO::FETCH_ASSOC)) {
if($message_id = $this->sendMessage($message, $row['chat_id'])) {
$this->dbh->exec('INSERT INTO `tgnb_messages` (`chat_id`, `message_id`, `date_added`, `chosen_id`)
VALUES ('.$this->dbh->quote($row['chat_id']).', '.$this->dbh->quote($message_id).', '.$this->dbh->quote(time()).', '.$this->dbh->quote($chosen_id).')');
$sth->bindValue(1, $row['chat_id'], \PDO::PARAM_STR);
$sth->bindValue(2, $message_id, \PDO::PARAM_STR);
$sth->bindValue(3, time(), \PDO::PARAM_INT);
$sth->bindValue(4, $chosen_id, \PDO::PARAM_STR);
$sth->execute();
$count++;
}
}
Expand Down Expand Up @@ -179,9 +188,11 @@ public function editMessageText(string $text, string $chat_id, string $message_i
* @return int Number of edited Messages
*/
public function editBroadcastMessage(string $message, string $chosen_id) : int{
$result = $this->dbh->query('SELECT `message_id`, `chat_id` FROM `tgnb_messages` WHERE `chosen_id` = '.$this->dbh->quote($chosen_id));
$sth = $this->dbh->prepare('SELECT `message_id`, `chat_id` FROM `tgnb_messages` WHERE `chosen_id` = ?');
$sth->bindValue(1, $chosen_id);
$sth->execute();
$counter = 0;
while($row = $result->fetch(\PDO::FETCH_ASSOC)) {
while($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
$counter += (int)$this->editMessageText($message, $row['chat_id'], $row['message_id']);
}
return $counter;
Expand All @@ -195,7 +206,10 @@ public function editBroadcastMessage(string $message, string $chosen_id) : int{
* @return bool true if message was deleted
*/
public function deleteMessage(string $chat_id, string $message_id) : bool {
return $this->queryApi('deleteMessage', compact('message_id', 'chat_id'));
$sth = $this->dbh->prepare('DELETE FROM `tgnb_messages` WHERE `chat_id` = ? AND `message_id` = ?');
$sth->bindValue(1, $chat_id, \PDO::PARAM_STR);
$sth->bindValue(2, $message_id, \PDO::PARAM_STR);
return $sth->execute() && $this->queryApi('deleteMessage', compact('message_id', 'chat_id'));
}

/**
Expand All @@ -205,11 +219,11 @@ public function deleteMessage(string $chat_id, string $message_id) : bool {
* @return int Number of deleted messages.
*/
public function deleteBroadcastMessage(string $chosen_id) : int {
$result = $this->dbh->query('SELECT `message_id`, `chat_id` FROM `tgnb_messages` WHERE `chosen_id` = '.$this->dbh->quote($chosen_id));
$sth = $this->dbh->prepare('SELECT `message_id`, `chat_id` FROM `tgnb_messages` WHERE `chosen_id` = ?');
$sth->bindValue(1, $chosen_id, \PDO::PARAM_STR);
$sth->execute();
$counter = 0;
while($row = $result->fetch(\PDO::FETCH_ASSOC)) {
$this->deleteMessage($row['chat_id'], $row['message_id']);
$this->dbh->query('DELETE FROM `tgnb_messages` WHERE `chat_id` = '.$this->dbh->quote($row['chat_id']).' AND `message_id` = '.$this->dbh->quote($row['message_id']));
while($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
$counter += (int)$this->deleteMessage($row['chat_id'], $row['message_id']);
}
return $counter;
Expand Down Expand Up @@ -246,12 +260,16 @@ public function processUpdates(string $update) : int {
* @return bool True if update was processed successful
*/
public function processUpdate(array $update) : bool {
$result = $this->dbh->exec('INSERT INTO `tgnb_updates`
(update_id, date_added, update_json)
VALUES
('.$this->dbh->quote($update['update_id']).', '.$this->dbh->quote(time()).', '.$this->dbh->quote(\json_encode($update, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)).')');
$sth = $this->dbh->prepare('INSERT INTO `tgnb_updates`
(update_id, date_added, update_json)
VALUES
(?, ?, ?)');
$sth->bindValue(1, $update['update_id'], \PDO::PARAM_STR);
$sth->bindValue(2, time(), \PDO::PARAM_INT);
$sth->bindValue(3, \json_encode($update, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT), \PDO::PARAM_STR);
$result = $sth->execute();
// update_id already exists, discard
if($result != 1) {
if(!$result) {
return true;
}
$id = $update['message']['chat']['id'];
Expand All @@ -262,11 +280,8 @@ public function processUpdate(array $update) : bool {
}
}
if(isset($update['message']['left_chat_member']) || isset($update['message']['left_chat_participant'])) {
if(
$update['message']['left_chat_member']['id'] == $this->id
||
$update['message']['left_chat_member']['id'] == $this->id
) {
if($update['message']['left_chat_member']['id'] == $this->id
|| $update['message']['left_chat_member']['id'] == $this->id) {
return $this->removeId($id);
}
}
Expand Down Expand Up @@ -317,13 +332,15 @@ public function getWebhookInfo() : string {
* @return bool success
*/
public function addIdIfNotExists(string $id, bool $silent = false) {
$result = $this->dbh->exec('INSERT INTO `tgnb_chats`
(chat_id, date_added)
VALUES
('.$this->dbh->quote($id).', '.$this->dbh->quote(time()).')'
);
$sth = $this->dbh->prepare('INSERT INTO `tgnb_chats`
(chat_id, date_added)
VALUES
(?, ?)');
$sth->bindValue(1, $id, \PDO::PARAM_STR);
$sth->bindValue(2, time(), \PDO::PARAM_INT);
$result = $sth->execute();
// if chat_id is new
if($result == 1) {
if($result) {
if (!$silent && !empty($this->welcome_message)) {
return $this->sendMessage($this->welcome_message, $this->dbh->lastInsertId());
}
Expand Down Expand Up @@ -377,7 +394,7 @@ protected function executeCommand(string $command, array $update) : bool {
* @param string $html HTML formatted input.
* @return string Stripped down to bare formatting HTML.
*/
public function sanitizeHTML(string $html) {
public function stripHTML(string $html) {
return \strip_tags($string, '<b><strong><i><em><u><ins><s><strike><del><a><code><pre>');
}
}

0 comments on commit 63d85f4

Please sign in to comment.