HyperNet/Paperclip
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💥 Replace attachment id by rid when fetching

Browse Source
This commit is contained in:
LittleSheep
2024-08-18 21:10:10 +08:00
parent e92e5bad60
commit 165a6be985
4 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/internal/server/api/attachment_dir_api.go
View File

@ -1,7 +1,6 @@
package api
import (
"strconv"
"strings"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
@ -23,25 +22,20 @@ func listAttachment(c *fiber.Ctx) error {
needQuery := true
var result = make([]models.Attachment, take)
var idxList []uint
var idxList []string
if len(c.Query("id")) > 0 {
var pendingQueryId []uint
var pendingQueryId []string
idx := strings.Split(c.Query("id"), ",")
for p, raw := range idx {
id, err := strconv.Atoi(raw)
if err != nil {
continue
} else {
idxList = append(idxList, uint(id))
}
if val, ok := services.GetAttachmentCache(uint(id)); ok {
idxList = append(idxList, raw)
if val, ok := services.GetAttachmentCache(raw); ok {
result[p] = val
} else {
pendingQueryId = append(pendingQueryId, uint(id))
pendingQueryId = append(pendingQueryId, raw)
}
}
tx = tx.Where("id IN ?", pendingQueryId)
tx = tx.Where("rid IN ?", pendingQueryId)
needQuery = len(pendingQueryId) > 0
} else {
// Do sort this when doesn't filter by the id
@ -83,7 +77,7 @@ func listAttachment(c *fiber.Ctx) error {
} else {
for _, item := range out {
for p, id := range idxList {
if item.ID == id {
if item.Rid == id {
result[p] = item
}
}

19
pkg/internal/server/api/attachments_api.go
View File

@ -2,13 +2,11 @@ package api
import (
"fmt"
"net/url"
"path/filepath"
"strconv"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/gap"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/server/exts"
"net/url"
"path/filepath"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/models"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/services"
@ -21,14 +19,7 @@ import (
func openAttachment(c *fiber.Ctx) error {
id := c.Params("id")
var err error
var metadata models.Attachment
if numericId, numericErr := strconv.Atoi(id); numericErr == nil {
metadata, err = services.GetAttachmentByID(uint(numericId))
} else {
metadata, err = services.GetAttachmentByRID(id)
}
metadata, err := services.GetAttachmentByRID(id)
if err != nil {
return fiber.NewError(fiber.StatusNotFound)
}
@ -77,9 +68,9 @@ func openAttachment(c *fiber.Ctx) error {
}
func getAttachmentMeta(c *fiber.Ctx) error {
id, _ := c.ParamsInt("id")
id := c.Params("id")
metadata, err := services.GetAttachmentByID(uint(id))
metadata, err := services.GetAttachmentByRID(id)
if err != nil {
return fiber.NewError(fiber.StatusNotFound)
}