Compare commits

...

2 Commits

Author SHA1 Message Date
Ceda EI 1a4db8d2c5 Change schema. Change functions to match new schema.
add_message_id for the new table. get_callback_id now gets id from
message_id table. Removed the null case from add_vote. Creating post no
longer adds an entry to poll table. It instead adds an entry to
message_ids table via add_message_id function
2019-01-07 00:19:44 +05:30
Ceda EI c464088c57 Change add_vote and post for name 2019-01-06 23:32:29 +05:30
2 changed files with 21 additions and 8 deletions

26
bot.py
View File

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

View File

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