From 4237d8fc2cd4ead70901e94133a87c48c22de581 Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 06:14:13 +0300 Subject: [PATCH 01/11] like_db new and fex --- like_db.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/like_db.py b/like_db.py index 4b87a76..a13e134 100644 --- a/like_db.py +++ b/like_db.py @@ -53,17 +53,14 @@ def add_like(self, user_id:str)->dict: The number of likes and dislikes for the post ''' if self.db.get(user_id): - if self.db[user_id]['like'] == 0: - self.db[user_id]['like'] = 1 - if self.db[user_id]['dislike'] == 1: + if self.db[user_id]['like'] == 0: + self.db[user_id]['like'] = 1 + self.db[user_id]['dislike'] = 0 + elif self.db[user_id]['like'] == 1: + self.db[user_id]['like'] = 0 self.db[user_id]['dislike'] = 0 - elif self.db[user_id]['like'] == 1: - self.db[user_id]['like'] = 0 else: - self.db[user_id] = { - 'like': 1, - 'dislike': 0 - } + self.db[user_id] = {'like': 1, 'dislike': 0} self.save() @@ -79,13 +76,10 @@ def add_dislike(self, user_id:str)->dict: if self.db.get(user_id): if self.db[user_id]['dislike'] == 0: self.db[user_id]['dislike'] = 1 - if self.db[user_id]['like'] == 1: - self.db[user_id]['like'] = 0 + self.db[user_id]['like'] = 0 elif self.db[user_id]['dislike'] == 1: self.db[user_id]['dislike'] = 0 + self.db[user_id]['like'] = 0 else: - self.db[user_id] = { - 'like': 0, - 'dislike': 1 - } + self.db[user_id] = {'like': 0, 'dislike': 1} self.save() \ No newline at end of file From cda027f38756337c7dd0ff16881724bfccf71632 Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 07:16:26 +0300 Subject: [PATCH 02/11] likebot --- likebot.py | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/likebot.py b/likebot.py index 396ae49..4068319 100644 --- a/likebot.py +++ b/likebot.py @@ -5,20 +5,54 @@ #Import TOKEN from envoirment variable import os -TOKEN = os.environ['TOKEN'] +TOKEN = "5567524975:AAHH4ioN3ZGUXbzPPPrXNk2tdWJU3O_fFyk" #os.environ['TOKEN'] #Create start command handler def start(update:Update, context:CallbackContext): """Starts with picture all likes and all dislikes""" - pass + data = LikeDB('like_db.json') + like = data.all_likes() + liked = data.all_dislikes() + + text = f'like:{like}, dislike{liked}' + inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') + inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') + reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + update.message.reply_text(text, reply_markup=reply_markup) def like(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" - pass + query = update.callback_query + user_id = query.from_user.id + + data = LikeDB('like_db.json') + data.add_like(user_id) + + like = data.all_likes() + liked = data.all_dislikes() + + text = f'like:{like}, dislike{liked}' + inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') + inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') + reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + query.edit_message_text(text, reply_markup=reply_markup) def dislike(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" - pass + query = update.callback_query + user_id = query.from_user.id + + data = LikeDB('like_db.json') + data.add_dislike(user_id) + + like = data.all_likes() + liked = data.all_dislikes() + + text = f'like:{like}, dislike{liked}' + inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') + inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') + reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + query.edit_message_text(text, reply_markup=reply_markup) #Create updater and dispatcher updater = Updater(TOKEN) @@ -30,7 +64,4 @@ def dislike(update:Update, context:CallbackContext): #Start the bot updater.start_polling() -updater.idle() - - - +updater.idle() \ No newline at end of file From da9b72f1e8a0ff7bef0aa9711c2445f07b6436ca Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 07:17:34 +0300 Subject: [PATCH 03/11] likebot --- likebot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/likebot.py b/likebot.py index 4068319..c0135c2 100644 --- a/likebot.py +++ b/likebot.py @@ -5,7 +5,7 @@ #Import TOKEN from envoirment variable import os -TOKEN = "5567524975:AAHH4ioN3ZGUXbzPPPrXNk2tdWJU3O_fFyk" #os.environ['TOKEN'] +TOKEN = os.environ['TOKEN'] #Create start command handler def start(update:Update, context:CallbackContext): From 0844afe335ac29fdd1ad95f3a6d1ba51a8ea8d2b Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 07:55:33 +0300 Subject: [PATCH 04/11] fex likebot --- likebot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/likebot.py b/likebot.py index c0135c2..94dbbb2 100644 --- a/likebot.py +++ b/likebot.py @@ -5,7 +5,7 @@ #Import TOKEN from envoirment variable import os -TOKEN = os.environ['TOKEN'] +TOKEN = "5567524975:AAHH4ioN3ZGUXbzPPPrXNk2tdWJU3O_fFyk" #os.environ['TOKEN'] #Create start command handler def start(update:Update, context:CallbackContext): @@ -26,7 +26,7 @@ def like(update:Update, context:CallbackContext): user_id = query.from_user.id data = LikeDB('like_db.json') - data.add_like(user_id) + data.add_like(str(user_id)) like = data.all_likes() liked = data.all_dislikes() @@ -43,7 +43,7 @@ def dislike(update:Update, context:CallbackContext): user_id = query.from_user.id data = LikeDB('like_db.json') - data.add_dislike(user_id) + data.add_dislike(str(user_id)) like = data.all_likes() liked = data.all_dislikes() From 46ac168916165e5761dd992db952a28c1d5cd3eb Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 10:15:42 +0300 Subject: [PATCH 05/11] likebot fex --- likebot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/likebot.py b/likebot.py index 94dbbb2..4d22534 100644 --- a/likebot.py +++ b/likebot.py @@ -5,7 +5,7 @@ #Import TOKEN from envoirment variable import os -TOKEN = "5567524975:AAHH4ioN3ZGUXbzPPPrXNk2tdWJU3O_fFyk" #os.environ['TOKEN'] +TOKEN = "5699418530:AAF-rw_GFSO_DeL-19T4s2eiGDXLk6OSTIg" #os.environ['TOKEN'] #Create start command handler def start(update:Update, context:CallbackContext): @@ -14,7 +14,7 @@ def start(update:Update, context:CallbackContext): like = data.all_likes() liked = data.all_dislikes() - text = f'like:{like}, dislike{liked}' + text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) @@ -31,7 +31,7 @@ def like(update:Update, context:CallbackContext): like = data.all_likes() liked = data.all_dislikes() - text = f'like:{like}, dislike{liked}' + text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) @@ -48,7 +48,7 @@ def dislike(update:Update, context:CallbackContext): like = data.all_likes() liked = data.all_dislikes() - text = f'like:{like}, dislike{liked}' + text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) From 621969936c69be9eee273d74ca8373ca22cb7402 Mon Sep 17 00:00:00 2001 From: tajriba Date: Wed, 31 Aug 2022 10:18:01 +0300 Subject: [PATCH 06/11] data base --- like_db.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 like_db.json diff --git a/like_db.json b/like_db.json new file mode 100644 index 0000000..9d25a55 --- /dev/null +++ b/like_db.json @@ -0,0 +1,14 @@ +{ + "549315446": { + "like": 1, + "dislike": 0 + }, + "5493154888": { + "like": 1, + "dislike": 0 + }, + "677038439": { + "like": 0, + "dislike": 0 + } +} \ No newline at end of file From f6aa2d3c61c930883c1bf3956ada2703331f00a5 Mon Sep 17 00:00:00 2001 From: tajriba Date: Thu, 1 Sep 2022 09:19:19 +0300 Subject: [PATCH 07/11] fex likebot --- likebot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/likebot.py b/likebot.py index 4d22534..166a919 100644 --- a/likebot.py +++ b/likebot.py @@ -18,7 +18,7 @@ def start(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - update.message.reply_text(text, reply_markup=reply_markup) + update.message.reply_photo( 'https://www.drupal.org/files/project-images/like_and_dislike.png',reply_markup=reply_markup) def like(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" @@ -35,7 +35,7 @@ def like(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - query.edit_message_text(text, reply_markup=reply_markup) + query.edit_message_caption(reply_markup=reply_markup) def dislike(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" @@ -52,7 +52,7 @@ def dislike(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - query.edit_message_text(text, reply_markup=reply_markup) + query.edit_message_caption(reply_markup=reply_markup) #Create updater and dispatcher updater = Updater(TOKEN) From 580e2d13c7b9177afcf2ce1a0a7de2f18e7d8ebe Mon Sep 17 00:00:00 2001 From: tajriba Date: Thu, 1 Sep 2022 09:38:33 +0300 Subject: [PATCH 08/11] You have 0 likes and 0 dislikes --- likebot.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/likebot.py b/likebot.py index 166a919..37ce886 100644 --- a/likebot.py +++ b/likebot.py @@ -13,12 +13,15 @@ def start(update:Update, context:CallbackContext): data = LikeDB('like_db.json') like = data.all_likes() liked = data.all_dislikes() + user_id = str(update.message.from_user.id) + dat_db = data.db + user_like = dat_db[user_id]['like'] + user_dislike = dat_db[user_id]['dislike'] - text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - update.message.reply_photo( 'https://www.drupal.org/files/project-images/like_and_dislike.png',reply_markup=reply_markup) + update.message.reply_photo( 'https://www.drupal.org/files/project-images/like_and_dislike.png',reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') def like(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" @@ -27,15 +30,18 @@ def like(update:Update, context:CallbackContext): data = LikeDB('like_db.json') data.add_like(str(user_id)) + user_id2 = str(query.from_user.id) + dat_db = data.db + user_like = dat_db[user_id2]['like'] + user_dislike = dat_db[user_id2]['dislike'] like = data.all_likes() liked = data.all_dislikes() - text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - query.edit_message_caption(reply_markup=reply_markup) + query.edit_message_caption(reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') def dislike(update:Update, context:CallbackContext): """Send the message with the number of likes and dislikes""" @@ -44,15 +50,18 @@ def dislike(update:Update, context:CallbackContext): data = LikeDB('like_db.json') data.add_dislike(str(user_id)) + user_id2 = str(query.from_user.id) + dat_db = data.db + user_like = dat_db[user_id2]['like'] + user_dislike = dat_db[user_id2]['dislike'] like = data.all_likes() liked = data.all_dislikes() - text = f'like and dislike' inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) - query.edit_message_caption(reply_markup=reply_markup) + query.edit_message_caption(reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') #Create updater and dispatcher updater = Updater(TOKEN) From bd408da90ad8d137c32b3e83cd3c773bc343a492 Mon Sep 17 00:00:00 2001 From: Og'abek Date: Thu, 19 Jan 2023 14:52:55 +0500 Subject: [PATCH 09/11] fix --- .gitignore | 202 +++++++++++++++++++++++++++++++++++++++++++++++ like_db.json | 15 +--- like_db.py | 4 + likebot.py | 3 +- requirements.txt | 2 +- 5 files changed, 210 insertions(+), 16 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de6d36d --- /dev/null +++ b/.gitignore @@ -0,0 +1,202 @@ +# Created by https://www.toptal.com/developers/gitignore/api/venv,python,visualstudiocode +# Edit at https://www.toptal.com/developers/gitignore?templates=venv,python,visualstudiocode + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + + +### venv ### +# Virtualenv +# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ +[Bb]in +[Ii]nclude +[Ll]ib +[Ll]ib64 +[Ll]ocal +[Ss]cripts +pyvenv.cfg +pip-selfcheck.json + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +# End of https://www.toptal.com/developers/gitignore/api/venv,python,visualstudiocode \ No newline at end of file diff --git a/like_db.json b/like_db.json index 9d25a55..d19ec78 100644 --- a/like_db.json +++ b/like_db.json @@ -1,14 +1 @@ -{ - "549315446": { - "like": 1, - "dislike": 0 - }, - "5493154888": { - "like": 1, - "dislike": 0 - }, - "677038439": { - "like": 0, - "dislike": 0 - } -} \ No newline at end of file +{"549315446": {"like": 1, "dislike": 0}, "5493154888": {"like": 1, "dislike": 0}, "1066527771": {"like": 0, "dislike": 0}, "677038439": {"like": 0, "dislike": 0}} \ No newline at end of file diff --git a/like_db.py b/like_db.py index a13e134..312699a 100644 --- a/like_db.py +++ b/like_db.py @@ -82,4 +82,8 @@ def add_dislike(self, user_id:str)->dict: self.db[user_id]['like'] = 0 else: self.db[user_id] = {'like': 0, 'dislike': 1} + self.save() + + def add_user(self, user_id): + self.db[user_id] = {'like': 0, 'dislike': 0} self.save() \ No newline at end of file diff --git a/likebot.py b/likebot.py index 37ce886..36d8fb7 100644 --- a/likebot.py +++ b/likebot.py @@ -5,7 +5,7 @@ #Import TOKEN from envoirment variable import os -TOKEN = "5699418530:AAF-rw_GFSO_DeL-19T4s2eiGDXLk6OSTIg" #os.environ['TOKEN'] +TOKEN = os.environ['TOKEN'] #Create start command handler def start(update:Update, context:CallbackContext): @@ -15,6 +15,7 @@ def start(update:Update, context:CallbackContext): liked = data.all_dislikes() user_id = str(update.message.from_user.id) dat_db = data.db + data.add_user(user_id=user_id) user_like = dat_db[user_id]['like'] user_dislike = dat_db[user_id]['dislike'] diff --git a/requirements.txt b/requirements.txt index 11a50f9..02548cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -python-telegram-bot \ No newline at end of file +python-telegram-bot==13.13 \ No newline at end of file From 664ed394b34de76cf1acaea1206296e9213c30e7 Mon Sep 17 00:00:00 2001 From: Og'abek Date: Thu, 19 Jan 2023 14:59:48 +0500 Subject: [PATCH 10/11] fix --- like_db.json | 7 ++++++- like_db.py | 4 ++-- likebot.py | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/like_db.json b/like_db.json index d19ec78..e514b26 100644 --- a/like_db.json +++ b/like_db.json @@ -1 +1,6 @@ -{"549315446": {"like": 1, "dislike": 0}, "5493154888": {"like": 1, "dislike": 0}, "1066527771": {"like": 0, "dislike": 0}, "677038439": {"like": 0, "dislike": 0}} \ No newline at end of file +{ + "677038439": { + "like": 0, + "dislike": 0 + } +} \ No newline at end of file diff --git a/like_db.py b/like_db.py index 312699a..cf2131c 100644 --- a/like_db.py +++ b/like_db.py @@ -12,11 +12,11 @@ def __init__(self, db_path): self.db = {} #Save the database to the database file with open(db_path, 'w') as f: - json.dump(self.db, f) + json.dump(self.db, f, indent=4) def save(self): with open(self.db_path, 'w') as f: - json.dump(self.db, f) + json.dump(self.db, f, indent=4) def all_likes(self): """Counts all users likes diff --git a/likebot.py b/likebot.py index 36d8fb7..8161fdc 100644 --- a/likebot.py +++ b/likebot.py @@ -21,7 +21,7 @@ def start(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') - reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + reply_markup = InlineKeyboardMarkup([[inlineKeyboard1, inlineKeyboard]]) update.message.reply_photo( 'https://www.drupal.org/files/project-images/like_and_dislike.png',reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') def like(update:Update, context:CallbackContext): @@ -41,7 +41,7 @@ def like(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') - reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + reply_markup = InlineKeyboardMarkup([[inlineKeyboard1,inlineKeyboard]]) query.edit_message_caption(reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') def dislike(update:Update, context:CallbackContext): @@ -61,7 +61,7 @@ def dislike(update:Update, context:CallbackContext): inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like') - reply_markup = InlineKeyboardMarkup([[inlineKeyboard,inlineKeyboard1]]) + reply_markup = InlineKeyboardMarkup([[inlineKeyboard1,inlineKeyboard]]) query.edit_message_caption(reply_markup=reply_markup, caption=f'You have {user_like} likes and {user_dislike} dislikes') #Create updater and dispatcher From 73c3464e2f9c1ec6f9bb6bc52f5b79a657bd4b18 Mon Sep 17 00:00:00 2001 From: Og'abek Date: Thu, 19 Jan 2023 15:07:10 +0500 Subject: [PATCH 11/11] fix --- like_db.json | 6 +++++- like_db.py | 8 ++++---- likebot.py | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/like_db.json b/like_db.json index e514b26..e0d58dc 100644 --- a/like_db.json +++ b/like_db.json @@ -1,6 +1,10 @@ { "677038439": { - "like": 0, + "like": 1, + "dislike": 0 + }, + "1066527771": { + "like": 1, "dislike": 0 } } \ No newline at end of file diff --git a/like_db.py b/like_db.py index cf2131c..7ff18c1 100644 --- a/like_db.py +++ b/like_db.py @@ -25,8 +25,8 @@ def all_likes(self): """ likes = 0 if self.db: - for user in self.db: - likes += self.db[user]['like'] + for user, data in self.db.items(): + likes += data['like'] return likes @@ -37,8 +37,8 @@ def all_dislikes(self): """ dislikes = 0 if self.db: - for user in self.db: - dislikes += self.db[user]['dislike'] + for user_id, data in self.db.items(): + dislikes += data['dislike'] return dislikes diff --git a/likebot.py b/likebot.py index 8161fdc..19566f0 100644 --- a/likebot.py +++ b/likebot.py @@ -58,6 +58,7 @@ def dislike(update:Update, context:CallbackContext): like = data.all_likes() liked = data.all_dislikes() + print(like, liked) inlineKeyboard = InlineKeyboardButton(f'👎{liked}',callback_data='dislike') inlineKeyboard1 = InlineKeyboardButton(f'👍{like}',callback_data='like')