New docs (also 2.5.0 release)

- added subcommands
- upgraded docs.

Author: showierdata9978

MeowerBot/API.py

@@ -5,10 +5,13 @@
 class MeowerAPI:
     base_uri = "https://api.meower.org/"
 
-    def __init__(self, token, username):
+    def __init__(self, username):
 
         self.session = requests.session()
-        self.session.headers.update({"token": token, "usename": username})
+        self.session.headers.update({"usename": username})
+
+    def login(self, token):
+        self.session.headers.update({"token": token})
 
     def get_page(self, page=1, chatid="home"):
         if chatid == "home":

MeowerBot/Bot.py

@@ -18,7 +18,9 @@
 import time
 import logging
 
-from websocket._exceptions import WebSocketConnectionClosedException
+from .API import MeowerAPI
+
+from websocket._exceptions import WebSocketConnectionClosedException, WebSocketException
 
 
 class Bot:
@@ -53,6 +55,7 @@ def _t_ping(self):
     def __init__(self, prefix=None, autoreload: int or None = None): #type: ignore
         self.wss = CloudLink()
         self.callbacks = {}
+        self._last_to = "Home"
 
         self.wss.callback(
             "on_packet", self._debug_fix
@@ -70,8 +73,8 @@ def __init__(self, prefix=None, autoreload: int or None = None): #type: ignore
 
         if autoreload:
             self.autoreload = True
-            self.autoreload_time = autoreload + 1
-            self.autoreload_original = autoreload + 1
+            self.autoreload_time = min(autoreload, 1)
+            self.autoreload_original = min(autoreload, 1)
         else:
             self.autoreload = False
             self.autoreload_time = 0
@@ -209,7 +212,7 @@ def _handle_status(self, status, listener):
                     "https://webhooks.meower.org/post/home",
                     json={
                         "post": "ERROR: MeowerBot.py Webhooks Logging\n\n Account Softlocked.",
-                        "username": self.username,
+                         "username": self.username,
                     },
                 )
                 print("CRITICAL ERROR! ACCOUNT SOFTLOCKED!!!!.", file=sys.__stdout__)
@@ -225,10 +228,13 @@ def _handle_status(self, status, listener):
 
         elif listener == "__meowerbot__send_message":
             if status == "I:100 | OK":
+                self.autoreload_time = self.autoreload_original
                 return  # This is just checking if a post went OK
-            
-            self.autoreload_time = self.autoreload_original #autoreload time should reset if 
+            #autoreload time should reset if 
+
+
             raise RuntimeError("Post Failed to send")
+        
 
     def callback(self, callback, cbid=None):
         """Connects a callback ID to a callback"""
@@ -243,10 +249,7 @@ def __handle_close__(self, *args, **kwargs):
         if self.autoreload:
             self.autoreload = False #to stop race condisons 
             self.logger_in = True
-            if not self.autoreload_time >= 100: self.autoreload_time *= 1.2 
-            
-            else:
-                 self.autoreload_time = 100
+            self.autoreload_time *= 1.2 
 
 
             time.sleep(self.autoreload_time)
@@ -294,8 +297,15 @@ def __handle_packet__(self, packet):
 
         elif packet["cmd"] == "direct":
             listener = packet.get("listener")
+
+            if listener == "mb_get_chat_list":
+                self.run_cb("chat_list", args=(packet["val"]["payload"], listener))
+            elif listener == "__meowerbot__login":
+                self.api.login(packet['val']['payload']['token'])
             self.run_cb("direct", args=(packet["val"], listener))
 
+        
+
         else:
             listener = packet.get("listener")
             self.run_cb(packet["cmd"], args=(packet["val"], listener))
@@ -317,22 +327,29 @@ def run_command(self, message):
             self.run_cb("error", args=(e,))
 
     def send_msg(self, msg, to="home"):
-        if to == "home":
-            self.wss.sendPacket(
-                {
-                    "cmd": "direct",
-                    "val": {"cmd": "post_home", "val": msg},
-                    "listener": "__meowerbot__send_message",
-                }
-            )
-        else:
-            self.wss.sendPacket(
-                {
-                    "cmd": "direct",
-                    "val": {"cmd": "post_chat", "val": {"chatid": to, "p": msg}},
-                    "listener": "__meowerbot__send_message",
-                }
-            )
+        self._last_to = to
+        self._last_sent = msg
+        try:
+            if to == "home":
+                self.wss.sendPacket(
+                    {
+                        "cmd": "direct",
+                        "val": {"cmd": "post_home", "val": msg},
+                        "listener": "__meowerbot__send_message",
+                    }
+                )
+            else:
+                self.wss.sendPacket(
+                    {
+                        "cmd": "direct",
+                        "val": {"cmd": "post_chat", "val": {"chatid": to, "p": msg}},
+                        "listener": "__meowerbot__send_message",
+                    }
+                )
+        #socket is closed, use webhooks
+        except WebSocketException as e:
+            self.run_cb(cbid="error", args=(e,))
+            
 
     def send_typing(self, to="home"):
         if  to == "home":
@@ -361,7 +378,7 @@ def send_typing(self, to="home"):
                 },
             }
           )
-       
+        
     def enter_chat(self, chatid="livechat"):
         self.wss.sendPacket(
             {
@@ -376,6 +393,34 @@ def enter_chat(self, chatid="livechat"):
             }
         )
 
