diff options
Diffstat (limited to 'server/channel/command.go')
| -rw-r--r-- | server/channel/command.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/server/channel/command.go b/server/channel/command.go index 1171d2f..1184a5a 100644 --- a/server/channel/command.go +++ b/server/channel/command.go @@ -40,7 +40,7 @@ func (c *Channel) SendRequest(r session.Request) { return } - if !c.members[r.From.UserId].Put { + if !c.GetMembership(r.From.UserId).Put { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } @@ -60,7 +60,7 @@ func (c *Channel) SendRequest(r session.Request) { r.ReplyOk() case "join": - u := c.store.world.GetObject(r.From.UserId).(*user.User) + u := c.kind.world.GetObject(r.From.UserId).(*user.User) err := c.Join(u) if err != nil { r.Reply(err.Cmd()) @@ -69,7 +69,7 @@ func (c *Channel) SendRequest(r session.Request) { } case "leave": - u := c.store.world.GetObject(r.From.UserId).(*user.User) + u := c.kind.world.GetObject(r.From.UserId).(*user.User) err := c.Leave(u) if err != nil { r.Reply(err.Cmd()) @@ -78,7 +78,7 @@ func (c *Channel) SendRequest(r session.Request) { } case "delete": - if !c.members[r.From.UserId].Op { + if !c.GetMembership(r.From.UserId).Op { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } @@ -105,7 +105,7 @@ func (c *Channel) SendRequest(r session.Request) { } } - if !c.members[r.From.UserId].Update { + if !c.GetMembership(r.From.UserId).Update { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } @@ -120,13 +120,13 @@ func (c *Channel) SendRequest(r session.Request) { r.ReplyOk() case "list": - if !c.members[r.From.UserId].Yes { + if !c.GetMembership(r.From.UserId).Yes { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } cmd := proto.NewCmd("list", c.Id()) for m, _ := range c.Members() { - u := c.store.world.GetObject(m).(*user.User) + u := c.kind.world.GetObject(m).(*user.User) cmd.Args = append(cmd.Args, u.InfoFor(r.From.UserId)) } r.Reply(cmd) @@ -184,7 +184,7 @@ func (c *Channel) SendRequest(r session.Request) { max = len(c.messages) } - p := c.members[r.From.UserId] + p := c.GetMembership(r.From.UserId) if !p.History || !p.See { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return @@ -204,18 +204,18 @@ func (c *Channel) SendRequest(r session.Request) { return } - if !c.members[r.From.UserId].Yes { + if !c.GetMembership(r.From.UserId).Yes { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } - if !c.members[m.Id].Yes { + if !c.GetMembership(m.Id).Yes { r.Reply(proto.Fail{ "not-in-channel", "", map[string]string {"": m.Id}, }.Cmd()) return } - i := c.members[m.Id].GetInfo() + i := c.GetMembership(m.Id).GetInfo() i.Fields[""] = m.Id r.Reply(proto.NewCmd("i", "", i)) @@ -232,23 +232,23 @@ func (c *Channel) SendRequest(r session.Request) { r.ReplyInvalid() return } - new, err := c.members[id].Change(o) + new, err := c.GetMembership(id).Change(o) if err != nil { r.Reply(err.Cmd()) return } - if !c.members[r.From.UserId].Op { + if !c.GetMembership(r.From.UserId).Op { r.Reply(proto.Fail{"forbidden", "", nil}.Cmd()) return } - if !c.members[id].Yes { + if !c.GetMembership(id).Yes { r.Reply(proto.Fail{ "not-in-channel", "", map[string]string {"": id}, }.Cmd()) return } - c.members[id] = new + c.SetMembership(id, new) c.Put(o) i := new.GetInfo() |