Skip to content

Commit

Permalink
Implemented system messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
hiratara committed Dec 30, 2010
1 parent 8ae1c71 commit 3db9af7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
4 changes: 3 additions & 1 deletion js/main.js
Expand Up @@ -59,7 +59,9 @@
socket.onclose = function () {alert("closed");};
}, "json");

this.updateMemberList();
/* Don't update members until /set_name finished
with current (broken) protocol. */
// this.updateMemberList();

$("#say").submit(function (e) {
$.post(room_id + "/say", {saying : $("#saying").val()});
Expand Down
19 changes: 16 additions & 3 deletions service.py
Expand Up @@ -7,13 +7,16 @@
import hashlib

def delete_member(member, force=False):
deleting_id = member.client_id
name = member.get_name()
room = member.parent()
member.delete()

room_service = RoomService(room)
if force:
room_service.say(None, "Deleted %s." % deleting_id)
room_service.say(None, "%s may have gone." % name)
else:
room_service.say(None, "%s exited." % name)

room_service.notify_all({"event" : "member_changed"})

class RoomService(object):
Expand Down Expand Up @@ -51,7 +54,9 @@ def needs_transaction():
new_member.put()

member = new_member
self.notify_all({"event" : "member_changed"})
# Don't notify until set_name finished
# with current (broken) protocol.
# self.notify_all({"event" : "member_changed"})

return member, token

Expand Down Expand Up @@ -100,6 +105,14 @@ def set_name(self, user, new_name):
member.nickname = new_name
member.put()

if old_name:
if old_name != new_name:
self.say(None, "Call %s %s from now." % (old_name, new_name))
else:
# XXX set_name means entering this room
# in current (broken) protocol
self.say(None, "%s entered." % new_name)

self.notify_all({"event" : "member_changed"})

def ping(self, client_id):
Expand Down

0 comments on commit 3db9af7

Please sign in to comment.