From 640c60baae1007f5ec7af59e893920a3649c368f Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 17 Jan 2024 14:35:26 +0800 Subject: [PATCH] add some --- const.js | 3 ++- panel/header.js | 1 + panel/river.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/const.js b/const.js index a249caf7..56f1f612 100644 --- a/const.js +++ b/const.js @@ -41,6 +41,7 @@ var ice = { MSG_METHOD: "_method", MSG_BG: "sess.bg", MSG_FG: "sess.fg", + MSG_NODETYPE: "node.type", MSG_USERNICK: "user.nick", MSG_USERNAME: "user.name", MSG_USERROLE: "user.role", MSG_LANGUAGE: "user.lang", MSG_MODE: "sess.mode", MSG_THEME: "sess.theme", MSG_TITLE: "sess.title", MSG_RIVER: "sess.river", MSG_STORM: "sess.storm", MSG_DAEMON: "sess.daemon", LOG_DISABLE: "log.disable", LOG_TRACEID: "log.id", @@ -79,7 +80,7 @@ var web = {CHAT: "chat", PORTAL: "portal", STUDIO: "studio", SERVICE: "service", SPIDE: "spide", TOKEN: "token", SHARE: "share", COUNT: "count", STATS: "stats", ADMIN: "admin", PORTAL: "portal", DESKTOP: "desktop", WORKER: "worker", SERVER: "server", MASTER: "master", GATEWAY: "gateway", - ONLINE: "online", OFFLINE: "offline", VENDOR: "vendor", + ONLINE: "online", OFFLINE: "offline", VENDOR: "vendor", ORIGIN: "origin", FULL: "full", OPEN: "open", LINK: "link", HTTP: "http", DOMAIN: "domain", URL: "url", SHARE_CACHE: "/share/cache/", SHARE_LOCAL: "/share/local/", AT: ice.AT, QS: ice.QS, diff --git a/panel/header.js b/panel/header.js index a6b175a4..506a1e03 100644 --- a/panel/header.js +++ b/panel/header.js @@ -76,6 +76,7 @@ Volcanos(chat.ONACTION, {_init: function(can) {}, if (p && location.pathname == web.BASIC_LOGIN) { return location.replace(can.base.MergeURL(p, ice.MSG_SESSID, can.misc.CookieSessid(can))) } var p = can.misc.Search(can, ice.BACK); if (p && location.pathname == web.CHAT_SSO) { return location.reload() } can.user.info.userrole = msg.Option(ice.MSG_USERROLE), can.user.info.repos = msg.Option(nfs.REPOS) + can.user.info.nodetype = msg.Option("nodetype"), can.user.info.usernick = can.Conf(aaa.USERNICK), can.user.info.email = msg.Option(aaa.EMAIL), can.user.info.avatar = msg.Option(aaa.AVATAR), can.user.info.background = msg.Option(aaa.BACKGROUND) lang(msg, function() { can.onmotion.clear(can), can.onimport._init(can, can.request(), can._output), can.onengine.signal(can, chat.ONLOGIN) }) } diff --git a/panel/river.js b/panel/river.js index 48c376e5..02bccc83 100644 --- a/panel/river.js +++ b/panel/river.js @@ -138,7 +138,7 @@ Volcanos(chat.ONEXPORT, {width: function(can) { return can._target.offsetWidth } Volcanos(chat.ONENGINE, {_engine: function(event, can, msg, panel, cmds, cb) { if (typeof can.river == code.FUNCTION) { can.river = can.river(can) } var list = can.river - cmds.length == 0 && can.core.ItemOrder(list, mdb.ORDER, function(key, value) { + cmds.length == 0 && can.core.ItemOrder(list, mdb.ORDER, function(key, value) { if (!value) { return } if (can.user.info.userrole == aaa.ROOT || can.base.isIn(value.type||"", "", aaa.VOID, can.user.info.userrole)) { can.core.Item(value.storm).length > 0 && msg.Push({hash: key, name: can.user.isEnglish(can)? key: value.name, icon: value.icon||"", main: value.main||false}) }