diff --git a/base/web/option.go b/base/web/option.go index 4921e7dc..6fd00868 100644 --- a/base/web/option.go +++ b/base/web/option.go @@ -128,9 +128,6 @@ func Toast(m *ice.Message, text string, arg ...ice.Any) *ice.Message { // [title var Icons = map[string]string{ice.PROCESS: "🕑", ice.FAILURE: "❌", ice.SUCCESS: "✅"} func toastContent(m *ice.Message, state string, arg ...ice.Any) string { - if len(arg) > 0 { - return kit.JoinWord(kit.Simple(Icons[state], arg)...) - } return kit.JoinWord(kit.Simple(Icons[state], m.ActionKey(), state, arg)...) } func ToastSuccess(m *ice.Message, arg ...ice.Any) { @@ -140,7 +137,7 @@ func ToastFailure(m *ice.Message, arg ...ice.Any) { Toast(m, toastContent(m, ice.FAILURE, arg...), "", m.OptionDefault(ice.TOAST_DURATION, "3s")).Sleep(m.OptionDefault(ice.TOAST_DURATION, "3s")) } func ToastProcess(m *ice.Message, arg ...ice.Any) func() { - Toast(m, toastContent(m, ice.PROCESS, arg...), "", "180s") + Toast(m, toastContent(m, ice.PROCESS, arg...), "", "30s") return func() { Toast(m, toastContent(m, ice.SUCCESS, arg...), "", "1s") } } func GoToast(m *ice.Message, title string, cb func(toast func(name string, count, total int)) []string) *ice.Message { diff --git a/base/web/space.go b/base/web/space.go index 852d8dd7..a93c2e3d 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -119,7 +119,6 @@ func _space_fork(m *ice.Message) { m.Cmd(SPACE, value[mdb.NAME], gdb.EVENT, gdb.HAPPEN, gdb.EVENT, OPS_SERVER_OPEN, args, kit.Dict(ice.MSG_USERROLE, aaa.TECH)) } }) - m.Cmd(gdb.EVENT, gdb.HAPPEN, gdb.EVENT, OPS_SERVER_OPEN, args) }) } _space_handle(m, false, name, c) diff --git a/base/web/token.go b/base/web/token.go index 69bbf74c..3ee664af 100644 --- a/base/web/token.go +++ b/base/web/token.go @@ -6,6 +6,7 @@ import ( ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/cli" + "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/lex" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" @@ -33,7 +34,7 @@ func init() { return } msg := m.Cmd("", mdb.CREATE, mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, m.Option(ice.MSG_USERNAME), mdb.TEXT, m.Option(tcp.HOST)) - m.ProcessReplace(kit.MergeURL2(m.Option(tcp.HOST), ChatCmdPath(m, m.PrefixKey(), SET), + m.ProcessReplace(kit.MergeURL2(m.Option(tcp.HOST), kit.MergeURL(C(m.PrefixKey()), ctx.ACTION, SET), TOKEN, strings.Replace(UserHost(m), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), msg.Result()), 1))) }}, SET: {Hand: func(m *ice.Message, arg ...string) { diff --git a/misc.go b/misc.go index 45cd1d41..bab28d6f 100644 --- a/misc.go +++ b/misc.go @@ -80,7 +80,6 @@ func (m *Message) PushDetail(value Any, arg ...string) *Message { case string: value = kit.UnMarshal(v) } - m.OptionFields("detail") return m.Push(FIELDS_DETAIL, value, kit.Split(kit.Join(arg))) } func (m *Message) RenameOption(from, to string) *Message { diff --git a/misc/git/status.go b/misc/git/status.go index 11db68ae..06d7f35b 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -44,7 +44,7 @@ func init() { }}, OAUTH: {Name: "oauth remote", Help: "授权", Icon: "bi bi-person-check", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(kit.MergeURL2(kit.Select(ice.Info.Make.Domain, m.Cmdx(REPOS, REMOTE_URL), m.Option(REMOTE)), - kit.MergeURL(web.C(web.TOKEN), ctx.ACTION, "gen"), mdb.TYPE, web.CODE_GIT_STATUS, tcp.HOST, web.UserHost(m))) + web.ChatCmdPath(m, web.TOKEN, "gen"), mdb.TYPE, web.CODE_GIT_STATUS, tcp.HOST, web.UserHost(m))) }}, CONFIGS: {Name: "configs email* username*", Help: "配置", Hand: func(m *ice.Message, arg ...string) { m.Cmd(nfs.DEFS, kit.HomePath(_GITCONFIG), kit.Format(nfs.Template(m, "gitconfig"), m.Option(aaa.USERNAME), m.Option(aaa.EMAIL)))