From 1f0f934ec063e1610b99cadb784edeef85d6bd95 Mon Sep 17 00:00:00 2001
From: shy <shy@shylinux.com>
Date: Mon, 4 Mar 2024 19:16:39 +0800
Subject: [PATCH] add some

---
 base/aaa/portal/apply.go |  2 +-
 core/chat/message.go     |  8 +++-----
 core/team/plan.go        | 16 ++++++++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/base/aaa/portal/apply.go b/base/aaa/portal/apply.go
index 1261b71c..dfca7b3b 100644
--- a/base/aaa/portal/apply.go
+++ b/base/aaa/portal/apply.go
@@ -38,7 +38,7 @@ func (s apply) Apply(m *ice.Message, arg ...string) {
 		h := s.Hash.Create(m, kit.Simple(arg, mdb.STATUS, kit.FuncName(s.Apply), web.ParseUA(m.Message))...)
 		m.ProcessCookie(_cookie_key(m), h)
 		m.StreamPushRefreshConfirm()
-		m.ChatMessageInsertPlug(aaa.APPLY, "user.signup", m.PrefixKey(), h)
+		m.ChatMessageInsertPlug(aaa.APPLY, "user.signup", "", m.PrefixKey(), h)
 	}
 }
 func (s apply) Agree(m *ice.Message, arg ...string) {
diff --git a/core/chat/message.go b/core/chat/message.go
index ee5472ba..16ad1b09 100644
--- a/core/chat/message.go
+++ b/core/chat/message.go
@@ -121,11 +121,9 @@ func MessageInsert(m *ice.Message, zone string, arg ...string) {
 }
 func MessageInsertPlug(m *ice.Message, zone, name, text, index, args string, arg ...string) {
 	kit.If(text == "", func() {
-		msg := m.Cmd(index, args)
-		if msg.Option(ice.MSG_STATUS) == "" {
-			msg.StatusTimeCount()
-		}
+		msg := m.Cmds(index, args, ice.Maps{ice.MSG_USERUA: html.Mozilla})
+		kit.If(msg.Option(ice.MSG_STATUS) == "", func() { msg.StatusTimeCount() })
 		text = msg.FormatMeta()
 	})
-	MessageInsert(m, zone, kit.Simple(mdb.TYPE, html.PLUG, mdb.NAME, kit.Select(m.ActionKey(), name), mdb.TEXT, text, ctx.INDEX, index, ctx.ARGS, args, arg)...)
+	MessageInsert(m, zone, kit.Simple(mdb.TYPE, html.PLUG, mdb.NAME, kit.Select(m.ActionKey(), name), mdb.TEXT, text, ctx.INDEX, kit.Select(m.ShortKey(), index), ctx.ARGS, args, arg)...)
 }
diff --git a/core/team/plan.go b/core/team/plan.go
index 6b9efd3f..59529c04 100644
--- a/core/team/plan.go
+++ b/core/team/plan.go
@@ -70,22 +70,22 @@ func init() {
 				web.StreamPushRefreshConfirm(m, m.Trans("refresh for new message ", "刷新列表，查看最新消息 "))
 			}},
 			web.DREAM_CREATE: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, web.DREAM, "", m.Option(mdb.NAME), web.CHAT_IFRAME, web.S(m.Option(mdb.NAME)))
+				PlanInsertPlan(m, web.DREAM, "", m.Option(mdb.NAME), web.CHAT_IFRAME, web.S(m.Option(mdb.NAME)))
 			}},
 			web.DREAM_REMOVE: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, web.DREAM, "", "", web.CHAT_IFRAME, web.S(m.Option(mdb.NAME)))
+				PlanInsertPlan(m, web.DREAM, "", "", web.CHAT_IFRAME, web.S(m.Option(mdb.NAME)))
 			}},
 			aaa.OFFER_CREATE: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, aaa.APPLY, "", m.Option(aaa.EMAIL), aaa.OFFER, m.Option(mdb.HASH))
+				PlanInsertPlan(m, aaa.APPLY, "", m.Option(aaa.EMAIL), aaa.OFFER, m.Option(mdb.HASH))
 			}},
 			aaa.OFFER_ACCEPT: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, aaa.APPLY, "", m.Option(aaa.EMAIL), aaa.OFFER, m.Option(mdb.HASH))
+				PlanInsertPlan(m, aaa.APPLY, "", m.Option(aaa.EMAIL), aaa.OFFER, m.Option(mdb.HASH))
 			}},
 			aaa.USER_CREATE: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, aaa.APPLY, "", "", aaa.USER, m.Option(aaa.USERNAME))
+				PlanInsertPlan(m, aaa.APPLY, "", "", aaa.USER, m.Option(aaa.USERNAME))
 			}},
 			aaa.USER_REMOVE: {Hand: func(m *ice.Message, arg ...string) {
-				PlanInsert(m, aaa.APPLY, "", "", aaa.USER, m.Option(aaa.USERNAME))
+				PlanInsertPlan(m, aaa.APPLY, "", "", aaa.USER, m.Option(aaa.USERNAME))
 			}},
 			ctx.RUN: {Hand: func(m *ice.Message, arg ...string) {
 				if m.RenameOption(TASK_POD, ice.POD); ctx.PodCmd(m, m.ShortKey(), ctx.RUN, arg) {
@@ -105,11 +105,11 @@ func init() {
 		}},
 	})
 }
-func PlanInsert(m *ice.Message, zone, name, text, index, args string, arg ...string) {
+func PlanInsertPlan(m *ice.Message, zone, name, text, index, args string, arg ...string) {
 	if ice.Info.Important {
 		m.Cmd(PLAN, mdb.INSERT, web.SPACE, "", mdb.ZONE, zone, mdb.TYPE, "once",
 			mdb.NAME, kit.Select(m.ActionKey(), name), mdb.TEXT, kit.Select(args, text), BEGIN_TIME, m.Time(),
-			"extra.index", index, "extra.args", args, arg,
+			"extra.index", kit.Select(m.ShortKey(), index), "extra.args", args, arg,
 		)
 	}
 }