liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-03-02 23:42:00 +08:00
parent 57b5fdfed1
commit 338a0a08c0
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/aaa/portal/apply.go
View File

@ -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, "apply.signup", m.PrefixKey(), h)
m.ChatMessageInsertPlug(aaa.APPLY, "user.signup", m.PrefixKey(), h)
}
}
func (s apply) Agree(m *ice.Message, arg ...string) {
@ -50,7 +50,7 @@ func (s apply) Agree(m *ice.Message, arg ...string) {
return
}
s.Hash.Modify(m, kit.Simple(m.OptionSimple(mdb.HASH, aaa.USERROLE), mdb.STATUS, s.Agree)...)
m.UserCreate(m.Option(aaa.USERROLE), msg.Append(aaa.USERNAME), msg.Append(aaa.USERNICK))
// m.UserCreate(m.Option(aaa.USERROLE), msg.Append(aaa.USERNAME), msg.Append(aaa.USERNICK))
m.PushRefresh(msg.Append(cli.DAEMON))
}
func (s apply) Login(m *ice.Message, arg ...string) {
@ -72,7 +72,6 @@ func (s apply) Login(m *ice.Message, arg ...string) {
s.Hash.Modify(m, kit.Simple(m.OptionSimple(mdb.HASH), mdb.STATUS, s.Login)...)
m.ProcessLocation(nfs.PS)
m.StreamPushRefreshConfirm()
m.ChatMessageInsertPlug(aaa.APPLY, "user.create", aaa.USER, msg.Append(aaa.USERNAME))
} else {
if m.WarnNotFound(m.Cmd(aaa.USER, m.Option(aaa.EMAIL)).Length() == 0, m.Option(aaa.EMAIL)) {
return

3
base/web/serve.go
View File

@ -210,6 +210,7 @@ const (
OPS_SERVER_OPEN = "ops.server.open"
SERVE_START = "serve.start"
PROXY_CONF = "proxyConf"
PROXY_PATH = "usr/local/daemon/10000/"
)
const SERVE = "serve"
@ -245,7 +246,7 @@ func init() {
m.Cmd("", PROXY_CONF, ice.Info.NodeName)
}},
PROXY_CONF: {Name: "proxyConf name* port path", Hand: func(m *ice.Message, arg ...string) {
if dir := m.OptionDefault(nfs.PATH, "usr/local/daemon/10000/"); nfs.Exists(m, dir) {
if dir := m.OptionDefault(nfs.PATH, PROXY_PATH); nfs.Exists(m, dir) {
for _, p := range []string{"server.conf", "location.conf", "upstream.conf"} {
m.Cmd(nfs.SAVE, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL)
}

11
core/chat/message.go
View File

@ -7,6 +7,7 @@ import (
"shylinux.com/x/icebergs/base/aaa"
"shylinux.com/x/icebergs/base/cli"
"shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/gdb"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/tcp"
"shylinux.com/x/icebergs/base/web"
@ -47,6 +48,14 @@ func init() {
m.Cmd("", mdb.INSERT, m.Option(ice.FROM_SPACE), arg, tcp.DIRECT, tcp.RECV)
mdb.HashSelectUpdate(m, m.Option(ice.FROM_SPACE), func(value ice.Map) { kit.Value(value, web.TARGET, m.Option(ice.FROM_SPACE)) })
}},
aaa.USER_CREATE: {Hand: func(m *ice.Message, arg ...string) {
if ice.Info.Important {
MessageInsert(m, aaa.APPLY, mdb.TYPE, html.PLUG, mdb.NAME, m.ActionKey(), ctx.INDEX, aaa.USER, ctx.ARGS, m.Option(aaa.USERNAME))
}
}},
aaa.USER_REMOVE: {Hand: func(m *ice.Message, arg ...string) {
MessageInsert(m, aaa.APPLY, mdb.TYPE, html.PLUG, mdb.NAME, m.ActionKey(), ctx.INDEX, aaa.USER, ctx.ARGS, m.Option(aaa.USERNAME))
}},
web.DREAM_CREATE: {Hand: func(m *ice.Message, arg ...string) {
if ice.Info.Important {
MessageInsert(m, web.DREAM, mdb.TYPE, html.PLUG, ctx.INDEX, IFRAME, ctx.ARGS, web.S(m.Option(mdb.NAME)))
@ -61,7 +70,7 @@ func init() {
}
}},
ctx.RUN: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(web.Space(m, arg[0]), arg[1], arg[2:]) }},
}, web.DreamAction(), web.DreamTablesAction(), mdb.ZoneAction(
}, web.DreamAction(), web.DreamTablesAction(), gdb.EventsAction(aaa.USER_CREATE, aaa.USER_REMOVE), mdb.ZoneAction(
mdb.SHORT, mdb.ZONE, mdb.FIELD, "time,hash,type,zone,icons,title,count,target",
mdb.FIELDS, "time,id,type,name,text,space,index,args,style,display,username,usernick,avatar,direct",
)), Hand: func(m *ice.Message, arg ...string) {

4
core/chat/message.js
View File

@ -71,7 +71,7 @@ Volcanos(chat.ONIMPORT, {
can.onmotion.delay(can, function() { can.ui.message && (can.ui.message.scrollTop += 10000) }, 300)
},
_request: function(can) {
can.run(can.request(event, {"cache.begin": parseInt(can.db.zone.id||0)+1, "cache.limit": 10}), [can.db.hash], function(msg) {
can.Update(can.request({}, {"cache.begin": parseInt(can.db.zone.id||0)+1, "cache.limit": 10}), [can.db.hash], function(msg) {
can.onimport._message(can, msg)
})
},
@ -93,7 +93,7 @@ Volcanos(chat.ONIMPORT, {
},
}, [""])
Volcanos(chat.ONDAEMON, {
refresh: function(can, msg, sub, arg) { can.base.isFunc(sub.Update) && sub.Update(), can.user.toast(can, "new message") },
refresh: function(can, msg, sub, arg) { sub.sub.onimport._request(sub.sub) },
})
Volcanos(chat.ONEXPORT, {
plugHeight: function(can, value) { var height = can.base.Min(can.ui.content.offsetHeight-240, 240)