EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improvements to fokabot commands

Browse Source
This commit is contained in:
Giuseppe Guerra 2018-03-23 21:37:47 +01:00
parent 201593ea02
commit a809008e55
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
constants/fokabotCommands.py
View File

@ -41,32 +41,24 @@ def instantRestart(fro, chan, message):
def faq(fro, chan, message): def faq(fro, chan, message):
# TODO: Unhardcode this # TODO: Unhardcode this
if message[0] == "rules": messages = {
return "Please make sure to check (Ripple's rules)[http://ripple.moe/?p=23]." "rules": "Please make sure to check (Ripple's rules)[https://ripple.moe/doc/rules].",
elif message[0] == "swearing": "swearing": "Please don't abuse swearing",
return "Please don't abuse swearing" "spam": "Please don't spam",
elif message[0] == "spam": "offend": "Please don't offend other players",
return "Please don't spam" "github": "(Ripple's Github page!)[https://github.com/osuripple/ripple]",
elif message[0] == "offend": "discord": "(Join Ripple's Discord!)[https://discord.gg/0rJcZruIsA6rXuIx]",
return "Please don't offend other players" "blog": "You can find the latest Ripple news on the (blog)[https://blog.ripple.moe]!",
elif message[0] == "github": "changelog": "Check the (changelog)[https://ripple.moe/changelog] !",
return "(Ripple's Github page!)[https://github.com/osuripple/ripple]" "status": "Check the server status (here!)[https://status.ripple.moe]",
elif message[0] == "discord": "english": "Please keep this channel in english.",
return "(Join Ripple's Discord!)[https://discord.gg/0rJcZruIsA6rXuIx]" "topic": "Can you please drop the topic and talk about something else?",
elif message[0] == "blog": "lines": "Please try to keep your sentences on a single line to avoid getting silenced."
return "You can find the latest Ripple news on the (blog)[https://ripple.moe/blog/]!" }
elif message[0] == "changelog": key = message[0].lower()
return "Check the (changelog)[https://ripple.moe/index.php?p=17] !" if key not in messages:
elif message[0] == "status":
return "Check the server status (here!)[https://ripple.moe/index.php?p=27]"
elif message[0] == "english":
return "Please keep this channel in english."
elif message[0] == "topic":
return "Can you please drop the topic and talk about something else?"
elif message[0] == "lines":
return "Please try to keep your sentences on a single line to avoid getting silenced."
else:
return False return False
return messages[key]
def roll(fro, chan, message): def roll(fro, chan, message):
maxPoints = 100 maxPoints = 100
@ -81,8 +73,8 @@ def roll(fro, chan, message):
# return random.choice(["yes", "no", "maybe"]) # return random.choice(["yes", "no", "maybe"])
def alert(fro, chan, message): def alert(fro, chan, message):
msg = ' '.join(message[:]) msg = ' '.join(message[:]).strip()
if not msg.strip(): if not msg:
return False return False
glob.streams.broadcast("main", serverPackets.notification(msg)) glob.streams.broadcast("main", serverPackets.notification(msg))
return False return False
@ -91,8 +83,8 @@ def alertUser(fro, chan, message):
target = message[0].lower() target = message[0].lower()
targetToken = glob.tokens.getTokenFromUsername(userUtils.safeUsername(target), safe=True) targetToken = glob.tokens.getTokenFromUsername(userUtils.safeUsername(target), safe=True)
if targetToken is not None: if targetToken is not None:
msg = ' '.join(message[1:]) msg = ' '.join(message[1:]).strip()
if not msg.strip(): if not msg:
return False return False
targetToken.enqueue(serverPackets.notification(msg)) targetToken.enqueue(serverPackets.notification(msg))
return False return False
@ -160,12 +152,15 @@ def fokabotReconnect(fro, chan, message):
return False return False
def silence(fro, chan, message): def silence(fro, chan, message):
for i in message: message = [x.lower() for x in message]
i = i.lower()
target = message[0] target = message[0]
amount = message[1] amount = message[1]
unit = message[2] unit = message[2]
reason = ' '.join(message[3:]) reason = ' '.join(message[3:]).strip()
if not reason:
return "Please provide a valid reason."
if not amount.isdigit():
return "The amount must be a number."
# Get target user ID # Get target user ID
targetUserID = userUtils.getIDSafe(target) targetUserID = userUtils.getIDSafe(target)
@ -1114,7 +1109,9 @@ def multiplayer(fro, chan, message):
def switchServer(fro, chan, message): def switchServer(fro, chan, message):
# Get target user ID # Get target user ID
target = message[0] target = message[0]
newServer = message[1] newServer = message[1].strip()
if not newServer:
return "Invalid server IP"
targetUserID = userUtils.getIDSafe(target) targetUserID = userUtils.getIDSafe(target)
userID = userUtils.getID(fro) userID = userUtils.getID(fro)
@ -1132,7 +1129,9 @@ def switchServer(fro, chan, message):
def rtx(fro, chan, message): def rtx(fro, chan, message):
target = message[0] target = message[0]
message = " ".join(message[1:]) message = " ".join(message[1:]).strip()
if not message:
return "Invalid message"
targetUserID = userUtils.getIDSafe(target) targetUserID = userUtils.getIDSafe(target)
if not targetUserID: if not targetUserID:
return "{}: user not found".format(target) return "{}: user not found".format(target)