Shares: Allow reuse of the same share slugs & tokens photoprism#776

zhanghongquan · Dec 31, 2020 · bbd0af3 · bbd0af3
1 parent 0c5e00d
commit bbd0af3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/api/share.go b/internal/api/share.go
@@ -39,7 +39,7 @@ func Shares(router *gin.RouterGroup) {
 
 		links := entity.FindValidLinks(token, share)
 
-		if len(links) != 1 {
+		if len(links) < 1 {
 			log.Warn("share: invalid token or share")
 			c.Redirect(http.StatusTemporaryRedirect, "/")
 			return

diff --git a/internal/entity/link.go b/internal/entity/link.go
@@ -168,7 +168,7 @@ func FindLinks(token, share string) (result Links) {
 		}
 	}
 
-	if err := q.Find(&result).Error; err != nil {
+	if err := q.Order("modified_at DESC").Find(&result).Error; err != nil {
 		log.Errorf("link: %s (not found)", err)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,7 +168,7 @@ func FindLinks(token, share string) (result Links) { @@
     		}
     	}
-    	if err := q.Find(&result).Error; err != nil {
+    	if err := q.Order("modified_at DESC").Find(&result).Error; err != nil {
     		log.Errorf("link: %s (not found)", err)
     	}
@@ Expand Down @@