1
0
forked from x/icebergs
This commit is contained in:
shaoying 2020-07-09 09:38:40 +08:00
parent 0761dd149c
commit d0dd36b614
2 changed files with 8 additions and 3 deletions

View File

@ -115,9 +115,8 @@ func _inner_show(m *ice.Message, name string) {
} }
} }
func _inner_main(m *ice.Message, arg ...string) { func _inner_main(m *ice.Message, arg ...string) {
if len(arg) > 2 && arg[2] != "" { if len(arg) > 2 {
m.Cmdy(web.STORY, web.INDEX, arg[2]) arg = arg[:2]
return
} }
_inner_list(m, path.Join(arg...)) _inner_list(m, path.Join(arg...))
} }

View File

@ -89,12 +89,18 @@ func (c *Context) cmd(m *Message, cmd *Command, key string, arg ...string) *Mess
if m.Hand = true; action != "" && cmd.Action != nil { if m.Hand = true; action != "" && cmd.Action != nil {
if h, ok := cmd.Action[action]; ok { if h, ok := cmd.Action[action]; ok {
if action == m.Option("_action") {
m.Option("_action", "")
}
m.Log(LOG_CMDS, "%s.%s %d %v %s", c.Name, key, len(arg), arg, kit.FileLine(h.Hand, 3)) m.Log(LOG_CMDS, "%s.%s %d %v %s", c.Name, key, len(arg), arg, kit.FileLine(h.Hand, 3))
h.Hand(m, args...) h.Hand(m, args...)
return m return m
} }
for _, h := range cmd.Action { for _, h := range cmd.Action {
if h.Name == action || h.Help == action { if h.Name == action || h.Help == action {
if action == m.Option("_action") {
m.Option("_action", "")
}
m.Log(LOG_CMDS, "%s.%s %d %v %s", c.Name, key, len(arg), arg, kit.FileLine(h.Hand, 3)) m.Log(LOG_CMDS, "%s.%s %d %v %s", c.Name, key, len(arg), arg, kit.FileLine(h.Hand, 3))
h.Hand(m, args...) h.Hand(m, args...)
return m return m