now fine...

Powers/__init__.py

@@ -13,7 +13,6 @@ from traceback import format_exc
 import lyricsgenius
 import pyrogram
 import pytz
-from telegraph import Telegraph
 
 LOG_DATETIME = datetime.now().strftime("%d_%m_%Y-%H_%M_%S")
 LOGDIR = f"{__name__}/logs"
@@ -79,19 +78,6 @@ LOGGER.info(f"Time zone set to {Config.TIME_ZONE}")
 LOGGER.info("Source Code: https://github.com/Gojo-Bots/Gojo_Satoru\n")
 LOGGER.info("Checking lyrics genius api...")
 LOGGER.info("Initialising telegraph client")
-telegraph = Telegraph()
-acc_name = ["iamgojoof6eyes","Gojo_bots","Captain","Ezio","Captain_Ezio","Hell","Forgo10god","kap10","Gojo_Satoru","Naruto","Itachi","DM","HellBots"]
-name_tel = choice(acc_name)
-l = 0
-while True:
-    try:
-        telegraph.create_account(name_tel)
-        break
-    except Exception:
-        LOGGER.exception(f"Failed to create telegraph client retrying...{l if l else ''}")
-        l += 1
-        pass
-LOGGER.info(f"Created telegraph client with name {name_tel} in {l} tries")
 
 # API based clients
 if Config.GENIUS_API_TOKEN:

Powers/__main__.py

@@ -2,7 +2,6 @@ import uvloop # Comment it out if using on windows
 
 from Powers.bot_class import Gojo
 
-
 if __name__ == "__main__":
     uvloop.install() # Comment it out if using on windows
     Gojo().run()

Powers/bot_class.py

@@ -2,7 +2,6 @@ from platform import python_version
 from threading import RLock
 from time import gmtime, strftime, time
 
-import pyroaddon
 from pyrogram import Client, __version__
 from pyrogram.raw.all import layer
 from pyrogram.types import BotCommand

Powers/plugins/birthday.py

@@ -11,7 +11,6 @@ from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
 
 from Powers import BDB_URI, LOGGER, TIME_ZONE
-
 from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
 from Powers.plugins import bday_cinfo, bday_info
