Request.ReplyOk

3 files changed, 11 insertions, 7 deletions

diff --git a/server/channel/command.go b/server/channel/command.go
index 5190efe..5e6c32c 100644
--- a/server/channel/command.go
+++ b/server/channel/command.go
@@ -49,7 +49,7 @@ func (c *Channel) SendRequest(r session.Request) {
 
 	case "u":
 		r.From.Unsubscribe(&c.Stream)
-		r.Reply(proto.NewCmd("ok", ""))
+		r.ReplyOk()
 
 	case "join":
 		u := c.store.world.GetObject(r.From.UserId).(*user.User)
@@ -57,7 +57,7 @@ func (c *Channel) SendRequest(r session.Request) {
 		if err != nil {
 			r.Reply(err.Cmd())
 		} else {
-			r.Reply(proto.NewCmd("ok", ""))
+			r.ReplyOk()
 		}
 
 	case "leave":
@@ -66,7 +66,7 @@ func (c *Channel) SendRequest(r session.Request) {
 		if err != nil {
 			r.Reply(err.Cmd())
 		} else {
-			r.Reply(proto.NewCmd("ok", ""))
+			r.ReplyOk()
 		}
 
 	case "delete":
@@ -109,7 +109,7 @@ func (c *Channel) SendRequest(r session.Request) {
 			}
 		}
 		c.Stream.Event(r.Cmd)
-		r.Reply(proto.NewCmd("ok", ""))
+		r.ReplyOk()
 
 	case "list":
 		if !c.members[r.From.UserId].Yes {
diff --git a/server/session/session.go b/server/session/session.go
index 54b6d14..cd36a7b 100644
--- a/server/session/session.go
+++ b/server/session/session.go
@@ -70,6 +70,10 @@ func (r Request) Reply(reply proto.Command) {
 	r.From.send <- proto.Line {'!', r.RequestId, reply}
 }
 
+func (r Request) ReplyOk() {
+	r.Reply(proto.NewCmd("ok", ""))
+}
+
 func (r Request) ReplyInvalid() {
 	r.Reply(proto.Fail{"invalid", "", nil}.Cmd())
 }
diff --git a/server/user/command.go b/server/user/command.go
index 210dede..b14845c 100644
--- a/server/user/command.go
+++ b/server/user/command.go
@@ -40,7 +40,7 @@ func (u *User) SendRequest(r session.Request) {
 			}
 		}
 		u.Stream.Event(r.Cmd)
-		r.Reply(proto.NewCmd("ok", ""))
+		r.ReplyOk()
 
 	case "i":
 		r.Reply(proto.NewCmd("i", "", u.GetInfo()))
@@ -51,7 +51,7 @@ func (u *User) SendRequest(r session.Request) {
 
 	case "u":
 		r.From.Unsubscribe(&u.Stream)
-		r.Reply(proto.NewCmd("ok", ""))
+		r.ReplyOk()
 
 	default:
 		r.ReplyInvalid()
@@ -68,7 +68,7 @@ func (t Tombstone) SendRequest(r session.Request) {
 		r.Reply(proto.NewCmd("i", "", t.GetInfo()))
 
 	case "u":
-		r.Reply(proto.NewCmd("ok", ""))
+		r.ReplyOk()
 
 	default:
 		r.ReplyInvalid()