Skip to content

TelegramBot
TelegramBot
Unverified Commit 2acfa376 authored by Armando Lüscher's avatar Armando Lüscher
Browse files
Options

Fix typo and duplicate SQL statements, smaller DB field cleanup, more specific PDO exceptions.

parent 6351dc33
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 29 deletions
src/DB.php
View file @ 2acfa376
...@@ -549,7 +549,7 @@ class DB ...@@ -549,7 +549,7 @@ class DB
$shipping_query_id = $shipping_query->getId(); $shipping_query_id = $shipping_query->getId();
} elseif (($pre_checkout_query = $update->getPreCheckoutQuery()) && self::insertPreCheckoutQueryRequest($pre_checkout_query)) { } elseif (($pre_checkout_query = $update->getPreCheckoutQuery()) && self::insertPreCheckoutQueryRequest($pre_checkout_query)) {
$pre_checkout_query_id = $pre_checkout_query->getId(); $pre_checkout_query_id = $pre_checkout_query->getId();
} elseif (($poll = $update->getPoll()) && self::insertPoll($poll)) { } elseif (($poll = $update->getPoll()) && self::insertPollRequest($poll)) {
$poll_id = $poll->getId(); $poll_id = $poll->getId();
} else { } else {
return false; return false;
...@@ -844,7 +844,7 @@ class DB ...@@ -844,7 +844,7 @@ class DB
$sth->bindValue(':id', $poll->getId()); $sth->bindValue(':id', $poll->getId());
$sth->bindValue(':question', $poll->getQuestion()); $sth->bindValue(':question', $poll->getQuestion());
$sth->bindValue(':options', self::entitiesArrayToJson($poll->getOptions(), null)); $sth->bindValue(':options', self::entitiesArrayToJson($poll->getOptions()));
$sth->bindValue(':is_closed', $poll->getIsClosed()); $sth->bindValue(':is_closed', $poll->getIsClosed());
$sth->bindValue(':created_at', self::getTimestamp()); $sth->bindValue(':created_at', self::getTimestamp());
...@@ -922,20 +922,20 @@ class DB ...@@ -922,20 +922,20 @@ class DB
( (
`id`, `user_id`, `chat_id`, `date`, `forward_from`, `forward_from_chat`, `forward_from_message_id`, `id`, `user_id`, `chat_id`, `date`, `forward_from`, `forward_from_chat`, `forward_from_message_id`,
`forward_signature`, `forward_sender_name`, `forward_date`, `forward_signature`, `forward_sender_name`, `forward_date`,
`reply_to_chat`, `reply_to_message`, `media_group_id`, `text`, `entities`, `audio`, `document`, `reply_to_chat`, `reply_to_message`, `edit_date`, `media_group_id`, `author_signature`, `text`, `entities`, `caption_entities`,
`animation`, `game`, `photo`, `sticker`, `video`, `voice`, `video_note`, `caption`, `contact`, `audio`, `document`, `animation`, `game`, `photo`, `sticker`, `video`, `voice`, `video_note`, `caption`, `contact`,
`location`, `venue`, `poll`, `new_chat_members`, `left_chat_member`, `location`, `venue`, `poll`, `new_chat_members`, `left_chat_member`,
`new_chat_title`,`new_chat_photo`, `delete_chat_photo`, `group_chat_created`, `new_chat_title`, `new_chat_photo`, `delete_chat_photo`, `group_chat_created`,
`supergroup_chat_created`, `channel_chat_created`, `migrate_from_chat_id`, `migrate_to_chat_id`, `supergroup_chat_created`, `channel_chat_created`, `migrate_to_chat_id`, `migrate_from_chat_id`,
`pinned_message`, `invoice`, `successful_payment`, `connected_website`, `passport_data` `pinned_message`, `invoice`, `successful_payment`, `connected_website`, `passport_data`
) VALUES ( ) VALUES (
:message_id, :user_id, :chat_id, :date, :forward_from, :forward_from_chat, :forward_from_message_id, :message_id, :user_id, :chat_id, :date, :forward_from, :forward_from_chat, :forward_from_message_id,
:forward_signature, :forward_sender_name, :forward_date, :forward_signature, :forward_sender_name, :forward_date,
:reply_to_chat, :reply_to_message, :media_group_id, :text, :entities, :audio, :document, :reply_to_chat, :reply_to_message, :edit_date, :media_group_id, :author_signature, :text, :entities, :caption_entities,
:animation, :game, :photo, :sticker, :video, :voice, :video_note, :caption, :contact, :audio, :document, :animation, :game, :photo, :sticker, :video, :voice, :video_note, :caption, :contact,
:location, :venue, :poll, :new_chat_members, :left_chat_member, :location, :venue, :poll, :new_chat_members, :left_chat_member,
:new_chat_title, :new_chat_photo, :delete_chat_photo, :group_chat_created, :new_chat_title, :new_chat_photo, :delete_chat_photo, :group_chat_created,
:supergroup_chat_created, :channel_chat_created, :migrate_from_chat_id, :migrate_to_chat_id, :supergroup_chat_created, :channel_chat_created, :migrate_to_chat_id, :migrate_from_chat_id,
:pinned_message, :invoice, :successful_payment, :connected_website, :passport_data :pinned_message, :invoice, :successful_payment, :connected_website, :passport_data
) )
'); ');
...@@ -977,13 +977,13 @@ class DB ...@@ -977,13 +977,13 @@ class DB
$sth->bindValue(':media_group_id', $message->getMediaGroupId()); $sth->bindValue(':media_group_id', $message->getMediaGroupId());
$sth->bindValue(':author_signature', $message->getAuthorSignature()); $sth->bindValue(':author_signature', $message->getAuthorSignature());
$sth->bindValue(':text', $message->getText()); $sth->bindValue(':text', $message->getText());
$sth->bindValue(':entities', self::entitiesArrayToJson($message->getEntities(), null)); $sth->bindValue(':entities', self::entitiesArrayToJson($message->getEntities()));
$sth->bindValue(':caption_entities', self::entitiesArrayToJson($message->getCaptionEntities(), null)); $sth->bindValue(':caption_entities', self::entitiesArrayToJson($message->getCaptionEntities()));
$sth->bindValue(':audio', $message->getAudio()); $sth->bindValue(':audio', $message->getAudio());
$sth->bindValue(':document', $message->getDocument()); $sth->bindValue(':document', $message->getDocument());
$sth->bindValue(':animation', $message->getAnimation()); $sth->bindValue(':animation', $message->getAnimation());
$sth->bindValue(':game', $message->getGame()); $sth->bindValue(':game', $message->getGame());
$sth->bindValue(':photo', self::entitiesArrayToJson($message->getPhoto(), null)); $sth->bindValue(':photo', self::entitiesArrayToJson($message->getPhoto()));
$sth->bindValue(':sticker', $message->getSticker()); $sth->bindValue(':sticker', $message->getSticker());
$sth->bindValue(':video', $message->getVideo()); $sth->bindValue(':video', $message->getVideo());
$sth->bindValue(':voice', $message->getVoice()); $sth->bindValue(':voice', $message->getVoice());
...@@ -996,13 +996,13 @@ class DB ...@@ -996,13 +996,13 @@ class DB
$sth->bindValue(':new_chat_members', $new_chat_members_ids); $sth->bindValue(':new_chat_members', $new_chat_members_ids);
$sth->bindValue(':left_chat_member', $left_chat_member_id); $sth->bindValue(':left_chat_member', $left_chat_member_id);
$sth->bindValue(':new_chat_title', $message->getNewChatTitle()); $sth->bindValue(':new_chat_title', $message->getNewChatTitle());
$sth->bindValue(':new_chat_photo', self::entitiesArrayToJson($message->getNewChatPhoto(), null)); $sth->bindValue(':new_chat_photo', self::entitiesArrayToJson($message->getNewChatPhoto()));
$sth->bindValue(':delete_chat_photo', $message->getDeleteChatPhoto()); $sth->bindValue(':delete_chat_photo', $message->getDeleteChatPhoto());
$sth->bindValue(':group_chat_created', $message->getGroupChatCreated()); $sth->bindValue(':group_chat_created', $message->getGroupChatCreated());
$sth->bindValue(':supergroup_chat_created', $message->getSupergroupChatCreated()); $sth->bindValue(':supergroup_chat_created', $message->getSupergroupChatCreated());
$sth->bindValue(':channel_chat_created', $message->getChannelChatCreated()); $sth->bindValue(':channel_chat_created', $message->getChannelChatCreated());
$sth->bindValue(':migrate_from_chat_id', $message->getMigrateFromChatId());
$sth->bindValue(':migrate_to_chat_id', $message->getMigrateToChatId()); $sth->bindValue(':migrate_to_chat_id', $message->getMigrateToChatId());
$sth->bindValue(':migrate_from_chat_id', $message->getMigrateFromChatId());
$sth->bindValue(':pinned_message', $message->getPinnedMessage()); $sth->bindValue(':pinned_message', $message->getPinnedMessage());
$sth->bindValue(':invoice', $message->getInvoice()); $sth->bindValue(':invoice', $message->getInvoice());
$sth->bindValue(':successful_payment', $message->getSuccessfulPayment()); $sth->bindValue(':successful_payment', $message->getSuccessfulPayment());
...@@ -1059,7 +1059,7 @@ class DB ...@@ -1059,7 +1059,7 @@ class DB
$sth->bindValue(':user_id', $user_id); $sth->bindValue(':user_id', $user_id);
$sth->bindValue(':edit_date', $edit_date); $sth->bindValue(':edit_date', $edit_date);
$sth->bindValue(':text', $edited_message->getText()); $sth->bindValue(':text', $edited_message->getText());
$sth->bindValue(':entities', self::entitiesArrayToJson($edited_message->getEntities(), null)); $sth->bindValue(':entities', self::entitiesArrayToJson($edited_message->getEntities()));
$sth->bindValue(':caption', $edited_message->getCaption()); $sth->bindValue(':caption', $edited_message->getCaption());
return $sth->execute(); return $sth->execute();
...@@ -1216,7 +1216,7 @@ class DB ...@@ -1216,7 +1216,7 @@ class DB
$sth->execute(); $sth->execute();
return $sth->fetch(); return $sth->fetch();
} catch (Exception $e) { } catch (PDOException $e) {
throw new TelegramException($e->getMessage()); throw new TelegramException($e->getMessage());
} }
} }
...@@ -1252,7 +1252,7 @@ class DB ...@@ -1252,7 +1252,7 @@ class DB
$sth->bindValue(':created_at', self::getTimestamp()); $sth->bindValue(':created_at', self::getTimestamp());
return $sth->execute(); return $sth->execute();
} catch (Exception $e) { } catch (PDOException $e) {
throw new TelegramException($e->getMessage()); throw new TelegramException($e->getMessage());
} }
} }
...@@ -1295,7 +1295,7 @@ class DB ...@@ -1295,7 +1295,7 @@ class DB
$sql .= count($where) > 0 ? ' WHERE ' . implode(' AND ', $where) : ''; $sql .= count($where) > 0 ? ' WHERE ' . implode(' AND ', $where) : '';
return self::$pdo->prepare($sql)->execute($tokens); return self::$pdo->prepare($sql)->execute($tokens);
} catch (Exception $e) { } catch (PDOException $e) {
throw new TelegramException($e->getMessage()); throw new TelegramException($e->getMessage());
} }
} }
......
structure.sql
View file @ 2acfa376
...@@ -67,16 +67,6 @@ CREATE TABLE IF NOT EXISTS `chosen_inline_result` ( ...@@ -67,16 +67,6 @@ CREATE TABLE IF NOT EXISTS `chosen_inline_result` (
FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
CREATE TABLE IF NOT EXISTS `poll` (
`id` bigint UNSIGNED COMMENT 'Unique poll identifier',
`question` char(255) NOT NULL COMMENT 'Poll question',
`options` text NOT NULL COMMENT 'List of poll options',
`is_closed` tinyint(1) DEFAULT 0 COMMENT 'True, if the poll is closed',
`created_at` timestamp NULL DEFAULT NULL COMMENT 'Entry date creation',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
CREATE TABLE IF NOT EXISTS `message` ( CREATE TABLE IF NOT EXISTS `message` (
`chat_id` bigint COMMENT 'Unique chat identifier', `chat_id` bigint COMMENT 'Unique chat identifier',
`id` bigint UNSIGNED COMMENT 'Unique message identifier', `id` bigint UNSIGNED COMMENT 'Unique message identifier',
...@@ -110,7 +100,6 @@ CREATE TABLE IF NOT EXISTS `message` ( ...@@ -110,7 +100,6 @@ CREATE TABLE IF NOT EXISTS `message` (
`location` TEXT COMMENT 'Location object. Message is a shared location, information about the location', `location` TEXT COMMENT 'Location object. Message is a shared location, information about the location',
`venue` TEXT COMMENT 'Venue object. Message is a Venue, information about the Venue', `venue` TEXT COMMENT 'Venue object. Message is a Venue, information about the Venue',
`poll` TEXT COMMENT 'Poll object. Message is a native poll, information about the poll', `poll` TEXT COMMENT 'Poll object. Message is a native poll, information about the poll',
`caption` TEXT COMMENT 'For message with caption, the actual UTF-8 text of the caption',
`new_chat_members` TEXT COMMENT 'List of unique user identifiers, new member(s) were added to the group, information about them (one of these members may be the bot itself)', `new_chat_members` TEXT COMMENT 'List of unique user identifiers, new member(s) were added to the group, information about them (one of these members may be the bot itself)',
`left_chat_member` bigint NULL DEFAULT NULL COMMENT 'Unique user identifier, a member was removed from the group, information about them (this member may be the bot itself)', `left_chat_member` bigint NULL DEFAULT NULL COMMENT 'Unique user identifier, a member was removed from the group, information about them (this member may be the bot itself)',
`new_chat_title` CHAR(255) DEFAULT NULL COMMENT 'A chat title was changed to this value', `new_chat_title` CHAR(255) DEFAULT NULL COMMENT 'A chat title was changed to this value',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023