+    def create_chat(self, name):
+        """
+        Unstable, use at your own risk
+
+        comes with callbacks: chat_list 
+        """
+        self.wss.sendPacket({
+            "cmd": "direct",
+            "val": {
+                "cmd": "create_chat",
+                "val": name
+            },
+            "listener": "mb_create_chat"
+        })
+
+        time.sleep(secs=0.5)
+
+        self.wss.sendPacket({
+            "cmd": "direct",
+            "val": {
+                "cmd": "get_chat_list",
+                "val": {
+                    "page": 1
+                }
+            },
+            "listener": "mb_get_chat_list"
+        })
+
 
     def run(self, username, password, server="wss://server.meower.org"):
         """
@@ -391,6 +436,7 @@ def run(self, username, password, server="wss://server.meower.org"):
         self.logger = logging.getLogger(f"MeowerBot {self.username}")
         self.server = server
         self.wss.client(server)
+        self.api = API(self)
 
         if self.bad_exit:
             raise BaseException("Bot Account Softlocked")

MeowerBot/__init__.py

@@ -5,7 +5,7 @@
 
 """
 
-__version__ = "2.4.6"
+__version__ = "2.5.0"
 
 
 # Public library imports

MeowerBot/cog.py

@@ -1,4 +1,4 @@
-from .command import AppCommand
+from .command import AppCommand, command
 import weakref
 
 

MeowerBot/command.py

@@ -15,14 +15,33 @@ def __init__(self, func, name=None, args=0):
 
         self.arg_names = inspect.getfullargspec(func)[0]
         self.arg_types = func.__annotations__
+        self.subcommands = {}
 
     def __call__(self, *args):
         raise RuntimeError("AppCommand is not callable")
 
     def register_class(self, con):
         self.connected = con
 
+    def subcommand(self, name=None, args=0):
+        def inner(func):
+
+            cmd = AppCommand(func, name=name, args=args)
+            cmd.register_class(self.connected)
+
+            self.subcommands[name] = cmd.info()
+
+
+            return func #dont want mb to register this as a root command
+
+        return inner
+
     def run_cmd(self, ctx, *args):
+        
+        if self.subcommands and (args[0] if len(args) >= 1 else None) in self.subcommands:
+            self.subcommands[args[0]]["command"].run_cmd(ctx, *args[1:])
+            return
+        
         if not self.args == 0:
             args = args[: self.args]
 
@@ -39,6 +58,7 @@ def info(self):
                 "arg_types": self.arg_types,
                 "command": self,
                 "func": self.func,
+
             }
         }
 

MeowerBot/context.py

@@ -7,40 +7,22 @@
     from .Bot import Bot
 
 import weakref
+import requests
 
 
 class User:
     def __init__(self, bot, username):
         self.username = username
-        self._raw = None
-
+        
         self.bot = bot
-        self.bot.wss.sendPacket(
-            {
-                "cmd": "direct",
-                "val": {"cmd": "get_profile", "val": self.username},
-                "listener": f"get_user_{self.username}",
-            }
-        )
-
-        self.level = 0
-        self.pfp = 0
-        self.quote = ""
-
-    def _handle_usr_data(self, val, listener):
-        if listener is None:
-            return
-        if listener is not f"get_user_{self.username}":
-            return
-        if "mode" not in val or not val["mode"] == "profile":
-            return
-
-        # checks are finaly over lmao
-        self._raw = val["payload"]
+        self._raw = self.bot.api.get_user(self.username)
+
         self.level = self._raw["lvl"]
         self.pfp = self._raw["pfp_data"]
         self.quote = self._raw["quote"]
 
+    
+
     def ping(self, msg, to="home"):
         self.bot.send_msg(f"@{self.username} {msg}", to=to)
 

docs/index.md

@@ -1,4 +1,17 @@
 # MeowerBot.py Docs
 
+<!-- warning -->
+<table><td>:warning: These docs assume you actualy are fairly competent in python. Or have atleast learned OOP. </td></table>
+
+This guide is for MeowerBot.py v2.5.0
+
 - [refrence](./refrence/)
+	- [methods](./refrence/methods/) (only including cuz important)
 - [tutorial](./tutorial/)
+
+## What is MeowerBot.py?
+
+MeowerBot.py is a Bot library for https://meower.org (open source at https://github.com/meower-media-co/)
+
+MeowerBot.py itself is located at https://github.com/meower-community/MeowerBot.py
+

docs/refrence/callbacks/close.md

@@ -5,12 +5,7 @@
 This callback gets called when the bot`s wss closes
 
 ## args
-
-### bot
-
-A required keyword argument
-
-The bot object
+   - bot: MeowerBot.Bot
 
 ## example
 

docs/refrence/callbacks/error.md

@@ -5,13 +5,11 @@ This callback gets called when an exception gets raised.
 
 ## args
 
-### error
+ - error: Exception 
+   The error that caused this callback to get called
 
-The error that caused this callback to get called
 
-### bot
-
-A required keyword argument
+  - bot: MeowerBot.Bot
 
 ## example
 

docs/refrence/callbacks/login.md

@@ -27,6 +27,6 @@ bot = Bot()
 def login(bot=bot):
    print(f"logged in as {bot.username} with prefix {bot.prefix}")
 
-bot.callback(login)
+bot.callback(login, cbid="login") # when cbid is not specified it defaults to the function name (in this case "login")
 ```