diff --git a/base/aaa/offer.go b/base/aaa/offer.go index c999af75..468589a8 100644 --- a/base/aaa/offer.go +++ b/base/aaa/offer.go @@ -1,6 +1,8 @@ package aaa import ( + "strings" + ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/mdb" kit "shylinux.com/x/toolkits" @@ -14,12 +16,19 @@ const APPLY = "apply" const OFFER = "offer" func init() { + const ( + SUBJECT_HTML = "subject.html" + CONTENT_HTML = "content.html" + ) Index.MergeCommands(ice.Commands{ OFFER: {Help: "邀请", Role: VOID, Actions: ice.MergeActions(ice.Actions{ mdb.CREATE: {Name: "create email*='shy@shylinux.com' subject content", Help: "邀请", Hand: func(m *ice.Message, arg ...string) { h := mdb.HashCreate(m.Spawn(), m.OptionSimple(EMAIL, SUBJECT, CONTENT), INVITE, m.Option(ice.MSG_USERNAME), mdb.STATUS, INVITE) - m.Cmd(EMAIL, SEND, mdb.Config(m, EMAIL), m.Option(EMAIL), "", m.OptionDefault(SUBJECT, "welcome to contexts, please continue"), - m.OptionDefault(CONTENT, ice.Render(m, ice.RENDER_ANCHOR, m.Cmdx("host", "publish", m.MergePodCmd("", "", mdb.HASH, h)))), + m.Option("link", m.Cmdx("host", "publish", m.MergePodCmd("", "", mdb.HASH, h))) + m.Option(ice.MSG_USERHOST, strings.Split(m.Option(ice.MSG_USERHOST), "://")[1]) + m.Cmd(EMAIL, SEND, mdb.Config(m, EMAIL), m.Option(EMAIL), "", + m.OptionDefault(SUBJECT, ice.Render(m, ice.RENDER_TEMPLATE, SUBJECT_HTML)), + m.OptionDefault(CONTENT, ice.Render(m, ice.RENDER_TEMPLATE, CONTENT_HTML)), ) }}, ACCEPT: {Help: "接受", Role: VOID, Hand: func(m *ice.Message, arg ...string) { @@ -38,7 +47,8 @@ func init() { m.Echo("please add admin email") } else if !m.Warn(len(arg) == 0 && m.Option(ice.MSG_USERROLE) == VOID, ice.ErrNotRight) { kit.If(mdb.HashSelect(m, arg...).FieldsIsDetail(), func() { - m.SetAppend().EchoInfoButton("welcome to contexts, please continue", ACCEPT) + m.Option(ice.MSG_USERHOST, strings.Split(m.Option(ice.MSG_USERHOST), "://")[1]) + m.SetAppend().EchoInfoButton(ice.Render(m, ice.RENDER_TEMPLATE, SUBJECT_HTML), ACCEPT) }) } }}, diff --git a/base/nfs/template.go b/base/nfs/template.go index 007ef80e..54d14242 100644 --- a/base/nfs/template.go +++ b/base/nfs/template.go @@ -11,7 +11,13 @@ const TEMPLATE = "template" func init() { Index.MergeCommands(ice.Commands{ - TEMPLATE: {Name: "template index path auto", Help: "模板", Actions: ice.MergeActions(ice.Actions{}), Hand: func(m *ice.Message, arg ...string) { + TEMPLATE: {Name: "template index path auto", Help: "模板", Actions: ice.MergeActions(ice.Actions{ + ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { + ice.AddRender(ice.RENDER_TEMPLATE, func(m *ice.Message, args ...ice.Any) string { + return Template(m, kit.Format(args[0]), args[1:]...) + }) + }}, + }), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { m.Cmdy(ice.COMMAND).Action("filter:text").Option(ice.MSG_DISPLAY, "") return diff --git a/base/web/serve.go b/base/web/serve.go index 7c3db6e5..c7781fcc 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -135,6 +135,7 @@ func _serve_handle(key string, cmd *ice.Command, m *ice.Message, w http.Response kit.If(m.Optionv(ice.MSG_CMDS) == nil, func() { kit.If(strings.TrimPrefix(r.URL.Path, key), func(p string) { m.Optionv(ice.MSG_CMDS, strings.Split(p, nfs.PS)) }) }) + UserHost(m) m.W.Header().Add(strings.ReplaceAll(ice.LOG_TRACEID, ".", "-"), m.Option(ice.LOG_TRACEID)) defer func() { Render(m, m.Option(ice.MSG_OUTPUT), kit.List(m.Optionv(ice.MSG_ARGS))...) }() if cmds, ok := _serve_auth(m, key, kit.Simple(m.Optionv(ice.MSG_CMDS)), w, r); ok { diff --git a/option.go b/option.go index fff68123..18287651 100644 --- a/option.go +++ b/option.go @@ -27,7 +27,8 @@ func (m *Message) OptionSimple(key ...string) (res []string) { kit.If(len(key) == 0, func() { key = kit.Filters(kit.Split(kit.Select("type,name,text", m.Conf(m.PrefixKey(), kit.Keym(FIELD)))), TIME, HASH) }) - kit.For(kit.Filters(kit.Split(kit.Join(key)), ""), func(k string) { kit.If(m.Option(k), func(v string) { res = append(res, k, v) }) }) + // kit.For(kit.Filters(kit.Split(kit.Join(key)), ""), func(k string) { kit.If(m.Option(k), func(v string) { res = append(res, k, v) }) }) + kit.For(kit.Filters(kit.Split(kit.Join(key)), ""), func(k string) { res = append(res, k, m.Option(k)) }) return } func (m *Message) OptionSplit(key ...string) (res []string) {