Compare commits

..

No commits in common. "1a4db8d2c5879ebc63cb0a4b58ff35a92507fe72" and "0176c385e9e74081f343985d9944f591aa859fd6" have entirely different histories.

2 changed files with 8 additions and 21 deletions

26
bot.py
View File

@ -13,27 +13,15 @@ logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - \
def get_callback_id(db): def get_callback_id(db):
cursor = db.cursor() cursor = db.cursor()
query = ('SELECT max(callback) FROM message_ids') query = ('SELECT max(callback) FROM poll')
cursor.execute(query) cursor.execute(query)
return int(cursor.fetchone()[0]) + 1 return int(cursor.fetchone()[0]) + 1
def add_message_id(db, message_id, callback): def add_vote(db, callback_id, user_id):
cursor = db.cursor() cursor = db.cursor()
query = ("INSERT INTO message_ids(callback, message_id) values(?,?)") query = ("INSERT INTO poll(callback, user_id) values(?,?)")
cursor.execute(query, (callback, message_id)) cursor.execute(query, (callback_id, user_id))
db.commit()
def add_vote(db, callback_id, user=None):
user_id = user.id
name = str(user.first_name)
if user.last_name:
name += " " + str(user.last_name)
cursor = db.cursor()
query = ("INSERT INTO poll(callback, user_id, name) values(?,?,?)")
cursor.execute(query, (callback_id, user_id, name))
db.commit() db.commit()
@ -41,13 +29,13 @@ def post(bot, update, db):
chat_id = update.message.chat_id chat_id = update.message.chat_id
if chat_id in config.allowed_users: if chat_id in config.allowed_users:
callback_id = get_callback_id(db) callback_id = get_callback_id(db)
add_vote(db, callback_id, 0)
photo = update.message.photo[0] photo = update.message.photo[0]
file_id = photo.file_id file_id = photo.file_id
keyboard = InlineKeyboardMarkup([[InlineKeyboardButton(text="❤️", keyboard = InlineKeyboardMarkup([[InlineKeyboardButton(text="❤️",
callback_data=callback_id)]]) callback_data=callback_id)]])
reply = bot.send_photo(chat_id=config.channel_id, photo=file_id, bot.send_photo(chat_id=config.channel_id, photo=file_id,
reply_markup=keyboard) reply_markup=keyboard)
add_message_id(db, reply.message_id, callback_id)
else: else:
bot.send_message(chat_id=chat_id, text="Not Authorized") bot.send_message(chat_id=chat_id, text="Not Authorized")

View File

@ -1,3 +1,2 @@
CREATE TABLE IF NOT EXISTS poll(callback int NOT NULL, user_id int, name varchar, UNIQUE(callback, user_id)); CREATE TABLE IF NOT EXISTS poll(callback int NOT NULL, user_id int, name varchar, UNIQUE(callback, user_id));
CREATE TABLE IF NOT EXISTS message_ids(callback int PRIMARY KEY, message_id int NOT NULL UNIQUE); INSERT INTO poll values(0, 0, NULL);
INSERT INTO message_ids values(0, 0);