From 7634b366e58fa7c475a7b3c6b5cd69311f5b9579 Mon Sep 17 00:00:00 2001 From: shaoying Date: Thu, 4 Jun 2020 07:02:13 +0800 Subject: [PATCH] add inner.favor --- base/web/favor.go | 8 ++++---- core/wiki/inner.go | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/base/web/favor.go b/base/web/favor.go index fc4717a1..965edb94 100644 --- a/base/web/favor.go +++ b/base/web/favor.go @@ -208,13 +208,13 @@ func init() { return } + fields := []string{kit.MDB_TIME, kit.MDB_ID, kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_TEXT} + if len(arg) > 1 && arg[1] == "extra" { + fields, arg = append(fields, arg[2:]...), arg[:1] + } m.Option("favor", arg[0]) if len(arg) < 3 { // 收藏列表 - fields := []string{kit.MDB_TIME, kit.MDB_ID, kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_TEXT} - if len(arg) > 1 && arg[1] == "extra" { - fields, arg = append(fields, arg[2:]...), arg[:1] - } _favor_list(m, arg[0], kit.Select("", arg, 1), fields...) return } diff --git a/core/wiki/inner.go b/core/wiki/inner.go index 15337348..7f7035cd 100644 --- a/core/wiki/inner.go +++ b/core/wiki/inner.go @@ -157,6 +157,13 @@ func init() { "record": {Name: "record", Help: "记录", Hand: func(m *ice.Message, arg ...string) { web.StoryAdd(m, "display", path.Join("./", m.Option("path"), m.Option("name"))+".display", m.Option("display")) }}, + "favor": {Name: "favor", Help: "收藏", Hand: func(m *ice.Message, arg ...string) { + m.Cmd(ice.WEB_FAVOR, arg, "extra", "extra.poster").Table(func(index int, value map[string]string, header []string) { + m.Push("image", kit.Format(``, + value["name"], value["text"], value["extra.poster"])) + m.Push("video", kit.Format(``, value["text"])) + }) + }}, "recover": {Name: "recover", Help: "复盘", Hand: func(m *ice.Message, arg ...string) { msg := m.Spawn() web.StoryHistory(msg, path.Join("./", arg[0], arg[1])+".display") @@ -197,6 +204,12 @@ func init() { _inner_main(m, arg...) }}, + + "video": {Name: "video", Help: "视频", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Cmd(ice.WEB_FAVOR, arg, "extra", "extra.poster").Table(func(index int, value map[string]string, header []string) { + m.Echo(``, value["text"]) + }) + }}, }, }, nil) }