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

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2023-11-20 22:30:14 +08:00
parent b1d36d832c
commit 3909630331
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/cli/qrcode.go
View File

@ -64,6 +64,7 @@ func init() {
m.OptionDefault(FG, BLACK, BG, WHITE)
_qrcode_cli(m, kit.Select(kit.Select(ice.Info.Make.Domain, ice.Info.Domain), arg, 0))
} else {
m.OptionDefault(SIZE, "320")
m.Option(FG, kit.Select(m.Option("--plugin-fg-color"), arg, 1))
m.Option(BG, kit.Select(m.Option("--plugin-bg-color"), arg, 2))
switch m.Option(ice.MSG_THEME) {
@ -72,7 +73,6 @@ func init() {
default:
m.OptionDefault(FG, WHITE, BG, BLACK)
}
m.OptionDefault(SIZE, "360")
m.StatusTime(mdb.LINK, _qrcode_web(m, tcp.PublishLocalhost(m, kit.Select(m.Option(ice.MSG_USERWEB), arg, 0))))
}
}},

4
base/ctx/command.go
View File

@ -113,10 +113,10 @@ func init() {
var PodCmd = func(m *ice.Message, arg ...ice.Any) bool { return false }
func Run(m *ice.Message, arg ...string) {
kit.If(!PodCmd(m, arg) && aaa.Right(m, arg), func() { m.Cmdy(arg) })
kit.If(kit.IsIn(arg[0], "web.chat.grant") || !PodCmd(m, arg) && aaa.Right(m, arg), func() { m.Cmdy(arg) })
}
func Command(m *ice.Message, arg ...string) {
kit.If(!PodCmd(m, COMMAND, arg), func() { m.Cmdy(COMMAND, arg) })
kit.If(kit.IsIn(arg[0], "web.chat.grant") || !PodCmd(m, COMMAND, arg), func() { m.Cmdy(COMMAND, arg) })
}
func FileURI(dir string) string {

26
core/chat/grant.go
View File

@ -36,20 +36,32 @@ func init() {
} else if msg := m.Cmd(web.SPACE, m.Option(web.SPACE)); m.Warn(msg.Append(mdb.TYPE) != aaa.LOGIN, ice.ErrNotFound, m.Option(web.SPACE)) {
return
} else {
kit.If(m.Option(ice.MSG_SESSID) == "", func() { web.RenderCookie(m, aaa.SessCreate(m, m.Option(ice.MSG_USERNAME))) })
m.Option(ice.MSG_USERUA, msg.Append(ice.MSG_USERUA))
m.Cmd(web.SPACE, m.Option(web.SPACE), ice.MSG_SESSID, aaa.SessCreate(m, m.Option(ice.MSG_USERNAME)))
m.ProcessLocation(web.MergeURL2(m, msg.Append(mdb.TEXT)))
if m.IsWeixinUA() {
m.Option(ice.MSG_USERUA, msg.Append(ice.MSG_USERUA))
m.Cmd(web.SPACE, m.Option(web.SPACE), ice.MSG_SESSID, aaa.SessCreate(m, m.Option(ice.MSG_USERNAME)))
m.Echo(ice.SUCCESS)
} else {
kit.If(m.Option(ice.MSG_SESSID) == "", func() { web.RenderCookie(m, aaa.SessCreate(m, m.Option(ice.MSG_USERNAME))) })
m.Option(ice.MSG_USERUA, msg.Append(ice.MSG_USERUA))
m.Cmd(web.SPACE, m.Option(web.SPACE), ice.MSG_SESSID, aaa.SessCreate(m, m.Option(ice.MSG_USERNAME)))
m.ProcessLocation(web.MergeURL2(m, msg.Append(mdb.TEXT)))
}
}
}},
}, aaa.RoleAction(aaa.CONFIRM), gdb.EventsAction(web.SPACE_LOGIN)), Hand: func(m *ice.Message, arg ...string) {
msg := m.Cmd(web.SPACE, m.Option(web.SPACE, arg[0]))
m.Option(tcp.HOSTNAME, ice.Info.Hostname)
m.Option(nfs.PATH, msg.Append(mdb.TEXT))
m.Option(aaa.UA, msg.Append(aaa.UA))
m.Option(aaa.IP, msg.Append(aaa.IP))
if !m.Warn(m.Option(nfs.PATH) == "", ice.ErrNotFound, arg[0]) {
m.Echo(nfs.Template(m, "auth.html"))
if m.IsWeixinUA() {
m.Push(aaa.IP, msg.Append(aaa.IP))
m.Push(web.SPACE, arg[0])
m.PushAction(aaa.CONFIRM)
} else {
m.Option(aaa.UA, msg.Append(aaa.UA))
m.Option(aaa.IP, msg.Append(aaa.IP))
m.Echo(nfs.Template(m, "auth.html"))
}
}
}},
})

4
misc/wx/login.go
View File

@ -94,9 +94,7 @@ func init() {
m.OptionSimple(aaa.CITY, aaa.COUNTRY, aaa.LANGUAGE, aaa.PROVINCE),
)
}},
SCAN: {Hand: func(m *ice.Message, arg ...string) {
m.Cmdy(web.CHAT_FAVOR, mdb.CREATE, mdb.TYPE, "", arg)
}},
SCAN: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(web.CHAT_FAVOR, mdb.CREATE, mdb.TYPE, "", arg) }},
}, aaa.WhiteAction(aaa.SESS, aaa.USER)), Hand: func(m *ice.Message, arg ...string) {
if m.Cmdx(ACCESS, aaa.CHECK) == "" {
return

3
render.go
View File

@ -120,6 +120,9 @@ func (m *Message) IsCliUA() bool {
func (m *Message) IsMobileUA() bool {
return strings.Contains(m.Option(MSG_USERUA), "Mobile")
}
func (m *Message) IsWeixinUA() bool {
return strings.Contains(m.Option(MSG_USERUA), "MicroMessenger")
}
func (m *Message) PushSearch(arg ...Any) {
data := kit.Dict(arg...)
kit.For(arg, func(k, v Any) {