object.Tombstone

2 files changed, 4 insertions, 33 deletions

diff --git a/server/user/command.go b/server/user/command.go
index 6eef81b..14a8b57 100644
--- a/server/user/command.go
+++ b/server/user/command.go
@@ -65,20 +65,3 @@ func (u *User) SendRequest(r session.Request) {
 		r.ReplyInvalid()
 	}
 }
-
-func (t Tombstone) SendRequest(r session.Request) {
-	switch r.Cmd.Kind {
-
-	case "update":
-		r.Reply(proto.Fail{"bad-target", "", nil}.Cmd())
-
-	case "i", "s":
-		r.Reply(proto.NewCmd("i", "", t.GetInfo()))
-
-	case "u":
-		r.ReplyOk()
-
-	default:
-		r.ReplyInvalid()
-	}
-}
diff --git a/server/user/user.go b/server/user/user.go
index fb1022f..17063b4 100644
--- a/server/user/user.go
+++ b/server/user/user.go
@@ -10,7 +10,6 @@ import (
 type UserStore struct {
 	world *object.World
 	byName map[string]*User
-	gone map[string]Tombstone
 }
 
 type User struct {
@@ -24,14 +23,8 @@ type User struct {
 	Anonymous bool
 }
 
-type Tombstone struct {
-	name string
-}
-
 func NewStore(world *object.World) *UserStore {
-	return &UserStore {
-		world, make(map[string]*User), make(map[string]Tombstone),
-	}
+	return &UserStore {world, make(map[string]*User)}
 }
 
 func (us *UserStore) CreateUser(name string) (*User, *proto.Fail) {
@@ -94,8 +87,9 @@ func (u *User) Delete() {
 	delete(u.store.byName, validate.Fold(u.name))
 	u.store.world.RemoveObject(u.id)
 
-	gone := Tombstone {u.name}
-	u.store.gone[u.id] = gone
+	gone := object.Tombstone {
+		u.id, map[string]string {"": u.name, "kind": "u"},
+	}
 	u.store.world.PutObject(u.id, gone)
 }
 
@@ -111,9 +105,3 @@ func (u *User) InfoFor(uid string) proto.Object {
 	}
 	return proto.Object {"u", u.id, i}
 }
-
-func (t Tombstone) GetInfo() proto.Object {
-	return proto.Object {
-		"gone", "", map[string]string {"": t.name, "kind": "u"},
-	}
-}