@@ -277,9 +276,9 @@ else:
 print(days_left)
 print(x.year - timm.year)
 """
-if BDB_URI:
-    scheduler.add_job(send_wishish,'cron',[Gojo()],hour=0,minute=0,second=0)
-    scheduler.start()
+# if BDB_URI:
+#     scheduler.add_job(send_wishish,'cron',[Gojo()],hour=0,minute=0,second=0)
+#     scheduler.start()
 
 __PLUGIN__ = "birthday"
 

Powers/plugins/clean_db.py

@@ -7,7 +7,6 @@ from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.errors import PeerIdInvalid, UserNotParticipant
 
 from Powers import LOGGER, MESSAGE_DUMP, TIME_ZONE
-
 from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
 from Powers.database.blacklist_db import Blacklist
@@ -24,8 +23,8 @@ from Powers.database.warns_db import Warns, WarnSettings
 from Powers.utils.custom_filters import command
 from Powers.vars import Config
 
-scheduler = AsyncIOScheduler()
-scheduler.timezone = TIME_ZONE
+# scheduler = AsyncIOScheduler()
+# scheduler.timezone = TIME_ZONE
 
 async def clean_my_db(c:Gojo,is_cmd=False, id=None):
     to_clean = list()
@@ -105,5 +104,5 @@ async def clean_my_db(c:Gojo,is_cmd=False, id=None):
         return
     
 
-scheduler.add_job(clean_my_db,'cron',[Gojo()],hour=3,minute=0,second=0)
-scheduler.start()
+# scheduler.add_job(clean_my_db,'cron',[Gojo()],hour=3,minute=0,second=0)
+# scheduler.start()

Powers/plugins/utils.py

@@ -18,7 +18,6 @@ from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
 from Powers.utils.http_helper import *
 from Powers.utils.parser import mention_html
-from Powers.utils.web_helpers import telegraph_up
 
 
 @Gojo.on_message(command("wiki"))
@@ -92,6 +91,7 @@ async def get_lyrics(_, m: Message):
         return
 
     query = m.text.split(None, 1)[1]
+    artist = m.text.split("-")[-1].strip()
     song = ""
     if not query:
         await m.edit_text(text="You haven't specified which song to look for!")
@@ -99,7 +99,10 @@ async def get_lyrics(_, m: Message):
     song_name = query
     em = await m.reply_text(text=f"Finding lyrics for <code>{song_name}<code>...")
     try:
-        song = genius_lyrics.search_song(query)
+        if artist:
+            song = genius_lyrics.search_song(query,artist)
+        else:
+            song = genius_lyrics.search_song(query)
     except Exception as e:
         await em.delete()
         await m.reply_text("Connection error try again after sometime")
@@ -109,7 +112,10 @@ async def get_lyrics(_, m: Message):
         if song.lyrics:
             reply = song.lyrics
             reply = reply.split("\n",1)[1]
-            artist = song.artist
+            if not artist:
+                artist = song.artist
+            else:
+                artist = artist
         else:
             reply = "Couldn't find any lyrics for that song!"
     else:
@@ -118,17 +124,11 @@ async def get_lyrics(_, m: Message):
         await em.edit_text(f"**{query.capitalize()} by {artist}**\n`{reply}`")
     except MessageTooLong:
         header = f"{query.capitalize()} by {artist}"
-        page_url = await telegraph_up(name=header,content=reply)
-        kb = InlineKeyboardMarkup([
-            [
-                InlineKeyboardButton("Telegraph link", url=page_url)
-            ]
-        ])
         with BytesIO(str.encode(await remove_markdown_and_html(reply))) as f:
             f.name = "lyrics.txt"
             await m.reply_document(
                 document=f,
-                reply_markup=kb
+                caption=header
             )
         await em.delete()
     return
@@ -408,7 +408,7 @@ Some utils provided by bot to make your tasks easy!
 • /id: Get the current group id. If used by replying to a message, get that user's id.
 • /info: Get information about a user.
 • /gifid: Reply to a gif to me to tell you its file ID.
-• /lyrics `<song name>` : Find your song and give the lyrics of the song
+• /lyrics `<song name>`-`<artist name>` : Find your song and give the lyrics of the song
 • /wiki: `<query>`: wiki your query.
 • /tr `<language>`: Translates the text and then replies to you with the language you have specifed, works as a reply to message.
 • /git `<username>`: Search for the user using github api!

Powers/plugins/web_con.py

@@ -16,52 +16,6 @@ from Powers.utils.http_helper import *
 from Powers.utils.sticker_help import toimage
 from Powers.utils.web_helpers import *
 
-
-@Gojo.on_message(command(["telegraph","tgh","tgm"]))
-async def telegraph_upload(c:Gojo,m:Message):
-    if not m.reply_to_message:
-        await m.reply_text("Reply to media/text to upload it to telegraph")
-        return
-    XnX = await m.reply_text("⏳")
-    file = m.reply_to_message
-    if file.text:
-        if len(m.command) == 1:
-            name = file.from_user.first_name + file.text.split()[1]
-        elif len(m.command) > 1:
-            name = " ".join(m.command[1:5])
-        try:
-            upload = await telegraph_up(file,name)
-        except Exception as e:
-            await m.reply_text(f"Got an error\n{e}")
-            return
-        if upload:
-            await XnX.delete()
-            kb = IKM([[IKB("Here is link to the uploaded text",url=upload)]])
-            await m.reply_text("Here is your uploaded text",disable_web_page_preview=True,reply_markup=kb)
-            return
-        elif not upload:
-            await m.reply_text("Failed to upload the text to telegraph")
-            return
-    if m.reply_to_message.photo or m.reply_to_message.document or m.reply_to_message.audio or m.reply_to_message.video:
-        size = await get_file_size(m.reply_to_message)
-        form = size.split(None,1)
-        if (form[-1] == "mb" and int(form[0]) > 5) or form[-1] == "gb":
-            await XnX.edit_text("File size too big to upload\nLimit: 5mbs")
-            return
-    await XnX.delete()
-    try:
-        upload = await telegraph_up(file)
-    except Exception as e:
-        await m.reply_text(f"Got an error\n{e}")
-        return
-    if upload:
-        kb = IKM([[IKB("Here is link to the file",url=upload)]])
-        await m.reply_text(f"Here is your file link\n`{upload}`",reply_markup=kb)
-        return
-    elif not upload:
-        await m.reply_text("Failed to upload the file to telegraph")
-        return
-
 # @Gojo.on_message(command(["songname","insong","songinfo","whichsong","rsong","reversesong"]))
 # • /whichsong (/songname, /songinfo, /insong, /rsong, /reversesong) : Reply to file to get the song playing in it.
 # async def get_song_info(c: Gojo, m: Message):
@@ -150,11 +104,12 @@ async def telegraph_upload(c:Gojo,m:Message):
 #             pass
 #     return
 
+songs = dict()
 
 @Gojo.on_callback_query(filters.regex("^lyrics_"))
 async def lyrics_for_song(c: Gojo, q: CallbackQuery):
     data = q.data.split("_")[1].split(":")
-    song = data[0]
+    song = songe = data[0]
     try:
         artist = data[1]
     except IndexError:
@@ -163,20 +118,26 @@ async def lyrics_for_song(c: Gojo, q: CallbackQuery):
         song = genius_lyrics.search_song(song,artist)
     elif not artist:
         song = genius_lyrics.search_song(song)
+        artist = song.artist
     if not song.lyrics:
         await q.answer("‼️ No lyrics found ‼️",True)
         return
-    header = f"{song.capitalize()} by {artist}"
+    header = f"{songe.capitalize()} by {artist}"
     if song.lyrics:
         await q.answer("Fetching lyrics")
         reply = song.lyrics.split("\n",1)[1]
     if len(reply) >= 4096:
-        link = telegraph_up(name=header,content=reply)
-        cap = "Lyrics was too long\nUploaded it to telegraph"
+        cap = f"{header}\n{reply[0:4080]}..."
+        if artist:
+            songs[f"{songe}"][f"{artist}"] = reply
+            art = '_'+artist
+        else:
+            songs[f"{songe}"] = reply
+            art = ''
         new_kb = [
             [
-                IKB("Telegraph",url=link)
-            ],
+                IKB("Next",f"lyrics_next_{songe}{art}")
+            ]
             [
                 IKB("Close","f_close")
             ]
@@ -192,6 +153,45 @@ async def lyrics_for_song(c: Gojo, q: CallbackQuery):
     await q.message.delete()
     return
 
+@Gojo.on_callback_query(filters.regex("^lyrics_next_") | filters.regex("^lyrics_prev_"))
+async def lyrics_for_song_next(c: Gojo, q: CallbackQuery):
+    split = q.data.split("_")
+    song = split[2]
+    todo = split[1]
+    try:
+        artist = split[3]
+        header = f"{song.capitalize()} by {artist}"
+        art = '_'+artist
+    except IndexError:
+        artist = False
+        header = f"{song.capitalize()}"
+        art = ''
+    try:
+        if artist:
+            songe = songs[song][artist]
+        else:
+            songe = songs[song]
+    except KeyError:
+        if artist:
+            songe = genius_lyrics.search_song(song,artist)
+        elif not artist:
+            songe = genius_lyrics.search_song(song)
+        if todo == "next":
+            next_part = songe[4080:]
+        else:
+            next_part = songe[:4080]
+    next_part = f"{header}\n{next_part}"
+    new_kb = [
+            [
+                IKB("Next",f"lyrics_prev_{song}{art}")
+            ]
+            [
+                IKB("Close","f_close")
+            ]
+        ]
+    await q.edit_message_text(next_part, reply_markup=new_kb)
+
+
 @Gojo.on_message(command(["removebackground","removebg","rmbg"]))
 async def remove_background(c: Gojo, m: Message):
     if not is_rmbg:
@@ -305,7 +305,6 @@ __PLUGIN__ = "web support"
 
 __HELP__ = """
 **Available commands**
