diff --git a/server.py b/server.py index b329d91..33e1d8e 100644 --- a/server.py +++ b/server.py @@ -365,346 +365,350 @@ def session(connection, client, ip, isssl=False): motd = open(motd_file).read() connection.sendall(bytes(f":{server} 375 {pending} :- {server} Message of the Day -\r\n", "UTF-8")) for i in motd.rstrip().split("\n"): - connection.sendall(bytes(f":{server} 376 {pending} :- {i}\r\n", "UTF-8")) - connection.sendall(bytes(f":{server} 372 {pending} :End of /MOTD command\r\n", "UTF-8")) + connection.sendall(bytes(f":{server} 372 {pending} :- {i}\r\n", "UTF-8")) + connection.sendall(bytes(f":{server} 376 {pending} :End of /MOTD command\r\n", "UTF-8")) elif finished: - processedExternally = False - for i in commandProviders: - cmdrun = i.command(command=command, args=args, nick=pending, ip=client[0], user=property_list[pending], connection=connection) - if cmdrun["success"]: - if "identify" in cmdrun: - if cmdrun["identify"] == "logout": - if "o" in property_list[pending]["modes"]: - connection.sendall(bytes(f":{pending} MODE {pending} -o\r\n","UTF-8")) - if not "i" in property_list[pending]["modes"]: - connection.sendall(bytes(f":{pending} MODE {pending} +i\r\n","UTF-8")) - if not "w" in property_list[pending]["modes"]: - connection.sendall(bytes(f":{pending} MODE {pending} +w\r\n","UTF-8")) - property_list[pending]["modes"] = "iw" - property_list[pending]["identified"] = False - else: - property_list[pending]["identified"] = True - property_list[pending]["identusername"] = cmdrun["identify"][0] - temp_mode = cmdrun["identify"][1] - property_list[pending]["modes"] = temp_mode - connection.sendall(bytes(f":{pending} MODE {pending} +{temp_mode}\r\n","UTF-8")) - processedExternally = True - break - if processedExternally: - pass - elif command == "JOIN": - channels = text.split(" ")[1] - if channels[0] == ":": - channels = channels[1:] - for channelt in channels.split(","): - channel = channelt.strip() - if channel.lower() in lower_chans: - channel = lower_chans[channel.lower()] - success = True - if channel in channels_list: - if pending in channels_list[channel]: - success=False - print(f"{pending} is already in {channel} , ignoring JOIN request.") - if success: - try: - if channel in channels_list: - channels_list[channel].append(pending) + pendingCommands.append(text) + for comd in pendingCommands: + command = comd.split(" ")[0].upper() + args = comd.split(" ")[1:] + processedExternally = False + for i in commandProviders: + cmdrun = i.command(command=command, args=args, nick=pending, ip=client[0], user=property_list[pending], connection=connection) + if cmdrun["success"]: + if "identify" in cmdrun: + if cmdrun["identify"] == "logout": + if "o" in property_list[pending]["modes"]: + connection.sendall(bytes(f":{pending} MODE {pending} -o\r\n","UTF-8")) + if not "i" in property_list[pending]["modes"]: + connection.sendall(bytes(f":{pending} MODE {pending} +i\r\n","UTF-8")) + if not "w" in property_list[pending]["modes"]: + connection.sendall(bytes(f":{pending} MODE {pending} +w\r\n","UTF-8")) + property_list[pending]["modes"] = "iw" + property_list[pending]["identified"] = False else: - channels_list[channel] = [pending] - lower_chans[channel.lower()] = channel - topic_list[channel] = "Topic is not implemented." - except: - connection.sendall(bytes(f":{server} NOTICE * :*** Could not join {channel}\r\n","UTF-8")) - print(channels_list) - for i in channels_list[channel]: - try: - nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} JOIN {channel}\r\n","UTF-8")) - except: - pass - # Code re-used in the NAMES command - if channel in channels_list: - if pending in channels_list[channel]: - users = " ".join(channels_list[channel]) - connection.sendall(bytes(f":{server} 353 {pending} = {channel} :{users}\r\n","UTF-8")) - connection.sendall(bytes(f":{server} 366 {pending} {channel} :End of /NAMES list.\r\n","UTF-8")) - print("Successfully pre-loaded /NAMES list") - elif command == "LIST": - connection.sendall(bytes(f":{server} 321 {pending} Channel :Users Name\r\n","UTF-8")) - for key, value in topic_list.items(): - usersin = len(channels_list[key]) - connection.sendall(bytes(f":{server} 322 {pending} {key} {usersin} :{value}\r\n","UTF-8")) - connection.sendall(bytes(f":{server} 323 {pending} :End of /LIST\r\n","UTF-8")) - elif command == "PONG": - e = text.split(" ")[1] - if e == server or e == f":{server}": - print(pending + " replied to PING.") - property_list[pending]["last_ping"] = time.time() - property_list[pending]["ping_pending"] = False - elif command == "NICK": - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - elif text.split(" ")[1] == pending: + property_list[pending]["identified"] = True + property_list[pending]["identusername"] = cmdrun["identify"][0] + temp_mode = cmdrun["identify"][1] + property_list[pending]["modes"] = temp_mode + connection.sendall(bytes(f":{pending} MODE {pending} +{temp_mode}\r\n","UTF-8")) + processedExternally = True + break + if processedExternally: pass - else: - pending2 = text.split(" ")[1] - if pending2[0] == ":": pending2 = pending2[1:] - if "!" in pending2 or ":" in pending2 or "#" in pending2 or "*" in pending2: - connection.sendall(bytes(f":{server} 432 {pending} {pending2} :Erroneus nickname\r\n","UTF-8")) - elif pending2.lower() in lower_nicks: - connection.sendall(bytes(f":{server} 433 {pending} {pending2} :Nickname is already in use.\r\n","UTF-8")) - else: - print("Sending nickname change...") - connection.sendall(bytes(f":{pending}!{rident}@{hostname} NICK {pending2}\r\n","UTF-8")) - # Broadcast the nickname change - done = [] - for i, users in channels_list.items(): - if pending in users: - for j in users: - if j != pending and j != pending2 and not j in done: - print("Broadcasting on " + j) - nickname_list[j].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) - done.append(j) - # Replace the nickname - try: - print("Changing on " + i) - channels_list[i].remove(pending) - channels_list[i].append(pending2) - except: - print(traceback.format_exc()) - print("Moving config...") - property_list[pending2] = property_list.pop(pending) - nickname_list[pending2] = nickname_list.pop(pending) - del lower_nicks[pending.lower()] - lower_nicks[pending2.lower()] = pending2 - print("starting pinger...") - pending = pending2 - property_list[pending2]["ping_pending"] = False - property_list[pending2]["last_ping"] = time.time() - threading.Thread(target=pinger, args=[pending, connection]).start() - print(f"User {pending} set nick") - print("Broadcasting nickname change...") - elif command == "PART": - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - else: - channel = text.split(" ")[1] - for i in channels_list[channel]: - try: - nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) - except: - pass - try: - channels_list[channel].remove(pending) - except: - print(traceback.format_exc()) - elif command == "AWAY": - if len(args) == 0: - property_list[pending]["away"] = False - connection.sendall(bytes(f":{server} 305 {pending} :You are no longer marked as being away\r\n","UTF-8")) - else: - reasons = " ".join(args) - if reasons[0] == ":": reasons = reasons[1:] - property_list[pending]["away"] = True - property_list[pending]["reason"] = reasons - connection.sendall(bytes(f":{server} 306 {pending} :You have been marked as being away\r\n","UTF-8")) - elif command == "WHO": - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - else: - channel = text.split(" ")[1] - if channel in channels_list: - for i in channels_list[channel]: - who_host = property_list[i]["host"] - who_user = property_list[i]["username"] - who_realname = property_list[i]["realname"] - who_away = "G" if property_list[i]["away"] else "H" - connection.sendall(bytes(f":{server} 352 {pending} {channel} {who_user} {who_host} {server} {i} {who_away} :0 {who_realname}\r\n","UTF-8")) - elif channel in nickname_list: - who_host = property_list[channel]["host"] - who_user = property_list[channel]["username"] - who_realname = property_list[channel]["realname"] - who_away = "G" if property_list[channel]["away"] else "H" - connection.sendall(bytes(f":{server} 352 {pending} * {who_user} {who_host} {server} {channel} {who_away} :0 {who_realname}\r\n","UTF-8")) - - connection.sendall(bytes(f":{server} 315 {pending} {channel} :End of /WHO list.\r\n","UTF-8")) - elif command == "WHOIS": - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - else: - target = text.split(" ")[1] - if target.lower() in lower_nicks: - target = lower_nicks[target.lower()] - if target in property_list: - who_user = property_list[target]["username"] - who_realname = property_list[target]["realname"] - who_host = property_list[target]["host"] - who_identified = property_list[target]["identified"] - who_ssl = property_list[target]["ssl"] - if who_identified: - who_identifying = property_list[target]["identusername"] - else: - who_identifying = None - try: - who_flags = property_list[target]["modes"] - except: - who_flags = None - connection.sendall(bytes(f":{server} 311 {pending} {target} {who_user} {who_host} * :{who_realname}\r\n","UTF-8")) - connection.sendall(bytes(f":{server} 312 {pending} {target} {server} :{identifier}\r\n","UTF-8")) - if "o" in who_flags: connection.sendall(bytes(f":{server} 313 {pending} {target} :is an IRC operator\r\n","UTF-8")) - who_away = property_list[target]["away"] - if who_away: - who_reason = who_away = property_list[target]["reason"] - connection.sendall(bytes(f":{server} 301 {pending} {target} :{who_reason}\r\n","UTF-8")) - if who_identified: - connection.sendall(bytes(f":{server} 330 {pending} {target} {who_identifying} :is logged in as\r\n","UTF-8")) - if who_ssl: - connection.sendall(bytes(f":{server} 671 {pending} {target} :is using a secure connection\r\n","UTF-8")) - #connection.sendall(bytes(f":{server} 317 {pending} {target} {time} :seconds idle\r\n","UTF-8")) # I haven't implemented idle time yet. - if who_flags != None and who_flags != "iw": - connection.sendall(bytes(f":{server} 379 {pending} {target} :Is using modes +{who_flags}\r\n","UTF-8")) - connection.sendall(bytes(f":{server} 318 {pending} {target} :End of /WHOIS list\r\n","UTF-8")) - else: - connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) - elif command == "NAMES": - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - else: - channel = text.split(" ")[1] - if channel in channels_list: + elif command == "JOIN": + channels = text.split(" ")[1] + if channels[0] == ":": + channels = channels[1:] + for channelt in channels.split(","): + channel = channelt.strip() + if channel.lower() in lower_chans: + channel = lower_chans[channel.lower()] + success = True + if channel in channels_list: if pending in channels_list[channel]: - users = " ".join(channels_list[channel]) - connection.sendall(bytes(f":{server} 353 {pending} = {channel} :{users}\r\n","UTF-8")) - connection.sendall(bytes(f":{server} 366 {pending} {channel} :End of /NAMES list.\r\n","UTF-8")) - elif command == "NOTICE": - if len(args) >= 2: - target = text.split(" ")[1] - if target.lower() in lower_nicks: - target = lower_nicks[target.lower()] - if target in channels_list: - if pending in channels_list[target]: + success=False + print(f"{pending} is already in {channel} , ignoring JOIN request.") + if success: + try: + if channel in channels_list: + channels_list[channel].append(pending) + else: + channels_list[channel] = [pending] + lower_chans[channel.lower()] = channel + topic_list[channel] = "Topic is not implemented." + except: + connection.sendall(bytes(f":{server} NOTICE * :*** Could not join {channel}\r\n","UTF-8")) + print(channels_list) for i in channels_list[channel]: try: - if i != pending: - nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} JOIN {channel}\r\n","UTF-8")) except: pass - elif target in nickname_list: - nickname_list[target].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + # Code re-used in the NAMES command + if channel in channels_list: + if pending in channels_list[channel]: + users = " ".join(channels_list[channel]) + connection.sendall(bytes(f":{server} 353 {pending} = {channel} :{users}\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 366 {pending} {channel} :End of /NAMES list.\r\n","UTF-8")) + print("Successfully pre-loaded /NAMES list") + elif command == "LIST": + connection.sendall(bytes(f":{server} 321 {pending} Channel :Users Name\r\n","UTF-8")) + for key, value in topic_list.items(): + usersin = len(channels_list[key]) + connection.sendall(bytes(f":{server} 322 {pending} {key} {usersin} :{value}\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 323 {pending} :End of /LIST\r\n","UTF-8")) + elif command == "PONG": + e = text.split(" ")[1] + if e == server or e == f":{server}": + print(pending + " replied to PING.") + property_list[pending]["last_ping"] = time.time() + property_list[pending]["ping_pending"] = False + elif command == "NICK": + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + elif text.split(" ")[1] == pending: + pass else: - connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) - else: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - elif command == "QUIT": - # Parse the quit message. - done = [] - if len(text.split(" ")) == 1: - msg = "Client Quit" - else: - msg = text.split(" ")[1:] - if msg[0][0] == ":": - msg[0]=msg[0][1:] - if len(msg) > 0: - mse = " ".join(msg) - msg = f"Quit: {mse}" - text = f"QUIT :{msg}" - # Broadcast all users in the joined channels that the person quit. - for i, users in channels_list.items(): - if pending in users: - for j in users: - if j != pending and not j in done: - nickname_list[j].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) - done.append(j) - # Remove the quitting user from the channel. + pending2 = text.split(" ")[1] + if pending2[0] == ":": pending2 = pending2[1:] + if "!" in pending2 or ":" in pending2 or "#" in pending2 or "*" in pending2: + connection.sendall(bytes(f":{server} 432 {pending} {pending2} :Erroneus nickname\r\n","UTF-8")) + elif pending2.lower() in lower_nicks: + connection.sendall(bytes(f":{server} 433 {pending} {pending2} :Nickname is already in use.\r\n","UTF-8")) + else: + print("Sending nickname change...") + connection.sendall(bytes(f":{pending}!{rident}@{hostname} NICK {pending2}\r\n","UTF-8")) + # Broadcast the nickname change + done = [] + for i, users in channels_list.items(): + if pending in users: + for j in users: + if j != pending and j != pending2 and not j in done: + print("Broadcasting on " + j) + nickname_list[j].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + done.append(j) + # Replace the nickname + try: + print("Changing on " + i) + channels_list[i].remove(pending) + channels_list[i].append(pending2) + except: + print(traceback.format_exc()) + print("Moving config...") + property_list[pending2] = property_list.pop(pending) + nickname_list[pending2] = nickname_list.pop(pending) + del lower_nicks[pending.lower()] + lower_nicks[pending2.lower()] = pending2 + print("starting pinger...") + pending = pending2 + property_list[pending2]["ping_pending"] = False + property_list[pending2]["last_ping"] = time.time() + threading.Thread(target=pinger, args=[pending, connection]).start() + print(f"User {pending} set nick") + print("Broadcasting nickname change...") + elif command == "PART": + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + else: + channel = text.split(" ")[1] + for i in channels_list[channel]: + try: + nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + except: + pass try: - channels_list[i].remove(pending) + channels_list[channel].remove(pending) except: print(traceback.format_exc()) - # Confirm QUIT and close the socket. - try: - connection.sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) - connection.sendall(bytes(f"ERROR :Closing Link: {hostname} ({msg})\r\n","UTF-8")) - finally: - connection.close() - safe_quit = True - break - elif command == "MODE": - target = args[0] - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - elif len(args) == 1: - if args[0] == pending: - yourmodes = property_list[pending]["modes"] - connection.sendall(bytes(f":{server} 221 {pending} +{yourmodes}\r\n","UTF-8")) - elif args[0] in channels_list: - if args[0] in property_list: - if "modes" in property_list[args[0]]: - # Get the modes + parameters, then print them out. - modes = property_list[args[0]]["modes"] - params = property_list[args[0]]["params"] - connection.sendall(bytes(f":{server} 221 {pending} {target} +{modes} {params}\r\n","UTF-8")) + elif command == "AWAY": + if len(args) == 0: + property_list[pending]["away"] = False + connection.sendall(bytes(f":{server} 305 {pending} :You are no longer marked as being away\r\n","UTF-8")) + else: + reasons = " ".join(args) + if reasons[0] == ":": reasons = reasons[1:] + property_list[pending]["away"] = True + property_list[pending]["reason"] = reasons + connection.sendall(bytes(f":{server} 306 {pending} :You have been marked as being away\r\n","UTF-8")) + elif command == "WHO": + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + else: + channel = text.split(" ")[1] + if channel in channels_list: + for i in channels_list[channel]: + who_host = property_list[i]["host"] + who_user = property_list[i]["username"] + who_realname = property_list[i]["realname"] + who_away = "G" if property_list[i]["away"] else "H" + connection.sendall(bytes(f":{server} 352 {pending} {channel} {who_user} {who_host} {server} {i} {who_away} :0 {who_realname}\r\n","UTF-8")) + elif channel in nickname_list: + who_host = property_list[channel]["host"] + who_user = property_list[channel]["username"] + who_realname = property_list[channel]["realname"] + who_away = "G" if property_list[channel]["away"] else "H" + connection.sendall(bytes(f":{server} 352 {pending} * {who_user} {who_host} {server} {channel} {who_away} :0 {who_realname}\r\n","UTF-8")) + + connection.sendall(bytes(f":{server} 315 {pending} {channel} :End of /WHO list.\r\n","UTF-8")) + elif command == "WHOIS": + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + else: + target = text.split(" ")[1] + if target.lower() in lower_nicks: + target = lower_nicks[target.lower()] + if target in property_list: + who_user = property_list[target]["username"] + who_realname = property_list[target]["realname"] + who_host = property_list[target]["host"] + who_identified = property_list[target]["identified"] + who_ssl = property_list[target]["ssl"] + if who_identified: + who_identifying = property_list[target]["identusername"] + else: + who_identifying = None + try: + who_flags = property_list[target]["modes"] + except: + who_flags = None + connection.sendall(bytes(f":{server} 311 {pending} {target} {who_user} {who_host} * :{who_realname}\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 312 {pending} {target} {server} :{identifier}\r\n","UTF-8")) + if "o" in who_flags: connection.sendall(bytes(f":{server} 313 {pending} {target} :is an IRC operator\r\n","UTF-8")) + who_away = property_list[target]["away"] + if who_away: + who_reason = who_away = property_list[target]["reason"] + connection.sendall(bytes(f":{server} 301 {pending} {target} :{who_reason}\r\n","UTF-8")) + if who_identified: + connection.sendall(bytes(f":{server} 330 {pending} {target} {who_identifying} :is logged in as\r\n","UTF-8")) + if who_ssl: + connection.sendall(bytes(f":{server} 671 {pending} {target} :is using a secure connection\r\n","UTF-8")) + #connection.sendall(bytes(f":{server} 317 {pending} {target} {time} :seconds idle\r\n","UTF-8")) # I haven't implemented idle time yet. + if who_flags != None and who_flags != "iw": + connection.sendall(bytes(f":{server} 379 {pending} {target} :Is using modes +{who_flags}\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 318 {pending} {target} :End of /WHOIS list\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) + elif command == "NAMES": + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + else: + channel = text.split(" ")[1] + if channel in channels_list: + if pending in channels_list[channel]: + users = " ".join(channels_list[channel]) + connection.sendall(bytes(f":{server} 353 {pending} = {channel} :{users}\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 366 {pending} {channel} :End of /NAMES list.\r\n","UTF-8")) + elif command == "NOTICE": + if len(args) >= 2: + target = text.split(" ")[1] + if target.lower() in lower_nicks: + target = lower_nicks[target.lower()] + if target in channels_list: + if pending in channels_list[target]: + for i in channels_list[channel]: + try: + if i != pending: + nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + except: + pass + elif target in nickname_list: + nickname_list[target].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + elif command == "QUIT": + # Parse the quit message. + done = [] + if len(text.split(" ")) == 1: + msg = "Client Quit" + else: + msg = text.split(" ")[1:] + if msg[0][0] == ":": + msg[0]=msg[0][1:] + if len(msg) > 0: + mse = " ".join(msg) + msg = f"Quit: {mse}" + text = f"QUIT :{msg}" + # Broadcast all users in the joined channels that the person quit. + for i, users in channels_list.items(): + if pending in users: + for j in users: + if j != pending and not j in done: + nickname_list[j].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + done.append(j) + # Remove the quitting user from the channel. + try: + channels_list[i].remove(pending) + except: + print(traceback.format_exc()) + # Confirm QUIT and close the socket. + try: + connection.sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + connection.sendall(bytes(f"ERROR :Closing Link: {hostname} ({msg})\r\n","UTF-8")) + finally: + connection.close() + safe_quit = True + break + elif command == "MODE": + target = args[0] + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + elif len(args) == 1: + if args[0] == pending: + yourmodes = property_list[pending]["modes"] + connection.sendall(bytes(f":{server} 221 {pending} +{yourmodes}\r\n","UTF-8")) + elif args[0] in channels_list: + if args[0] in property_list: + if "modes" in property_list[args[0]]: + # Get the modes + parameters, then print them out. + modes = property_list[args[0]]["modes"] + params = property_list[args[0]]["params"] + connection.sendall(bytes(f":{server} 221 {pending} {target} +{modes} {params}\r\n","UTF-8")) + else: + # Default channel mode + connection.sendall(bytes(f":{server} 324 {pending} {target} +n\r\n","UTF-8")) else: # Default channel mode connection.sendall(bytes(f":{server} 324 {pending} {target} +n\r\n","UTF-8")) else: - # Default channel mode - connection.sendall(bytes(f":{server} 324 {pending} {target} +n\r\n","UTF-8")) - else: - if args[0][0] == "#": - connection.sendall(bytes(f":{server} 403 {pending} {target} :No such channel\r\n","UTF-8")) - else: - connection.sendall(bytes(f":{server} 505 {pending} :Cant change mode for other users\r\n","UTF-8")) + if args[0][0] == "#": + connection.sendall(bytes(f":{server} 403 {pending} {target} :No such channel\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 505 {pending} :Cant change mode for other users\r\n","UTF-8")) - elif command == "CATSERV" or (command == "PRIVMSG" and args[0].lower() == "catserv"): - if command == "PRIVMSG": - args = args[1:] - if args[0][0] == ":": - args[0] = args[0][1:] - if len(args) == 0: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) - elif args[0].upper() == "PULL": - updater = subprocess.run(["git", "pull"], stdout=subprocess.PIPE) - if updater.stdout.decode().strip() == "Already up to date.": - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Codename IRCat is already up-to-date.\r\n","UTF-8")) + elif command == "CATSERV" or (command == "PRIVMSG" and args[0].lower() == "catserv"): + if command == "PRIVMSG": + args = args[1:] + if args[0][0] == ":": + args[0] = args[0][1:] + if len(args) == 0: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + elif args[0].upper() == "PULL": + updater = subprocess.run(["git", "pull"], stdout=subprocess.PIPE) + if updater.stdout.decode().strip() == "Already up to date.": + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Codename IRCat is already up-to-date.\r\n","UTF-8")) + else: + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Done, it is recommended to use /RESTART if you're an IRC op\r\n","UTF-8")) + elif args[0].upper() == "VERSION": + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Codename IRCat version {__version__}\r\n","UTF-8")) + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :This is Codename IRCat's integrated services.\r\n","UTF-8")) else: - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Done, it is recommended to use /RESTART if you're an IRC op\r\n","UTF-8")) - elif args[0].upper() == "VERSION": - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :Codename IRCat version {__version__}\r\n","UTF-8")) - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :This is Codename IRCat's integrated services.\r\n","UTF-8")) - else: - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :CatServ Usage:\r\n","UTF-8")) - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :PULL - Pulls the latest version of Codename IRCat\r\n","UTF-8")) - connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :VERSION - Gets the version number of this service.\r\n","UTF-8")) - elif command == "RESTART": - if "o" in property_list[pending]["modes"]: - global opened - opened = False - else: - connection.sendall(bytes(f":{server} 481 {pending} :Permission Denied- You're not an IRC operator\r\n","UTF-8")) - elif command == "PRIVMSG": - if len(args) >= 2: - target = text.split(" ")[1] - if target.lower() in lower_nicks: - target = lower_nicks[target.lower()] - if target in channels_list: - print("Sending to "+ target + " Channel") - if pending in channels_list[target]: - print(channels_list[target]) - for i in channels_list[target]: - try: - if i != pending: - print(i) - print(f":{pending}!{rident}@{hostname} {text}\r\n") - nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) - else: - print(i + " Is the current user!") - except: - print(traceback.format_exc) - elif target in nickname_list: - nickname_list[target].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :CatServ Usage:\r\n","UTF-8")) + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :PULL - Pulls the latest version of Codename IRCat\r\n","UTF-8")) + connection.sendall(bytes(f":CatServ!Meow@IRCatCore NOTICE {pending} :VERSION - Gets the version number of this service.\r\n","UTF-8")) + elif command == "RESTART": + if "o" in property_list[pending]["modes"]: + global opened + opened = False else: - connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) - else: - connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) + connection.sendall(bytes(f":{server} 481 {pending} :Permission Denied- You're not an IRC operator\r\n","UTF-8")) + elif command == "PRIVMSG": + if len(args) >= 2: + target = text.split(" ")[1] + if target.lower() in lower_nicks: + target = lower_nicks[target.lower()] + if target in channels_list: + print("Sending to "+ target + " Channel") + if pending in channels_list[target]: + print(channels_list[target]) + for i in channels_list[target]: + try: + if i != pending: + print(i) + print(f":{pending}!{rident}@{hostname} {text}\r\n") + nickname_list[i].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + else: + print(i + " Is the current user!") + except: + print(traceback.format_exc) + elif target in nickname_list: + nickname_list[target].sendall(bytes(f":{pending}!{rident}@{hostname} {text}\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 401 {pending} {target} :No such nick/channel\r\n","UTF-8")) + else: + connection.sendall(bytes(f":{server} 461 {pending} {command} :Not enough parameters\r\n","UTF-8")) else: pendingCommands.append(text)