summaryrefslogtreecommitdiff
path: root/friends.py
diff options
context:
space:
mode:
authorjomo <github@jomo.tv>2015-01-06 23:38:42 +0100
committerjomo <github@jomo.tv>2015-01-06 23:38:42 +0100
commit9a916ed2cd9440d46079f9b7db421a7b9fcbf6ee (patch)
tree3af33b3ddc2fa3159f9243b0ade09b3e3cc96425 /friends.py
parent3435e994326b14f700777741a76dd990a2bc703f (diff)
change indentation from 2 spaces to 4, fix #5
Diffstat (limited to 'friends.py')
-rw-r--r--friends.py238
1 files changed, 119 insertions, 119 deletions
diff --git a/friends.py b/friends.py
index d8a70ea..689c526 100644
--- a/friends.py
+++ b/friends.py
@@ -8,153 +8,153 @@ friend_join_sound = "random.orb"
@hook.event("player.PlayerJoinEvent", "high") # creates sound and sends a bold message on friend join
def fjm(event): # friend join message
- player = event.getPlayer()
- player_id = uid(player)
+ player = event.getPlayer()
+ player_id = uid(player)
- for onlineplayer in list(server.getOnlinePlayers()):
- if player_id in friends.get(uid(onlineplayer), []):
- msg(onlineplayer, "&a&l%s &ajoined!" % player.getName())
- onlineplayer.playSound(onlineplayer.getLocation(), friend_join_sound, 1, 0)
+ for onlineplayer in list(server.getOnlinePlayers()):
+ if player_id in friends.get(uid(onlineplayer), []):
+ msg(onlineplayer, "&a&l%s &ajoined!" % player.getName())
+ onlineplayer.playSound(onlineplayer.getLocation(), friend_join_sound, 1, 0)
def save_friends(): # saves to friends file
- save_json_file("friends", friends)
+ save_json_file("friends", friends)
def friendmessage(player, message): # sends a message with a prefix
- msg(player, "&7[&aFriends&7] " + message)
+ msg(player, "&7[&aFriends&7] " + message)
def ls(sender):
- try:
- sender_friends = friends.get(uid(sender), False)
- if sender_friends:
- friends_string = ""
- for uuid in sender_friends:
- friends_string += (retrieve_player(uuid).getName() + ", ")
- friendmessage(sender, "&aYour friends list: " + friends_string[:len(friends_string)-2])
- else:
- friendmessage(sender, "&cYour friends list is empty")
- except:
- warn("Unable to finish friends' ls process")
+ try:
+ sender_friends = friends.get(uid(sender), False)
+ if sender_friends:
+ friends_string = ""
+ for uuid in sender_friends:
+ friends_string += (retrieve_player(uuid).getName() + ", ")
+ friendmessage(sender, "&aYour friends list: " + friends_string[:len(friends_string)-2])
+ else:
+ friendmessage(sender, "&cYour friends list is empty")
+ except:
+ warn("Unable to finish friends' ls process")
def clear(sender):
- sender_id = uid(sender)
+ sender_id = uid(sender)
- if friends.get(sender_id, False):
- friends.pop(sender_id)
- friendmessage(sender, "&aFriends list cleared")
- save_friends()
- else:
- friendmessage(sender, "&cYour friends list is already empty")
+ if friends.get(sender_id, False):
+ friends.pop(sender_id)
+ friendmessage(sender, "&aFriends list cleared")
+ save_friends()
+ else:
+ friendmessage(sender, "&cYour friends list is already empty")
def add(sender, names):
- sender_id = uid(sender)
- added = []
- notfound = []
- friendalready = []
-
- if not sender_id in friends:
- friends[sender_id] = []
-
- for name in names:
- player = server.getPlayer(name)
- if player:
- player_id = uid(player)
- not_yourself = player != sender
-
- if not player_id in friends[sender_id]:
- if not_yourself:
- friends[sender_id].append(player_id)
- added.append(player.getName())
- friendmessage(player.getPlayer(), "&a&o%s &aadded you to their friends list" % stripcolors(sender.getDisplayName()))
- else:
- friendalready.append(player.getName())
+ sender_id = uid(sender)
+ added = []
+ notfound = []
+ friendalready = []
+
+ if not sender_id in friends:
+ friends[sender_id] = []
+
+ for name in names:
+ player = server.getPlayer(name)
+ if player:
+ player_id = uid(player)
+ not_yourself = player != sender
+
+ if not player_id in friends[sender_id]:
+ if not_yourself:
+ friends[sender_id].append(player_id)
+ added.append(player.getName())
+ friendmessage(player.getPlayer(), "&a&o%s &aadded you to their friends list" % stripcolors(sender.getDisplayName()))
+ else:
+ friendalready.append(player.getName())
+
+ else:
+ notfound.append(name)
- else:
- notfound.append(name)
-
- save_friends()
- if added:
- friendmessage(sender, "&a&o%s&a added." % ", ".join(added))
- if notfound:
- friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
- if friendalready:
- friendmessage(sender, "&c&o%s&c is/are already your friend." % ", ".join(friendalready))
- if not not_yourself:
- friendmessage(sender, "&cYou can't add yourself to your friends list.")
+ save_friends()
+ if added:
+ friendmessage(sender, "&a&o%s&a added." % ", ".join(added))
+ if notfound:
+ friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
+ if friendalready:
+ friendmessage(sender, "&c&o%s&c is/are already your friend." % ", ".join(friendalready))
+ if not not_yourself:
+ friendmessage(sender, "&cYou can't add yourself to your friends list.")
def rem(sender, names):
- sender_id = uid(sender)
- removed = []
- notfound = []
- notafriend = []
-
- for name in names:
- player = server.Player(name)
- if player:
- player_id = uid(player)
- if player_id in friends.get(sender_id, []):
- friends[sender_id].remove(player_id)
- removed.append(player.getName())
- friendmessage(player.getPlayer(), "&c&o%s &cremoved you from their friends list" % stripcolors(sender.getDisplayName()))
- else:
- notafriend.append(player.getName())
- else:
- notfound.append(name)
+ sender_id = uid(sender)
+ removed = []
+ notfound = []
+ notafriend = []
+
+ for name in names:
+ player = server.Player(name)
+ if player:
+ player_id = uid(player)
+ if player_id in friends.get(sender_id, []):
+ friends[sender_id].remove(player_id)
+ removed.append(player.getName())
+ friendmessage(player.getPlayer(), "&c&o%s &cremoved you from their friends list" % stripcolors(sender.getDisplayName()))
+ else:
+ notafriend.append(player.getName())
+ else:
+ notfound.append(name)
- save_friends()
- if removed:
- friendmessage(sender, "&a&o%s&a removed." % ", ".join(removed))
- if notfound:
- friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
- if notafriend:
- friendmessage(sender, "&c&o%s&c is/are not in your friends list." % ", ".join(notafriend))
+ save_friends()
+ if removed:
+ friendmessage(sender, "&a&o%s&a removed." % ", ".join(removed))
+ if notfound:
+ friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
+ if notafriend:
+ friendmessage(sender, "&c&o%s&c is/are not in your friends list." % ", ".join(notafriend))
def fhelp(sender):
- friendmessage(sender, "&a&l/friends help")
- msg(sender, "&a1. /friends &oadd <names...> &6aliases: &o+")
- msg(sender, "&a2. /friends &orem <names...> &6aliases: &oremove, delete, del, -")
- msg(sender, "&a3. /friends &oclear &6aliases: &o/")
- msg(sender, "&a4. /friends &olist &6aliases: &olst, *")
- msg(sender, "&a5. /friends &ohelp &6aliases: &o?")
+ friendmessage(sender, "&a&l/friends help")
+ msg(sender, "&a1. /friends &oadd <names...> &6aliases: &o+")
+ msg(sender, "&a2. /friends &orem <names...> &6aliases: &oremove, delete, del, -")
+ msg(sender, "&a3. /friends &oclear &6aliases: &o/")
+ msg(sender, "&a4. /friends &olist &6aliases: &olst, *")
+ msg(sender, "&a5. /friends &ohelp &6aliases: &o?")
@hook.command("friends")
def on_friend_command(sender, args):
- if not is_player(sender):
- friendmessage(sender, "&c&lYou can't have friends!")
- return True
-
- cmd = args[0] if args else None
- fargs = args[1:]
-
- # /friends list
- if cmd in ["list", "lst", "*"]:
- thread.start_new_thread(ls, (sender,))
-
- # /friends clear
- elif cmd in ["clear", "/"]:
- clear(sender)
+ if not is_player(sender):
+ friendmessage(sender, "&c&lYou can't have friends!")
+ return True
+
+ cmd = args[0] if args else None
+ fargs = args[1:]
+
+ # /friends list
+ if cmd in ["list", "lst", "*"]:
+ thread.start_new_thread(ls, (sender,))
+
+ # /friends clear
+ elif cmd in ["clear", "/"]:
+ clear(sender)
+
+ # /friends add <names>
+ elif cmd in ["add", "+"]:
+ if fargs:
+ add(sender, fargs)
+ else:
+ fhelp(sender)
+
+ # /friends remove <names>
+ elif cmd in ["remove", "rem", "delete", "del", "-"]:
+ if fargs:
+ rem(sender, fargs)
+ else:
+ fhelp(sender)
- # /friends add <names>
- elif cmd in ["add", "+"]:
- if fargs:
- add(sender, fargs)
else:
- fhelp(sender)
-
- # /friends remove <names>
- elif cmd in ["remove", "rem", "delete", "del", "-"]:
- if fargs:
- rem(sender, fargs)
- else:
- fhelp(sender)
-
- else:
- fhelp(sender)
- return True \ No newline at end of file
+ fhelp(sender)
+ return True \ No newline at end of file