Userbot: Revert speedtest from bothub

Signed-off-by: MoveAngel <[email protected]>

Author: MoveAngel

userbot/modules/www.py

@@ -7,88 +7,50 @@
     Information Superhighway (yes, Internet). """
 
 from datetime import datetime
-import io
-import speedtest
+
+from speedtest import Speedtest
 from telethon import functions
-from userbot import CMD_HELP, bot
+from userbot import CMD_HELP
 from userbot.events import register
 
 
-@register(outgoing=True, pattern="^.speedtest(?: |$)(.*)")
-async def _(event):
-    if event.fwd_from:
-        return
-    input_str = event.pattern_match.group(1)
-    as_text = False
-    as_document = True
-    if input_str == "image":
-        as_document = False
-    elif input_str == "file":
-        as_document = True
-    elif input_str == "text":
-        as_text = True
-    await event.edit("Calculating my internet speed. Please wait!")
-    start = datetime.now()
-    s = speedtest.Speedtest()
-    s.get_best_server()
-    s.download()
-    s.upload()
-    end = datetime.now()
-    ms = (end - start).microseconds / 1000
-    response = s.results.dict()
-    download_speed = response.get("download")
-    upload_speed = response.get("upload")
-    ping_time = response.get("ping")
-    client_infos = response.get("client")
-    i_s_p = client_infos.get("isp")
-    i_s_p_rating = client_infos.get("isprating")
-    reply_msg_id = event.message.id
-    if event.reply_to_msg_id:
-        reply_msg_id = event.reply_to_msg_id
-    try:
-        response = s.results.share()
-        speedtest_image = response
-        if as_text:
-            await event.edit("""**SpeedTest** completed in {} seconds
-Download: {}
-Upload: {}
-Ping: {}
-Internet Service Provider: {}
-ISP Rating: {}""".format(ms, convert_from_bytes(download_speed), convert_from_bytes(upload_speed), ping_time, i_s_p, i_s_p_rating))
-        else:
-            await bot.send_file(
-                event.chat_id,
-                speedtest_image,
-                caption="**SpeedTest** completed in {} seconds".format(ms),
-                force_document=as_document,
-                reply_to=reply_msg_id,
-                allow_cache=False
-            )
-            await event.delete()
-    except Exception as exc:
-        await event.edit("""**SpeedTest** completed in {} seconds
-Download: {}
-Upload: {}
-Ping: {}
+@register(outgoing=True, pattern="^.speed$")
+async def speedtst(spd):
+    """ For .speed command, use SpeedTest to check server speeds. """
+    await spd.edit("`Running speed test . . .`")
+    test = Speedtest()
+
+    test.get_best_server()
+    test.download()
+    test.upload()
+    test.results.share()
+    result = test.results.dict()
 
-__With the Following ERRORs__
-{}""".format(ms, convert_from_bytes(download_speed), convert_from_bytes(upload_speed), ping_time, str(exc)))
+    await spd.edit("`"
+                   "Started at "
+                   f"{result['timestamp']} \n\n"
+                   "Download "
+                   f"{speed_convert(result['download'])} \n"
+                   "Upload "
+                   f"{speed_convert(result['upload'])} \n"
+                   "Ping "
+                   f"{result['ping']} \n"
+                   "ISP "
+                   f"{result['client']['isp']}"
+                   "`")
 
 
-def convert_from_bytes(size):
+def speed_convert(size):
+    """
+    Hi human, you can't read bytes?
+    """
     power = 2**10
-    n = 0
-    units = {
-        0: "",
-        1: "kilobytes",
-        2: "megabytes",
-        3: "gigabytes",
-        4: "terabytes"
-    }
+    zero = 0
+    units = {0: '', 1: 'Kb/s', 2: 'Mb/s', 3: 'Gb/s', 4: 'Tb/s'}
     while size > power:
         size /= power
-        n += 1
-    return f"{round(size, 2)} {units[n]}"
+        zero += 1
+    return f"{round(size, 2)} {units[zero]}"
 
 
 @register(outgoing=True, pattern="^.dc$")