diff options
author | jomo <github@jomo.tv> | 2015-01-06 23:38:42 +0100 |
---|---|---|
committer | jomo <github@jomo.tv> | 2015-01-06 23:38:42 +0100 |
commit | 9a916ed2cd9440d46079f9b7db421a7b9fcbf6ee (patch) | |
tree | 3af33b3ddc2fa3159f9243b0ade09b3e3cc96425 /saylol.py | |
parent | 3435e994326b14f700777741a76dd990a2bc703f (diff) |
change indentation from 2 spaces to 4, fix #5
Diffstat (limited to 'saylol.py')
-rw-r--r-- | saylol.py | 146 |
1 files changed, 73 insertions, 73 deletions
@@ -9,95 +9,95 @@ last_msg = 0 def save_lols(): - save_json_file("lol", lols) + save_json_file("lol", lols) def add_lol(txt): - lols.append(txt) - save_lols() + lols.append(txt) + save_lols() def del_lol(lid): - lols.pop(lid) - save_lols() + lols.pop(lid) + save_lols() def print_lol(sender, lid): - global last_msg - if time() - last_msg > timeout: - if len(lols) > lid: - dispname = sender.getDisplayName() if is_player(sender) else sender.getName() - broadcast(None, "&8[&blol&8] &7%s&8: &e%s" % (dispname, lols[lid])) - last_msg = time() + global last_msg + if time() - last_msg > timeout: + if len(lols) > lid: + dispname = sender.getDisplayName() if is_player(sender) else sender.getName() + broadcast(None, "&8[&blol&8] &7%s&8: &e%s" % (dispname, lols[lid])) + last_msg = time() + else: + msg(sender, "&cInvalid id") else: - msg(sender, "&cInvalid id") - else: - msg(sender, "&cYou can use SayLol again in &a%s seconds!" % int(timeout + 1 - (time() - last_msg))) + msg(sender, "&cYou can use SayLol again in &a%s seconds!" % int(timeout + 1 - (time() - last_msg))) def search_lols(sender, keyword): - if not keyword: - msg(sender, "&cPlease provide a keyword to search for!") - return - keyword = keyword.lower() - msg(sender, "&aLols containing '&6%s&a':" % keyword) - for i, lol in enumerate(lols): - if keyword in lol.lower(): - msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lol)) - msg(sender, "") # empty line showing end of list + if not keyword: + msg(sender, "&cPlease provide a keyword to search for!") + return + keyword = keyword.lower() + msg(sender, "&aLols containing '&6%s&a':" % keyword) + for i, lol in enumerate(lols): + if keyword in lol.lower(): + msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lol)) + msg(sender, "") # empty line showing end of list @hook.command("lol") def on_lol_command(sender, args): - plugin_header(sender, "SayLol") + plugin_header(sender, "SayLol") + + cmd = args[0] if len(args) > 0 else None + if len(args) == 0: + if sender.hasPermission("utils.lol"): + print_lol(sender, randrange(len(lols))) + else: + noperm(sender) + + elif cmd == "id": + if sender.hasPermission("utils.lol.id"): + try: + i = int(args[1]) + print_lol(sender, i) + except ValueError: + msg(sender, "&cInvalid number '&e%s&c'" % args[1]) + else: + noperm(sender) + + elif cmd == "list": + for i in range(len(lols)): + msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i])) + + elif cmd == "search": + if sender.hasPermission("utils.lol.search"): + search_lols(sender, " ".join(args[1:])) + else: + noperm(sender) + + elif cmd == "add": + if sender.hasPermission("utils.lol.modify"): + add_lol(" ".join(args[1:])) + msg(sender, "&aNew lol message added!") + else: + noperm(sender) + + elif cmd == "del": + if sender.hasPermission("utils.lol.modify"): + try: + i = int(args[1]) + del_lol(i) + msg(sender, "&aLol message &e#%s&a deleted!" % i) + except ValueError: + msg(sender, "&cInvalid number '&e%s&c'" % args[1]) - cmd = args[0] if len(args) > 0 else None - if len(args) == 0: - if sender.hasPermission("utils.lol"): - print_lol(sender, randrange(len(lols))) else: - noperm(sender) - - elif cmd == "id": - if sender.hasPermission("utils.lol.id"): - try: - i = int(args[1]) - print_lol(sender, i) - except ValueError: - msg(sender, "&cInvalid number '&e%s&c'" % args[1]) - else: - noperm(sender) - - elif cmd == "list": - for i in range(len(lols)): - msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i])) - - elif cmd == "search": - if sender.hasPermission("utils.lol.search"): - search_lols(sender, " ".join(args[1:])) - else: - noperm(sender) - - elif cmd == "add": - if sender.hasPermission("utils.lol.modify"): - add_lol(" ".join(args[1:])) - msg(sender, "&aNew lol message added!") - else: - noperm(sender) - - elif cmd == "del": - if sender.hasPermission("utils.lol.modify"): - try: - i = int(args[1]) - del_lol(i) - msg(sender, "&aLol message &e#%s&a deleted!" % i) - except ValueError: - msg(sender, "&cInvalid number '&e%s&c'" % args[1]) - - else: - msg(sender, "&a/lol &eSay random message") - msg(sender, "&a/lol list &eList all messages") - msg(sender, "&a/lol id <id> &eSay specific message") - msg(sender, "&a/lol add <text> &eAdd message") - msg(sender, "&a/lol del <id> &eDelete message") - return True + msg(sender, "&a/lol &eSay random message") + msg(sender, "&a/lol list &eList all messages") + msg(sender, "&a/lol id <id> &eSay specific message") + msg(sender, "&a/lol add <text> &eAdd message") + msg(sender, "&a/lol del <id> &eDelete message") + return True |