-• /telegraph (/tgh, /tgm) <page name> : Reply to media which you want to upload to telegraph.
 • /rmbg (/removebg, /removebackground) : Reply to image file or sticker of which you want to remove background
 • /song (/yta) <songname or youtube link>
 • /vsong (/ytv) <songname or youtube link>

Powers/utils/web_helpers.py

@@ -6,9 +6,7 @@ import yt_dlp
 from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
-from telegraph import upload_file
 
-from Powers import telegraph
 from Powers.bot_class import Gojo
 from Powers.utils.http_helper import *
 
@@ -35,30 +33,6 @@ async def get_file_size(file: Message):
             size = size/1024
             return f"{round(size)} gb"
 
-async def telegraph_up(file:Message=None,name=None,content=None):
-    if not name:
-        name = "Captain_Ezio_Gojo_Bots"
-    if content:
-        page = telegraph.create_page(name,html_content=content)
-        if page:
-            return page['url']
-        else:
-            return
-    if file.text:
-        to_upload = file.text.html
-        page = telegraph.create_page(name,html_content=to_upload)
-        if page:
-            return page['url']
-        else:
-            return
-    doc = await file.download()
-    media_url = upload_file(doc)
-    tg_url = f"https://telegra.ph/{media_url[0]}"
-    os.remove(doc)
-    if tg_url:
-        return tg_url
-    else:
-        return
 
 class GOJO_YTS:
     """

requirements.txt

@@ -28,7 +28,6 @@ search-engine-parser==0.6.8
 six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0"
 sniffio==1.3.0; python_full_version >= "3.6.2" and python_version >= "3.7"
 soupsieve==2.4; python_version >= "3.6" and python_full_version >= "3.6.0"
-telegraph==2.2.0
 tgcrypto==1.2.5; python_version >= "3.6" and python_version < "4.0"
 tswift==0.7.0
 typing-extensions==4.5.0; python_full_version >= "3.6.2" and python_version >= "3.7" and python_version < "3.8"