diff --git a/base/aaa/offer.go b/base/aaa/offer.go index e0c21be2..b91f5eec 100644 --- a/base/aaa/offer.go +++ b/base/aaa/offer.go @@ -26,16 +26,20 @@ func init() { if m.Warn(m.Option(mdb.HASH) == "", ice.ErrNotValid, mdb.HASH) { return } - msg := m.Cmd("", m.Option(mdb.HASH)) + msg := mdb.HashSelect(m.Spawn(), m.Option(mdb.HASH)) if ls := kit.Split(msg.Append(EMAIL), mdb.AT); !m.Warn(msg.Length() == 0 || len(ls) < 2, ice.ErrNotValid, m.Option(mdb.HASH)) { m.Cmd(USER, mdb.CREATE, USERNICK, ls[0], USERNAME, msg.Append(EMAIL), USERZONE, ls[1]) - m.ProcessOpen(kit.MergeURL2(m.Option(ice.MSG_USERWEB), ice.PS, ice.MSG_SESSID, SessValid(m.Options(ice.MSG_USERNAME, msg.Append(EMAIL))), mdb.HASH, "")) + m.ProcessLocation(kit.MergeURL2(m.Option(ice.MSG_USERWEB), ice.PS, ice.MSG_SESSID, SessValid(m.Options(ice.MSG_USERNAME, msg.Append(EMAIL))), mdb.HASH, "")) mdb.HashModify(m, m.OptionSimple(mdb.HASH), mdb.STATUS, ACCEPT) } }}, }, mdb.ImportantHashAction(mdb.SHORT, mdb.UNIQ, mdb.FIELD, "time,hash,status,invite,email,title,content")), Hand: func(m *ice.Message, arg ...string) { if !m.Warn(len(arg) == 0 && m.Option(ice.MSG_USERROLE) == VOID, ice.ErrNotRight) { - kit.If(mdb.HashSelect(m, arg...).FieldsIsDetail(), func() { m.PushAction(ACCEPT) }) + kit.If(mdb.HashSelect(m, arg...).FieldsIsDetail(), func() { + m.SetAppend() + m.EchoInfoButton("welcome to contexts, please continue", ACCEPT) + // m.PushAction(ACCEPT) + }) } }}, }) diff --git a/base/ctx/command.go b/base/ctx/command.go index 9e14f1f2..b8213eaf 100644 --- a/base/ctx/command.go +++ b/base/ctx/command.go @@ -21,20 +21,15 @@ func _command_list(m *ice.Message, name string) *ice.Message { m.Push(mdb.INDEX, kit.Keys(s.Prefix(), key)) m.Push(mdb.NAME, kit.Format(cmd.Name)) m.Push(mdb.HELP, kit.Format(cmd.Help)) - m.Push(mdb.META, kit.Format(cmd.Meta)) m.Push(mdb.LIST, kit.Format(cmd.List)) + m.Push(mdb.META, kit.Format(cmd.Meta)) m.Push("_help", GetCmdHelp(m, name)) if !nfs.Exists(m, kit.Split(cmd.FileLine(), ":")[0], func(p string) { m.Push("_fileline", kit.MergeURL(FileURI(p), ice.POD, m.Option(ice.MSG_USERPOD))) }) { m.Push("_fileline", "") } - msg := m.Cmd(aaa.ROLE, kit.Select(aaa.VOID, m.Option(ice.MSG_USERROLE)), name) - if msg.Append(mdb.ZONE) == aaa.WHITE && msg.Append(mdb.STATUS) == ice.TRUE { - m.Push("_role", "ok") - } else { - m.Push("_role", "") - } + m.Push("_role", kit.Select("", ice.OK, aaa.Right(m.Spawn(), name))) }) return m } diff --git a/core/chat/action.go b/core/chat/action.go index fdd2a95d..83898b44 100644 --- a/core/chat/action.go +++ b/core/chat/action.go @@ -68,7 +68,7 @@ func init() { m.Cmdy(mdb.MODIFY, RIVER, _storm_key(m), mdb.LIST, m.OptionSimple(mdb.ID), arg) }}, web.SHARE: {Hand: func(m *ice.Message, arg ...string) { _action_share(m, arg...) }}, - }, web.ApiAction(""), aaa.WhiteAction(web.SHARE)), Hand: func(m *ice.Message, arg ...string) { + }, web.ApiAction(""), aaa.WhiteAction("", web.SHARE)), Hand: func(m *ice.Message, arg ...string) { if m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin, arg) { return } else if m.Warn(!_river_right(m, arg[0]), ice.ErrNotRight, arg) {