From d986cfc9119b48160da5babaace8a9df9db2e62c Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Feb 2025 15:30:47 +0800
Subject: [PATCH 1/5] :art: Improve database date field relative between filter
 https://github.com/siyuan-note/siyuan/issues/14091

---
 kernel/av/filter.go | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index f386691d2..bac2de516 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -592,7 +592,23 @@ func filterRelativeTime(valueMills int64, valueIsNotEmpty bool, operator FilterO
 		return valueTime.Before(otherValueEnd) || valueTime.Equal(otherValueEnd)
 	case FilterOperatorIsBetween:
 		if RelativeDateDirectionBefore == direction {
-			if RelativeDateDirectionBefore == direction2 || RelativeDateDirectionAfter == direction2 {
+			if RelativeDateDirectionBefore == direction2 {
+				var leftStart, rightEnd time.Time
+				if otherValueStart.Before(otherValueStart2) {
+					leftStart = otherValueStart
+				} else {
+					leftStart = otherValueStart2
+				}
+				if otherValueEnd.Before(otherValueStart2) {
+					rightEnd = otherValueEnd
+				} else {
+					rightEnd = otherValueStart2
+				}
+				return (valueTime.After(leftStart) || valueTime.Equal(leftStart)) && (valueTime.Before(rightEnd) || valueTime.Equal(rightEnd))
+			} else if RelativeDateDirectionThis == direction2 {
+				return ((valueTime.After(otherValueStart) || valueTime.Equal(otherValueStart)) && (valueTime.Before(otherValueEnd) || valueTime.Equal(otherValueEnd))) ||
+					((valueTime.After(otherValueStart2) || valueTime.Equal(otherValueStart2)) && (valueTime.Before(otherValueEnd2) || valueTime.Equal(otherValueEnd2)))
+			} else if RelativeDateDirectionAfter == direction2 {
 				var leftStart, rightEnd time.Time
 				if otherValueStart.Before(otherValueStart2) {
 					leftStart = otherValueStart
@@ -605,15 +621,12 @@ func filterRelativeTime(valueMills int64, valueIsNotEmpty bool, operator FilterO
 					rightEnd = otherValueEnd
 				}
 				return (valueTime.After(leftStart) || valueTime.Equal(leftStart)) && (valueTime.Before(rightEnd) || valueTime.Equal(rightEnd))
-			} else if RelativeDateDirectionThis == direction2 {
-				return ((valueTime.After(otherValueStart) || valueTime.Equal(otherValueStart)) && (valueTime.Before(otherValueEnd) || valueTime.Equal(otherValueEnd))) ||
-					((valueTime.After(otherValueStart2) || valueTime.Equal(otherValueStart2)) && (valueTime.Before(otherValueEnd2) || valueTime.Equal(otherValueEnd2)))
 			}
 		} else if RelativeDateDirectionThis == direction {
 			return ((valueTime.After(otherValueStart) || valueTime.Equal(otherValueStart)) && (valueTime.Before(otherValueEnd) || valueTime.Equal(otherValueEnd))) ||
 				((valueTime.After(otherValueStart2) || valueTime.Equal(otherValueStart2)) && (valueTime.Before(otherValueEnd2) || valueTime.Equal(otherValueEnd2)))
 		} else if RelativeDateDirectionAfter == direction {
-			if RelativeDateDirectionBefore == direction2 || RelativeDateDirectionAfter == direction2 {
+			if RelativeDateDirectionBefore == direction2 {
 				var leftStart, rightEnd time.Time
 				if otherValueStart.Before(otherValueStart2) {
 					leftStart = otherValueStart
@@ -629,6 +642,19 @@ func filterRelativeTime(valueMills int64, valueIsNotEmpty bool, operator FilterO
 			} else if RelativeDateDirectionThis == direction2 {
 				return ((valueTime.After(otherValueStart) || valueTime.Equal(otherValueStart)) && (valueTime.Before(otherValueEnd) || valueTime.Equal(otherValueEnd))) ||
 					((valueTime.After(otherValueStart2) || valueTime.Equal(otherValueStart2)) && (valueTime.Before(otherValueEnd2) || valueTime.Equal(otherValueEnd2)))
+			} else if RelativeDateDirectionAfter == direction2 {
+				var leftStart, rightEnd time.Time
+				if otherValueEnd.Before(otherValueEnd2) {
+					leftStart = otherValueEnd
+				} else {
+					leftStart = otherValueEnd2
+				}
+				if otherValueEnd.After(otherValueEnd2) {
+					rightEnd = otherValueEnd
+				} else {
+					rightEnd = otherValueEnd2
+				}
+				return (valueTime.After(leftStart) || valueTime.Equal(leftStart)) && (valueTime.Before(rightEnd) || valueTime.Equal(rightEnd))
 			}
 		}
 		return false

From d97899668b918caa205ffb34574826bbc8537f11 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Feb 2025 15:43:12 +0800
Subject: [PATCH 2/5] :art: Improve database date field relative between filter
 https://github.com/siyuan-note/siyuan/issues/14091

---
 app/src/protyle/render/av/filter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
index a1b598519..b4bd14cb4 100644
--- a/app/src/protyle/render/av/filter.ts
+++ b/app/src/protyle/render/av/filter.ts
@@ -426,7 +426,7 @@ export const setFilter = async (options: {
             <option value="0"${showToday ? " selected" : ""}>${window.siyuan.languages.current}</option>
         </select>
         <span class="fn__space"></span>
-        <input type="number" min="1" step="1" value="${options.filter.relativeDate?.count || 1}" class="b3-text-field fn__flex-1${showToday ? " fn__none" : ""}"/>
+        <input type="number" min="1" oninput="this.value = Math.max(this.value, 1)" step="1" value="${options.filter.relativeDate?.count || 1}" class="b3-text-field fn__flex-1${showToday ? " fn__none" : ""}"/>
         <span class="fn__space${showToday ? " fn__none" : ""}"></span>
         <select class="b3-select fn__flex-1">
             <option value="0"${options.filter.relativeDate?.unit === 0 ? " selected" : ""}>${window.siyuan.languages.day}</option>
@@ -449,7 +449,7 @@ export const setFilter = async (options: {
             <option value="0"${showToday2 ? " selected" : ""}>${window.siyuan.languages.current}</option>
         </select>
         <span class="fn__space"></span>
-        <input type="number" min="1" step="1" value="${options.filter.relativeDate2?.count || 1}" class="b3-text-field fn__flex-1${showToday2 ? " fn__none" : ""}"/>
+        <input type="number" min="1" step="1" oninput="this.value = Math.max(this.value, 1)" value="${options.filter.relativeDate2?.count || 1}" class="b3-text-field fn__flex-1${showToday2 ? " fn__none" : ""}"/>
         <span class="fn__space${showToday2 ? " fn__none" : ""}"></span>
         <select class="b3-select fn__flex-1">
             <option value="0"${options.filter.relativeDate2?.unit === 0 ? " selected" : ""}>${window.siyuan.languages.day}</option>

From c36b2a4fdc8759d9762194cd98f738a7bb6525e2 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Feb 2025 16:49:21 +0800
Subject: [PATCH 3/5] :art: Improve find-replace of image/link elements
 https://github.com/siyuan-note/siyuan/issues/14049

---
 kernel/model/search.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel/model/search.go b/kernel/model/search.go
index e06c3ae43..3a47a698d 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -118,7 +118,7 @@ func ListInvalidBlockRefs(page, pageSize int) (ret []*Block, matchedBlockCount,
 	}
 
 	var toRemoves []string
-	for defID, _ := range invalidDefIDs {
+	for defID := range invalidDefIDs {
 		if _, ok := blockMap[defID]; ok {
 			toRemoves = append(toRemoves, defID)
 		}
@@ -148,7 +148,7 @@ func ListInvalidBlockRefs(page, pageSize int) (ret []*Block, matchedBlockCount,
 		delete(refBlockMap, toRemove)
 	}
 
-	for refID, _ := range refBlockMap {
+	for refID := range refBlockMap {
 		invalidBlockIDs = append(invalidBlockIDs, refID)
 	}
 	invalidBlockIDs = gulu.Str.RemoveDuplicatedElem(invalidBlockIDs)
@@ -596,6 +596,9 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 					}
 
 					replaceNodeTokens(n, method, keyword, strings.TrimSpace(replacement), r)
+					if 1 > len(n.Tokens) {
+						unlinks = append(unlinks, n.Parent)
+					}
 				case ast.NodeLinkText:
 					if !replaceTypes["imgText"] {
 						return ast.WalkContinue
@@ -683,6 +686,10 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 									n.TextMarkAHref = r.ReplaceAllString(n.TextMarkAHref, strings.TrimSpace(replacement))
 								}
 							}
+
+							if "" == n.TextMarkAHref {
+								unlinks = append(unlinks, n)
+							}
 						}
 					} else if n.IsTextMarkType("em") {
 						if !replaceTypes["em"] {

From dbbd250894fde1652b8fdb6e4365c7af243af579 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Feb 2025 17:01:42 +0800
Subject: [PATCH 4/5] :art: Improve find-replace of image/link elements
 https://github.com/siyuan-note/siyuan/issues/14049

---
 kernel/model/search.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/model/search.go b/kernel/model/search.go
index 3a47a698d..eb261fd08 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -688,7 +688,12 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 							}
 
 							if "" == n.TextMarkAHref {
-								unlinks = append(unlinks, n)
+								if "" == n.TextMarkTextContent {
+									unlinks = append(unlinks, n)
+								} else {
+									n.Type = ast.NodeText
+									n.Tokens = []byte(n.TextMarkTextContent)
+								}
 							}
 						}
 					} else if n.IsTextMarkType("em") {

From e9b8ff7a55653006fc6460fb25a383207d43815f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Feb 2025 17:25:05 +0800
Subject: [PATCH 5/5] :art: Hide text in breadcrumb of last non-document path
 in embed block https://github.com/siyuan-note/siyuan/issues/13866

---
 kernel/model/blockinfo.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go
index c68ef1717..f5043dc15 100644
--- a/kernel/model/blockinfo.go
+++ b/kernel/model/blockinfo.go
@@ -554,8 +554,15 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bo
 		name = util.UnescapeHTML(name)
 		name = util.EscapeHTML(name)
 
-		if !isEmbedBlock && parent == node {
-			name = ""
+		if !isEmbedBlock {
+			if parent == node {
+				name = ""
+			}
+		} else {
+			if ast.NodeDocument != parent.Type {
+				// 在嵌入块中隐藏最后一个非文档路径的面包屑中的文本 Hide text in breadcrumb of last non-document path in embed block https://github.com/siyuan-note/siyuan/issues/13866
+				name = ""
+			}
 		}
 
 		if add {