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

♻️ Migrated to nexus

Browse Source
This commit is contained in:
LittleSheep
2024-10-27 13:13:40 +08:00
parent 07417deea9
commit 2e32de4716
25 changed files with 348 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/internal/services/attachments.go
View File

@ -3,6 +3,7 @@ package services
import (
"context"
"fmt"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"math"
"mime"
"mime/multipart"
@ -16,7 +17,6 @@ import (
"github.com/spf13/viper"
"gorm.io/datatypes"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
localCache "git.solsynth.dev/hydrogen/paperclip/pkg/internal/cache"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
@ -32,7 +32,7 @@ func GetAttachmentCacheKey(rid string) any {
func GetAttachmentByID(id uint) (models.Attachment, error) {
var attachment models.Attachment
if err := database.C.
Where(&hyper.BaseModel{ID: id}).
Where("id = ?", id).
Preload("Pool").Preload("Account").
First(&attachment).Error; err != nil {
return attachment, err
@ -102,7 +102,7 @@ func CacheAttachment(item models.Attachment) {
marshal := marshaler.New(cacheManager)
contx := context.Background()
marshal.Set(
_ = marshal.Set(
contx,
GetAttachmentCacheKey(item.Rid),
item,
@ -111,7 +111,7 @@ func CacheAttachment(item models.Attachment) {
)
}
func NewAttachmentMetadata(tx *gorm.DB, user models.Account, file *multipart.FileHeader, attachment models.Attachment) (models.Attachment, error) {
func NewAttachmentMetadata(tx *gorm.DB, user sec.UserInfo, file *multipart.FileHeader, attachment models.Attachment) (models.Attachment, error) {
attachment.Uuid = uuid.NewString()
attachment.Rid = RandString(16)
attachment.Size = file.Size
@ -150,7 +150,7 @@ func NewAttachmentMetadata(tx *gorm.DB, user models.Account, file *multipart.Fil
return attachment, nil
}
func NewAttachmentPlaceholder(tx *gorm.DB, user models.Account, attachment models.Attachment) (models.Attachment, error) {
func NewAttachmentPlaceholder(tx *gorm.DB, user sec.UserInfo, attachment models.Attachment) (models.Attachment, error) {
attachment.Uuid = uuid.NewString()
attachment.Rid = RandString(16)
attachment.IsUploaded = false
@ -234,9 +234,7 @@ func DeleteAttachment(item models.Attachment) error {
if item.RefID != nil {
var refTarget models.Attachment
if err := database.C.Where(models.Attachment{
BaseModel: hyper.BaseModel{ID: *item.RefID},
}).First(&refTarget).Error; err == nil {
if err := database.C.Where("id = ?", *item.RefID).First(&refTarget).Error; err == nil {
refTarget.RefCount--
if err := tx.Save(&refTarget).Error; err != nil {
tx.Rollback()
@ -251,7 +249,7 @@ func DeleteAttachment(item models.Attachment) error {
cacheManager := cache.New[any](localCache.S)
marshal := marshaler.New(cacheManager)
contx := context.Background()
marshal.Delete(contx, GetAttachmentCacheKey(item.Rid))
_ = marshal.Delete(contx, GetAttachmentCacheKey(item.Rid))
}
tx.Commit()

3
pkg/internal/services/sticker_packs.go
View File

@ -3,6 +3,7 @@ package services
import (
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
"git.solsynth.dev/hydrogen/paperclip/pkg/internal/models"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"gorm.io/gorm"
)
@ -30,7 +31,7 @@ func ListStickerPackWithStickers(tx *gorm.DB, take, offset int) ([]models.Sticke
return packs, nil
}
func NewStickerPack(user models.Account, prefix, name, desc string) (models.StickerPack, error) {
func NewStickerPack(user sec.UserInfo, prefix, name, desc string) (models.StickerPack, error) {
pack := models.StickerPack{
Prefix: prefix,
Name: name,