V2.2: Fix more duplications

Signed-off-by: starry69 <starry369126@outlook.com>
SensiPeeps · May 25, 2020 · 7e0fa8f · 7e0fa8f
1 parent 84b4375
commit 7e0fa8f
Showing 1 changed file with 19 additions and 28 deletions.
diff --git a/starrybot.py b/starrybot.py
@@ -86,6 +86,17 @@ def error(update, context):
 BASE_URL = 'https://pixabay.com/api/'
 AUTH_URL = 'https://pixabay.com/users'
 
+# Don't async
+def keyboard(imgurl, author, authid):
+    """ sends inline keyboard buttons
+        with reply photo """
+    keyb = [[
+       InlineKeyboardButton(text="PageLink  🌐", url=imgurl),
+       InlineKeyboardButton(text="Author 👸",
+            url=f'{AUTH_URL}/{author}-{authid}')]]
+    return keyb
+
+
 @run_async
 @send_action(ChatAction.UPLOAD_PHOTO)
 def wall(update, context):
@@ -119,17 +130,12 @@ def wall(update, context):
        imgurl = hits.get('pageURL')
        document = hits.get('imageURL')
 
-       keyboard = [[
-       InlineKeyboardButton(text="PageLink  🌐", url=imgurl),
-       InlineKeyboardButton(text="Author 👸",
-            url=f'{AUTH_URL}/{author}-{authid}')
-                  ]]
-
     try:
        context.bot.send_photo(chat.id, photo=preview,
             caption=(s.WALL_STR.format(
             likes, author, views, downloads, tags)),
-            reply_markup=InlineKeyboardMarkup(keyboard),
+            reply_markup=InlineKeyboardMarkup(
+            keyboard(imgurl, author, authid)),
             timeout=60)
 
        context.bot.send_document(chat.id,
@@ -184,17 +190,12 @@ def wallcolor(update, context):
        imgurl = hits.get('pageURL')
        document = hits.get('imageURL')
 
-       keyboard = [[
-       InlineKeyboardButton(text="PageLink  🌐", url=imgurl),
-       InlineKeyboardButton(text="Author 👸",
-            url=f'{AUTH_URL}/{author}-{authid}')
-                  ]]
-
     try:
        context.bot.send_photo(chat.id, photo=preview,
        caption=(s.WALL_STR.format(
        likes, author, views, downloads, tags)),
-       reply_markup=InlineKeyboardMarkup(keyboard),
+       reply_markup=InlineKeyboardMarkup(
+       keyboard(imgurl, author, authid)),
        timeout=60)
 
        context.bot.send_document(chat.id,
@@ -227,17 +228,12 @@ def editorschoice(update, context):
     imgurl = hits.get('pageURL')
     document = hits.get('imageURL')
 
-    keyboard = [[
-       InlineKeyboardButton(text="PageLink  🌐", url=imgurl),
-       InlineKeyboardButton(text="Author 👸",
-            url=f'{AUTH_URL}/users/{author}-{authid}')
-                  ]]
-
     try:
        context.bot.send_photo(chat.id, photo=preview,
        caption=(s.WALL_STR.format(
        likes, author, views, downloads, tags)),
-       reply_markup=InlineKeyboardMarkup(keyboard),
+       reply_markup=InlineKeyboardMarkup(
+       keyboard(imgurl, author, authid)),
        timeout=60)
 
        context.bot.send_document(chat.id,
@@ -271,17 +267,12 @@ def randomwalls(update, context):
     imgurl = hits.get('pageURL')
     document = hits.get('imageURL')
 
-    keyboard = [[
-       InlineKeyboardButton(text="PageLink  🌐", url=imgurl),
-       InlineKeyboardButton(text="Author 👸",
-            url=f'{AUTH_URL}/{author}-{authid}')
-                  ]]
-
     try:
        context.bot.send_photo(chat.id, photo=preview,
        caption=(s.WALL_STR.format(
        likes, author, views, downloads, tags)),
-       reply_markup=InlineKeyboardMarkup(keyboard),
+       reply_markup=InlineKeyboardMarkup(
+       keyboard(imgurl, author, authid)),
        timeout=60)
 
        context.bot.send_document(chat.id,