Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Adminnotes fix continued message used for next note

Browse Source 
Also code cleanup
This commit is contained in:
Dico200
2015-04-16 18:33:09 +02:00
parent 7c30af86f2
commit ab1087f210
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
adminnotes.py
View File

@@ -13,10 +13,9 @@ def save_notes():
def r_ago(unit, i): def r_ago(unit, i):
# Return ago + plural # Return ago + plural
i = i
if i != 1: if i != 1:
unit +="s" unit += "s"
return str(i)+" "+unit+" ago" return "%s %s ago" % (i, unit)
def calc_diff(time_ago): def calc_diff(time_ago):
@@ -41,6 +40,7 @@ def calc_diff(time_ago):
def show_all_notes(sender): def show_all_notes(sender):
if len(notes) == 0: if len(notes) == 0:
msg(sender, "&aNo open notes at the moment!") msg(sender, "&aNo open notes at the moment!")
return
for i in range(0, len(notes)): for i in range(0, len(notes)):
arr = notes[i] arr = notes[i]
name = arr[0] name = arr[0]
@@ -76,17 +76,18 @@ def adminnotes_command(sender, command, label, args):
arglen = len(args) arglen = len(args)
# arg length not valid # arg length not valid
if arglen < 1: if arglen == 0:
show_all_notes(sender) show_all_notes(sender)
return return
# Shows note help # Shows note help
if args[0].lower() == "help": subcmd = args[0].lower()
if subcmd == "help":
show_an_help(sender) show_an_help(sender)
return return
# Delete note # Delete note
if args[0].lower() == "del": if subcmd == "del":
if arglen != 2: if arglen != 2:
show_an_help(sender) show_an_help(sender)
return return
@@ -106,29 +107,29 @@ def adminnotes_command(sender, command, label, args):
message = " ".join(args) message = " ".join(args)
name = sender.getName() name = sender.getName()
if name in continued_messages: if name in continued_messages:
message = continued_messages[name] + message message = continued_messages[name] + " " + message
del continued_messages[name]
if message[-2:] == "++": if message[-2:] == "++":
message = message[:-2] message = message[:-2]
if message[-1:] != " ":
message += " "
continued_messages[name] = message continued_messages[name] = message
msg(sender, "&6You can continue writing by using &e/an <text ...>") msg(sender, "&6You can continue writing by using &e/an <text ...>")
else: else:
notes.append([name, message, time.time()]) notes.append([name, message, time.time()])
save_notes() save_notes()
msg(sender, "&eNew note:&6 "+message) msg(sender, "&eNew note:&6 " + message)
broadcast(an_permission, "&a%s just added a new note! &2Type /an" % name) broadcast(an_permission, "&a%s just added a new note! &2Type /an" % name)
except: except:
print(print_traceback()) error(print_traceback())
@hook.event("player.PlayerJoinEvent", "monitor") @hook.event("player.PlayerJoinEvent", "monitor")
def on_an_join(event): def on_an_join(event):
if not event.getPlayer().hasPermission(an_permission): player = event.getPlayer()
noperm(event.getPlayer()) if not player.hasPermission(an_permission):
noperm(player)
return return
if len(notes) > 0: if len(notes) > 0:
msg(event.getPlayer(), "&cThere are currently %s open notes!" % len(notes)) msg(player, "&cThere are currently %s open notes!" % len(notes))
elif len(notes) == 0: elif len(notes) == 0:
msg(event.getPlayer(), "&aThere are currently no open notes!") msg(player, "&aThere are currently no open notes!")