From d112b81869e80e1e5caacba1e979cb9eb3af8650 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 5 Dec 2023 21:06:54 +0800 Subject: [PATCH 1/3] :art: Improve file read/write locking https://github.com/siyuan-note/siyuan/issues/9748 --- kernel/go.mod | 4 ++-- kernel/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index b9a434163..3d3c0fd4e 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -50,10 +50,10 @@ require ( github.com/rqlite/sql v0.0.0-20221103124402-8f9ff0ceb8f0 github.com/sashabaranov/go-openai v1.17.9 github.com/shirou/gopsutil/v3 v3.23.10 - github.com/siyuan-note/dejavu v0.0.0-20231205094504-163c30e1fc73 + github.com/siyuan-note/dejavu v0.0.0-20231205130506-f108e3e9e55b github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80 - github.com/siyuan-note/filelock v0.0.0-20231205094230-68ac1f62dabf + github.com/siyuan-note/filelock v0.0.0-20231205130315-1fc852fc9fb1 github.com/siyuan-note/httpclient v0.0.0-20231120083123-750db4d28b38 github.com/siyuan-note/logging v0.0.0-20231030034701-8265764f00ff github.com/siyuan-note/riff v0.0.0-20231128081053-0cd7a5fa0076 diff --git a/kernel/go.sum b/kernel/go.sum index c69dbaa38..533471714 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -356,14 +356,14 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= -github.com/siyuan-note/dejavu v0.0.0-20231205094504-163c30e1fc73 h1:SMSb1Sw9xkfNcfkysyIiywKbbKkCC0KaiLpsNSfYbeg= -github.com/siyuan-note/dejavu v0.0.0-20231205094504-163c30e1fc73/go.mod h1:6rxqaGLUKJ+8ZVBhJrxo3IjfOeeSgN0VmfS73roU8/A= +github.com/siyuan-note/dejavu v0.0.0-20231205130506-f108e3e9e55b h1:Fe8/MKezRTaq7/8k0O8TGtopAuAW6Sxz0d1WjTylry4= +github.com/siyuan-note/dejavu v0.0.0-20231205130506-f108e3e9e55b/go.mod h1:5r1o1fbWam7+QaIHdbMhRhWTdxOemmxiNw1y7bjKHfc= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80 h1:XghjHKJd+SiL0DkGYFVC+UGUDFtnR4v9gkAbPeh9Eq8= github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI= -github.com/siyuan-note/filelock v0.0.0-20231205094230-68ac1f62dabf h1:Uv0ySSkICiS+6zZTKtD2keNT4TSQTgkWyaAbYlRr5+k= -github.com/siyuan-note/filelock v0.0.0-20231205094230-68ac1f62dabf/go.mod h1:4teUA+79ESPDbagztng2dJfyv66pGrri5ldGJQG/saI= +github.com/siyuan-note/filelock v0.0.0-20231205130315-1fc852fc9fb1 h1:PW8T17xlL7MQ7erZi0alO5ehBpF0WtLk/kTAtJ4fhAg= +github.com/siyuan-note/filelock v0.0.0-20231205130315-1fc852fc9fb1/go.mod h1:4teUA+79ESPDbagztng2dJfyv66pGrri5ldGJQG/saI= github.com/siyuan-note/httpclient v0.0.0-20231120083123-750db4d28b38 h1:deUrbUOwmsNYRT0x12GHaJ8exxmDMwXFL/1J4dVnLMM= github.com/siyuan-note/httpclient v0.0.0-20231120083123-750db4d28b38/go.mod h1:QOTSBBSeKU90Kb4aeDVcQ0G+2zJcNuhkwAlsJ2cnmkQ= github.com/siyuan-note/logging v0.0.0-20231030034701-8265764f00ff h1:5GcxrTOJTsusXOLhg4GuHWbEa4M5gu+CNfL0giwNjDM= From 961bc52d801394ce5735ba8fd19efad6634539d6 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 5 Dec 2023 21:16:37 +0800 Subject: [PATCH 2/3] :memo: Increase the file size transferred by WeChat Assistant to 20MB https://github.com/siyuan-note/siyuan/issues/9816 --- .../20230808120348-orm8sjf/20230808120348-hynr7og.sy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120348-hynr7og.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120348-hynr7og.sy index ed4e143a4..bdb47872d 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120348-hynr7og.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120348-hynr7og.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20230808120348-hynr7og", "title": "收集箱", - "updated": "20231129102919" + "updated": "20231205211419" }, "Children": [ { @@ -374,12 +374,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20230808120348-4sudh2q", - "updated": "20221022010553" + "updated": "20231205211419" }, "Children": [ { "Type": "NodeText", - "Data": "支持的消息类型为文本、图片、语音、视频和文件，单个图片、语音、视频和文件的大小不超过 10M。" + "Data": "支持的消息类型为文本、图片、语音、视频和文件，单个图片、语音、视频和文件的大小不超过 20MB。" } ] }, From 7ee283924d0eca190190133a9e72718cb3ae829e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 5 Dec 2023 21:32:41 +0800 Subject: [PATCH 3/3] :art: Improve database table view filter https://github.com/siyuan-note/siyuan/issues/9820 --- kernel/av/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/av/table.go b/kernel/av/table.go index 4f5900bec..1e2133bc7 100644 --- a/kernel/av/table.go +++ b/kernel/av/table.go @@ -566,7 +566,7 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool return !value.Checkbox.Checked } } - return true + return false } // Table 描述了表格实例的结构。