clair/CVM-Sentry
1
0
Fork 0
Code Activity

rework pretty much everything

Browse Source
This commit is contained in:
Clair Delafuente
2025-10-01 21:44:18 -04:00
parent b40ff985f0
commit e79ec45c8d
1 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
cvmsentry.py
View File

@@ -103,16 +103,11 @@ async def connect(vm_name: str):
users[vm_name][new_name] = users[vm_name].pop(old_name) users[vm_name][new_name] = users[vm_name].pop(old_name)
case ["login", "1"]: case ["login", "1"]:
STATE = CollabVMState.LOGGED_IN STATE = CollabVMState.LOGGED_IN
await send_chat_message(websocket, "RICHARD NIXON TO THE RESCUE") #await send_chat_message(websocket, random.choice(config.autostart_messages))
case _: case ["chat", user, message]:
if decoded is not None: system_message = (user == "")
if decoded[0] in ("sync", "png", "flag", "turn", "size"): if system_message:
continue continue
elif decoded[0] == "chat":
user = "System" if len(decoded[1]) == 0 else decoded[1]
if user == "System" or STATE < CollabVMState.LOGGED_IN:
continue
message = decoded[2]
log.info(f"[{vm_name} - {user}]: {message}") log.info(f"[{vm_name} - {user}]: {message}")
utc_now = datetime.now(timezone.utc) utc_now = datetime.now(timezone.utc)
utc_day = utc_now.strftime("%Y-%m-%d") utc_day = utc_now.strftime("%Y-%m-%d")
@@ -140,42 +135,40 @@ async def connect(vm_name: str):
command = message[len(config.commands["prefix"]):].strip().lower() command = message[len(config.commands["prefix"]):].strip().lower()
match command: match command:
case "whoami": case "whoami":
await send_chat_message(websocket, f"You are {user} with rank {users[vm_name].get(user, 'Unknown').name}.") await send_chat_message(websocket, f"You are {user} with rank {users[vm_name][user]['rank'].name}.")
case "about": case "about":
await send_chat_message(websocket, "RICHARD NIXONTRON 4000") await send_chat_message(websocket, config.responses.get("about", "CVM-Sentry (NO RESPONSE CONFIGURED)"))
case "dump":
log.debug(f"{json.dumps(users)}")
case ["adduser", count, *list]:
for i in range(int(count)):
user = list[i * 2]
rank = CollabVMRank(int(list[i * 2 + 1]))
if user in users[vm_name]:
users[vm_name][user]["rank"] = rank
log.info(f"[{vm_name}] User '{user}' rank updated to {rank.name}.")
else:
users[vm_name][user] = {"rank": rank, "turn_active": False}
log.info(f"[{vm_name}] User '{user}' connected with rank {rank.name}.")
case ["turn", _, "0"]:
if STATE < CollabVMState.LOGGED_IN:
continue continue
elif decoded[0] == "adduser": log.debug(f"({STATE.name} - {vm_name}) Turn queue exhausted.")
if STATE == CollabVMState.LOGGED_IN: case ["turn", turn_time, count, current_turn, *queue]:
username = decoded[2] log.debug(f"({STATE.name} - {vm_name}) Turn queue updated: {queue} | Current turn: {current_turn} | Time left for current turn: {int(turn_time)//1000}s")
rank = CollabVMRank(int(decoded[3])) for user in users[vm_name]:
users[vm_name][username] = rank users[vm_name][user]["turn_active"] = (user == current_turn)
elif STATE < CollabVMState.LOGGED_IN: case ["remuser", count, *list]:
initial_user_payload = decoded[2:] for i in range(int(count)):
for i in range(0, len(initial_user_payload), 2): username = list[i]
username = initial_user_payload[i]
rank = CollabVMRank(int(initial_user_payload[i + 1]))
users[vm_name][username] = rank
elif decoded[0] == "remuser":
if STATE == CollabVMState.LOGGED_IN:
username = decoded[2]
if username in users[vm_name]: if username in users[vm_name]:
del users[vm_name][username] del users[vm_name][username]
elif decoded[0] == "rename": log.info(f"[{vm_name}] User '{username}' left.")
if STATE == CollabVMState.WS_CONNECTED and decoded[1:3] == ["0", "0"]: case _:
log.debug(f"AUTHORITATIVE GUEST NAME!! {decoded[3]}") if decoded is not None:
## SET CURRENT BOT NAME ## if decoded[0] in ("sync", "png", "flag", "size"):
vm_botuser[vm_name] = decoded[3] continue
elif STATE == CollabVMState.LOGGED_IN and decoded[2] in vm_botuser[vm_name]: log.debug(f"({STATE.name} - {vm_name}) Unhandled message: {decoded}")
log.debug(f"AUTHORITATIVE BOT NAME CHANGE!! {decoded[3]}")
## SET CURRENT BOT NAME ##
vm_botuser[vm_name] = decoded[3]
log.debug(
(
f"({CollabVMState(STATE).name} - {vm_name}) Received unfiltered: {decoded}"
)
)
for vm in config.vms.keys(): for vm in config.vms.keys():