Update bot.py

Author: ComputerTech312

src/bot.py

@@ -4,14 +4,15 @@
 importssl
 importtime
 importjson
-importbase64
+importinspect
 importsys
 importos
 importimportlib.util
 fromsrc.channel_managerimportChannelManager
 fromsrc.loggerimportLogger
 fromsrc.plugin_baseimportPluginBase
-fromsrc.saslimporthandle_sasl, handle_authenticate, handle_903
+fromsrc.saslimportSASLHandler
+fromsrc.event_handlersimporthandle_ping, handle_cap, handle_authenticate, handle_903, handle_privmsg, handle_001, handle_invite, handle_version
 
 classBot:
 def__init__(self, config_file):
@@ -22,20 +23,41 @@ def __init__(self, config_file):
 self.ircsock=None
 self.running=True
 self.plugins= []
+self.sasl_handler=SASLHandler(self.config, self._ircsend)
 self.load_plugins()
 
-defload_plugins(self, plugin_name=None):
-self.plugins= [pforpinself.pluginsifplugin_nameisNoneorp.__class__.__name__!=plugin_name]
+self.command_handlers={
+'PING': handle_ping,
+'CAP': handle_cap,
+'AUTHENTICATE': handle_authenticate,
+'903': handle_903,
+'PRIVMSG': handle_privmsg,
+'001': handle_001,
+'INVITE': handle_invite,
+'VERSION': handle_version,
+ }
+
+defprocess_command(self, command, args):
+handler=self.command_handlers.get(command)
+ifhandler:
+handler(self, args)
+else:
+self.logger.debug(f'Received: source: {self} | command: {command} | args: {args}')
+self.logger.info(f'No handler for command {command}')
+
+defload_plugins(self):
+self.plugins= []
 plugin_folder="./plugins"
 forfilenameinos.listdir(plugin_folder):
-iffilename.endswith('.py')and (plugin_nameisNoneorfilename==plugin_name+'.py'):
+iffilename.endswith('.py'):
 filepath=os.path.join(plugin_folder, filename)
 spec=importlib.util.spec_from_file_location("module.name", filepath)
 module=importlib.util.module_from_spec(spec)
 spec.loader.exec_module(module)
-ifhasattr(module, 'Plugin') andissubclass(module.Plugin, PluginBase):
-plugin_instance=module.Plugin(self)
-self.plugins.append(plugin_instance)
+forname, objininspect.getmembers(module):
+ifinspect.isclass(obj) andissubclass(obj, PluginBase) andobjisnotPluginBase:
+plugin_instance=obj(self)
+self.plugins.append(plugin_instance)
 
 def_load_config(self, config_file):
 try:
@@ -95,20 +117,20 @@ def connect(self):
 self.ircsock=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 self.ircsock.settimeout(240)
 
-ifstr(self.config['BPORT'])[:1] =='+':
+ifstr(self.config["Connection"].get("Port"))[:1] =='+':
 context=ssl.create_default_context()
-self.ircsock=context.wrap_socket(self.ircsock, server_hostname=self.config['BSERVER'])
-port=int(self.config['BPORT'][1:])
+self.ircsock=context.wrap_socket(self.ircsock, server_hostname=self.config["Connection"].get("Hostname"))
+port=int(self.config['Connection'].get('Port')[1:])
 else:
-port=int(self.config['BPORT'])
+port=int(self.config['Connection'].get('Port'))
 
-if'BBINDHOST'inself.config:
-self.ircsock.bind((self.config['BBINDHOST'], 0))
+if'BindHost'inself.config:
+self.ircsock.bind((self.config['Connection'].get('BindHost'), 0))
 
-self.ircsock.connect_ex((self.config['BSERVER'], port))
-self._ircsend(f'NICK {self.config["BNICK"]}')
-self._ircsend(f'USER {self.config["BIDENT"]} * * :{self.config["BNAME"]}')
-ifself.config['UseSASL']:
+self.ircsock.connect_ex((self.config['Connection'].get('Hostname'), port))
+self._ircsend(f'NICK {self.config["Connection"].get("Nick")}')
+self._ircsend(f'USER {self.config["Connection"].get("Ident")} * * :{self.config["Connection"].get("Name")}')
+ifself.config["SASL"].get("UseSASL"):
 self._ircsend('CAP REQ :sasl')
 exceptExceptionase:
 self.logger.error(f"Error establishing connection: {e}")
@@ -136,44 +158,7 @@ def start(self):
 source, command, args=self._parse_message(ircmsg)
 self.logger.debug(f'Received: source: {source} | command: {command} | args: {args}')
 
-ifcommand=='PING':
-nospoof=args[0][1:] ifargs[0].startswith(':') elseargs[0]
-self._ircsend(f'PONG :{nospoof}')
-
-
-ifcommand=='CAP'andargs[1] =='ACK'and'sasl'inargs[2]:
-handle_sasl(self.config, self._ircsend)
-
-elifcommand=='AUTHENTICATE':
-handle_authenticate(args, self.config, self._ircsend)
-
-elifcommand=='903':
-handle_903(self._ircsend)
-
-ifcommand=='PRIVMSG'andargs[1].startswith('\x01VERSION\x01'):
-source_nick=source.split('!')[0]
-self._ircsend(f'NOTICE {source_nick} :\x01VERSION EliteBot 0.1\x01')
-
-ifcommand=='PRIVMSG':
-channel, message=args[0], args[1]
-source_nick=source.split('!')[0]
-ifmessage.startswith('&'):
-cmd, *cmd_args=message[1:].split()
-self.handle_command(source_nick, channel, cmd, cmd_args)
-forplugininself.plugins:
-plugin.handle_message(source_nick, channel, message)
-
-ifcommand=='001':
-forchannelinself.channel_manager.get_channels():
-self._ircsend(f'JOIN {channel}')
-
-ifcommand=='INVITE':
-channel=args[1]
-self._ircsend(f'join {channel}')
-self.channel_manager.save_channel(channel)
-
-ifcommand=='VERSION':
-self._ircsend('NOTICE', f'{source_nick} :I am a bot version 1.0.0')
+self.process_command(command, args)
 
 exceptsocket.timeout:
 self.connected=False