nyne/nysoure
1
0
Fork 0
mirror of https://github.com/wgh136/nysoure.git synced 2025-12-16 15:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
nyne
2025-11-16 18:46:22 +08:00
parent 9d9a2545f9
commit 46a19c12fa
12 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
frontend/src/components/character_edit.tsx
View File

@@ -5,9 +5,9 @@ import showToast from "./toast";
import { useTranslation } from "../utils/i18n";
import Button from "./button";
export default function CharacterEditer({charactor, setCharactor, onDelete}: {
charactor: CharacterParams;
setCharactor: (charactor: CharacterParams) => void;
export default function CharacterEditer({character, setCharacter, onDelete}: {
character: CharacterParams;
setCharacter: (character: CharacterParams) => void;
onDelete: () => void;
}) {
const { t } = useTranslation();
@@ -26,8 +26,8 @@ export default function CharacterEditer({charactor, setCharactor, onDelete}: {
const result = await network.uploadImage(file);
setUploading(false);
if (result.success) {
setCharactor({
...charactor,
setCharacter({
...character,
image: result.data!,
});
} else {
@@ -51,7 +51,7 @@ export default function CharacterEditer({charactor, setCharactor, onDelete}: {
}
<img
className="w-full h-full object-cover bg-base-200/80 hover:bg-base-200 transition-colors"
src={charactor.image === 0 ? "/cp.webp" : network.getImageUrl(charactor.image)} alt={charactor.name}
src={character.image === 0 ? "/cp.webp" : network.getImageUrl(character.image)} alt={character.name}
/>
</div>
@@ -61,8 +61,8 @@ export default function CharacterEditer({charactor, setCharactor, onDelete}: {
type="text"
className="input input-sm input-bordered flex-1"
placeholder={t("Name")}
value={charactor.name}
onChange={(e) => setCharactor({ ...charactor, name: e.target.value })}
value={character.name}
onChange={(e) => setCharacter({ ...character, name: e.target.value })}
/>
<button
className="btn btn-sm btn-error btn-square"
@@ -78,14 +78,14 @@ export default function CharacterEditer({charactor, setCharactor, onDelete}: {
type="text"
className="input input-sm input-bordered"
placeholder="CV"
value={charactor.cv}
onChange={(e) => setCharactor({ ...charactor, cv: e.target.value })}
value={character.cv}
onChange={(e) => setCharacter({ ...character, cv: e.target.value })}
/>
<select
className="select select-sm select-bordered"
value={charactor.role}
onChange={(e) => setCharactor({ ...charactor, role: e.target.value as CharacterRole })}
value={character.role}
onChange={(e) => setCharacter({ ...character, role: e.target.value as CharacterRole })}
>
<option value="primary">{t("Primary Role")}</option>
<option value="side">{t("Side Role")}</option>
@@ -95,9 +95,9 @@ export default function CharacterEditer({charactor, setCharactor, onDelete}: {
<textarea
className="textarea textarea-bordered w-full h-full resize-none text-xs"
placeholder={t("Aliases (one per line)")}
value={charactor.alias.join('\n')}
onChange={(e) => setCharactor({
...charactor,
value={character.alias.join('\n')}
onChange={(e) => setCharacter({
...character,
alias: e.target.value.split('\n').filter(line => line.trim() !== '')
})}
/>

2
frontend/src/network/models.ts
View File

@@ -99,7 +99,7 @@ export interface ResourceDetails {
related: Resource[];
gallery: number[];
galleryNsfw: number[];
charactors: CharacterParams[];
characters: CharacterParams[];
}
export interface Storage {

28
frontend/src/pages/edit_resource_page.tsx
View File

@@ -31,7 +31,7 @@ export default function EditResourcePage() {
const [links, setLinks] = useState<{ label: string; url: string }[]>([]);
const [galleryImages, setGalleryImages] = useState<number[]>([]);
const [galleryNsfw, setGalleryNsfw] = useState<number[]>([]);
const [charactors, setCharactors] = useState<CharacterParams[]>([]);
const [characters, setCharacters] = useState<CharacterParams[]>([]);
const [error, setError] = useState<string | null>(null);
const [isSubmitting, setSubmitting] = useState(false);
const [isLoading, setLoading] = useState(true);
@@ -61,7 +61,7 @@ export default function EditResourcePage() {
setLinks(data.links ?? []);
setGalleryImages(data.gallery ?? []);
setGalleryNsfw(data.galleryNsfw ?? []);
setCharactors(data.charactors ?? []);
setCharacters(data.characters ?? []);
setLoading(false);
} else {
showToast({ message: t("Failed to load resource"), type: "error" });
@@ -107,7 +107,7 @@ export default function EditResourcePage() {
links: links,
gallery: galleryImages,
gallery_nsfw: galleryNsfw,
characters: charactors,
characters: characters,
});
if (res.success) {
setSubmitting(false);
@@ -428,18 +428,18 @@ export default function EditResourcePage() {
<p className={"my-1"}>{t("Characters")}</p>
<div className="grid grid-cols-1 md:grid-cols-2 my-2 gap-4">
{
charactors.map((charactor, index) => {
characters.map((character, index) => {
return <CharacterEditer
charactor={charactor}
setCharactor={(newCharactor) => {
const newCharactors = [...charactors];
newCharactors[index] = newCharactor;
setCharactors(newCharactors);
character={character}
setCharacter={(newCharacter) => {
const newCharacters = [...characters];
newCharacters[index] = newCharacter;
setCharacters(newCharacters);
}}
onDelete={() => {
const newCharactors = [...charactors];
newCharactors.splice(index, 1);
setCharactors(newCharactors);
const newCharacters = [...characters];
newCharacters.splice(index, 1);
setCharacters(newCharacters);
}} />;
})
}
@@ -449,7 +449,7 @@ export default function EditResourcePage() {
className={"btn h-9"}
type={"button"}
onClick={() => {
setCharactors([...charactors, { name: "", alias: [], cv: "", image: 0 }]);
setCharacters([...characters, { name: "", alias: [], cv: "", image: 0 }]);
}}
>
<MdAdd />
@@ -461,7 +461,7 @@ export default function EditResourcePage() {
<FetchVndbCharactersButton
vnID={links.find(link => link.label.toLowerCase() === "vndb")?.url.split("/").pop() ?? ""}
onFetch={(fetchedCharacters) => {
setCharactors(fetchedCharacters);
setCharacters(fetchedCharacters);
}}
/>
</div>

24
frontend/src/pages/publish_page.tsx
View File

@@ -32,7 +32,7 @@ export default function PublishPage() {
const [galleryNsfw, setGalleryNsfw] = useState<number[]>([]);
const [error, setError] = useState<string | null>(null);
const [isSubmitting, setSubmitting] = useState(false);
const [charactors, setCharactors] = useState<CharacterParams[]>([]);
const [characters, setCharacters] = useState<CharacterParams[]>([]);
const isFirstLoad = useRef(true);
useEffect(() => {
@@ -111,7 +111,7 @@ export default function PublishPage() {
links: links,
gallery: galleryImages,
gallery_nsfw: galleryNsfw,
characters: charactors,
characters: characters,
});
if (res.success) {
localStorage.removeItem("publish_data");
@@ -435,18 +435,18 @@ export default function PublishPage() {
<p className={"my-1"}>{t("Characters")}</p>
<div className="grid grid-cols-1 md:grid-cols-2 my-2 gap-4">
{
charactors.map((charactor, index) => {
characters.map((character, index) => {
return <CharacterEditer
charactor={charactor}
setCharactor={(newCharactor) => {
const newCharactors = [...charactors];
newCharactors[index] = newCharactor;
setCharactors(newCharactors);
character={character}
setCharacter={(newCharacter) => {
const newCharacters = [...characters];
newCharacters[index] = newCharacter;
setCharacters(newCharacters);
}}
onDelete={() => {
const newCharactors = [...charactors];
newCharactors.splice(index, 1);
setCharactors(newCharactors);
const newCharacters = [...characters];
newCharacters.splice(index, 1);
setCharacters(newCharacters);
}} />;
})
}
@@ -456,7 +456,7 @@ export default function PublishPage() {
className={"btn my-2"}
type={"button"}
onClick={() => {
setCharactors([...charactors, { name: "", alias: [], cv: "", image: 0 }]);
setCharacters([...characters, { name: "", alias: [], cv: "", image: 0 }]);
}}
>
<MdAdd />

26
frontend/src/pages/resource_details_page.tsx
View File

@@ -600,7 +600,7 @@ function Article({ resource }: { resource: ResourceDetails }) {
</Markdown>
</article>
<div className="border-b border-base-300 h-8"></div>
<Characters charactors={resource.charactors} />
<Characters characters={resource.characters} />
</>
);
}
@@ -2078,10 +2078,10 @@ function GalleryImage({src, nfsw}: {src: string, nfsw: boolean}) {
);
}
function Characters({ charactors }: { charactors: CharacterParams[] }) {
function Characters({ characters }: { characters: CharacterParams[] }) {
const { t } = useTranslation();
if (!charactors || charactors.length === 0) {
if (!characters || characters.length === 0) {
return <></>;
}
@@ -2089,43 +2089,43 @@ function Characters({ charactors }: { charactors: CharacterParams[] }) {
<div className="mt-8">
<h3 className="text-xl font-bold mb-4">{t("Characters")}</h3>
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
{charactors.map((charactor, index) => (
<CharacterCard key={index} charactor={charactor} />
{characters.map((character, index) => (
<CharacterCard key={index} character={character} />
))}
</div>
</div>
);
}
function CharacterCard({ charactor }: { charactor: CharacterParams }) {
function CharacterCard({ character }: { character: CharacterParams }) {
const navigate = useNavigate();
const handleCVClick = (e: React.MouseEvent) => {
e.stopPropagation();
if (charactor.cv) {
navigate(`/search?keyword=${encodeURIComponent(charactor.cv)}`);
if (character.cv) {
navigate(`/search?keyword=${encodeURIComponent(character.cv)}`);
}
};
return (
<div className="group relative aspect-[3/4] overflow-hidden rounded-lg bg-base-200 shadow-sm">
<img
src={network.getImageUrl(charactor.image)}
alt={charactor.name}
src={network.getImageUrl(character.image)}
alt={character.name}
className="w-full h-full object-cover"
/>
<div className="absolute bottom-1 left-1 right-1 px-2 py-2 border border-base-100/40 rounded-lg bg-base-100/60">
<h4 className="font-semibold text-sm leading-tight line-clamp border border-transparent px-1">
{charactor.name}
{character.name}
</h4>
{charactor.cv && (
{character.cv && (
<button
onClick={handleCVClick}
className="hover:bg-base-200/80 px-1 border border-transparent hover:border-base-300/50 rounded-sm text-xs transition-colors cursor-pointer"
>
CV: {charactor.cv}
CV: {character.cv}
</button>
)}
</div>

8
server/api/resource.go
View File

@@ -282,16 +282,16 @@ func handleGetPinnedResources(c fiber.Ctx) error {
})
}
func handleGetCharactorsFromVndb(c fiber.Ctx) error {
func handleGetCharactersFromVndb(c fiber.Ctx) error {
vnID := c.Query("vnid")
if vnID == "" {
return model.NewRequestError("VNDB ID is required")
}
characters, err := service.GetCharactorsFromVndb(vnID)
characters, err := service.GetCharactersFromVndb(vnID)
if err != nil {
return err
}
return c.Status(fiber.StatusOK).JSON(model.Response[[]service.CharactorParams]{
return c.Status(fiber.StatusOK).JSON(model.Response[[]service.CharacterParams]{
Success: true,
Data: characters,
Message: "Characters retrieved successfully",
@@ -306,7 +306,7 @@ func AddResourceRoutes(api fiber.Router) {
resource.Get("/", handleListResources)
resource.Get("/random", handleGetRandomResource)
resource.Get("/pinned", handleGetPinnedResources)
resource.Get("/vndb/characters", handleGetCharactorsFromVndb)
resource.Get("/vndb/characters", handleGetCharactersFromVndb)
resource.Get("/:id", handleGetResource)
resource.Delete("/:id", handleDeleteResource)
resource.Get("/tag/:tag", handleListResourcesWithTag)

2
server/dao/db.go
View File

@@ -60,7 +60,7 @@ func init() {
&model.Activity{},
&model.Collection{},
&model.CollectionResource{},
&model.Charactor{},
&model.Character{},
)
}

2
server/dao/image.go
View File

@@ -47,7 +47,7 @@ func GetUnusedImages() ([]model.Image, error) {
Where("NOT EXISTS (SELECT 1 FROM resource_images WHERE image_id = images.id)").
Where("NOT EXISTS (SELECT 1 FROM comment_images WHERE image_id = images.id)").
Where("NOT EXISTS (SELECT 1 FROM collection_images WHERE image_id = images.id)").
Where("NOT EXISTS (SELECT 1 FROM charactors WHERE image_id = images.id)").
Where("NOT EXISTS (SELECT 1 FROM characters WHERE image_id = images.id)").
Where("created_at < ?", oneDayAgo).
Find(&images).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {

24
server/dao/resource.go
View File

@@ -16,13 +16,13 @@ import (
func CreateResource(r model.Resource) (model.Resource, error) {
err := db.Transaction(func(tx *gorm.DB) error {
r.ModifiedTime = time.Now()
charactors := r.Charactors
r.Charactors = nil
characters := r.Characters
r.Characters = nil
err := tx.Create(&r).Error
if err != nil {
return err
}
for _, c := range charactors {
for _, c := range characters {
c.ResourceID = r.ID
if err := tx.Create(&c).Error; err != nil {
return err
@@ -50,7 +50,7 @@ func GetResourceByID(id uint) (model.Resource, error) {
Preload("Files").
Preload("Files.User").
Preload("Files.Storage").
Preload("Charactors").
Preload("Characters").
First(&r, id).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return model.Resource{}, model.NewNotFoundError("Resource not found")
@@ -111,14 +111,14 @@ func UpdateResource(r model.Resource) error {
return db.Transaction(func(tx *gorm.DB) error {
images := r.Images
tags := r.Tags
charactors := r.Charactors
r.Charactors = nil
characters := r.Characters
r.Characters = nil
r.Images = nil
r.Tags = nil
r.Files = nil
r.ModifiedTime = time.Now()
oldCharactors := []model.Charactor{}
if err := db.Model(&model.Charactor{}).Where("resource_id = ?", r.ID).Find(&oldCharactors).Error; err != nil {
oldCharacters := []model.Character{}
if err := db.Model(&model.Character{}).Where("resource_id = ?", r.ID).Find(&oldCharacters).Error; err != nil {
return err
}
if err := db.Save(&r).Error; err != nil {
@@ -130,9 +130,9 @@ func UpdateResource(r model.Resource) error {
if err := db.Model(&r).Association("Tags").Replace(tags); err != nil {
return err
}
for _, c := range oldCharactors {
for _, c := range oldCharacters {
shouldDelete := true
for _, nc := range charactors {
for _, nc := range characters {
if c.ID == nc.ID {
shouldDelete = false
break
@@ -144,9 +144,9 @@ func UpdateResource(r model.Resource) error {
}
}
}
for _, c := range charactors {
for _, c := range characters {
shouldAdd := true
for _, oc := range oldCharactors {
for _, oc := range oldCharacters {
if c.Equal(&oc) {
shouldAdd = false
break

10
server/model/charactor.go → server/model/character.go
View File

@@ -1,6 +1,6 @@
package model
type Charactor struct {
type Character struct {
ID uint `gorm:"primaryKey;autoIncrement"`
Name string `gorm:"type:varchar(100);not null"`
Alias []string `gorm:"serializer:json"`
@@ -11,7 +11,7 @@ type Charactor struct {
Image *Image `gorm:"foreignKey:ImageID;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
}
type CharactorView struct {
type CharacterView struct {
Id uint `json:"id"`
Name string `json:"name"`
Alias []string `json:"alias"`
@@ -20,8 +20,8 @@ type CharactorView struct {
Image uint `json:"image"`
}
func (c *Charactor) ToView() *CharactorView {
return &CharactorView{
func (c *Character) ToView() *CharacterView {
return &CharacterView{
Id: c.ID,
Name: c.Name,
Alias: c.Alias,
@@ -31,7 +31,7 @@ func (c *Charactor) ToView() *CharactorView {
}
}
func (c *Charactor) Equal(other *Charactor) bool {
func (c *Character) Equal(other *Character) bool {
if c.Name != other.Name || c.CV != other.CV || c.Role != other.Role || c.ImageID != other.ImageID {
return false
}

12
server/model/resource.go
View File

@@ -23,7 +23,7 @@ type Resource struct {
ModifiedTime time.Time
Gallery []uint `gorm:"serializer:json"`
GalleryNsfw []uint `gorm:"serializer:json"`
Charactors []Charactor `gorm:"foreignKey:ResourceID"`
Characters []Character `gorm:"foreignKey:ResourceID"`
}
type Link struct {
@@ -57,7 +57,7 @@ type ResourceDetailView struct {
Related []ResourceView `json:"related"`
Gallery []uint `json:"gallery"`
GalleryNsfw []uint `json:"galleryNsfw"`
Charactors []CharactorView `json:"charactors"`
Characters []CharacterView `json:"characters"`
}
func (r *Resource) ToView() ResourceView {
@@ -96,9 +96,9 @@ func (r *Resource) ToDetailView() ResourceDetailView {
for i, file := range r.Files {
files[i] = *file.ToView()
}
charactors := make([]CharactorView, len(r.Charactors))
for i, charactor := range r.Charactors {
charactors[i] = *charactor.ToView()
characters := make([]CharacterView, len(r.Characters))
for i, character := range r.Characters {
characters[i] = *character.ToView()
}
return ResourceDetailView{
ID: r.ID,
@@ -116,6 +116,6 @@ func (r *Resource) ToDetailView() ResourceDetailView {
Comments: r.Comments,
Gallery: r.Gallery,
GalleryNsfw: r.GalleryNsfw,
Charactors: charactors,
Characters: characters,
}
}

34
server/service/resource.go
View File

@@ -35,10 +35,10 @@ type ResourceParams struct {
Images []uint `json:"images"`
Gallery []uint `json:"gallery"`
GalleryNsfw []uint `json:"gallery_nsfw"`
Charactors []CharactorParams `json:"characters"`
Characters []CharacterParams `json:"characters"`
}
type CharactorParams struct {
type CharacterParams struct {
Name string `json:"name" binding:"required"`
Alias []string `json:"alias"`
CV string `json:"cv"`
@@ -83,13 +83,13 @@ func CreateResource(uid uint, params *ResourceParams) (uint, error) {
nsfw = append(nsfw, id)
}
}
charactors := make([]model.Charactor, len(params.Charactors))
for i, c := range params.Charactors {
characters := make([]model.Character, len(params.Characters))
for i, c := range params.Characters {
role := c.Role
if role == "" {
role = "primary"
}
charactors[i] = model.Charactor{
characters[i] = model.Character{
Name: c.Name,
Alias: c.Alias,
CV: c.CV,
@@ -107,7 +107,7 @@ func CreateResource(uid uint, params *ResourceParams) (uint, error) {
UserID: uid,
Gallery: gallery,
GalleryNsfw: nsfw,
Charactors: charactors,
Characters: characters,
}
if r, err = dao.CreateResource(r); err != nil {
return 0, err
@@ -506,13 +506,13 @@ func UpdateResource(uid, rid uint, params *ResourceParams) error {
nsfw = append(nsfw, id)
}
}
charactors := make([]model.Charactor, len(params.Charactors))
for i, c := range params.Charactors {
characters := make([]model.Character, len(params.Characters))
for i, c := range params.Characters {
role := c.Role
if role == "" {
role = "primary"
}
charactors[i] = model.Charactor{
characters[i] = model.Character{
Name: c.Name,
Alias: c.Alias,
CV: c.CV,
@@ -527,7 +527,7 @@ func UpdateResource(uid, rid uint, params *ResourceParams) error {
r.Links = params.Links
r.Gallery = gallery
r.GalleryNsfw = nsfw
r.Charactors = charactors
r.Characters = characters
images := make([]model.Image, len(params.Images))
for i, id := range params.Images {
@@ -607,7 +607,7 @@ func GetPinnedResources() ([]model.ResourceView, error) {
return views, nil
}
func GetCharactorsFromVndb(vnID string) ([]CharactorParams, error) {
func GetCharactersFromVndb(vnID string) ([]CharacterParams, error) {
client := http.Client{}
jsonStr := fmt.Sprintf(`
{
@@ -658,11 +658,11 @@ func GetCharactorsFromVndb(vnID string) ([]CharactorParams, error) {
}
if len(vndbResp.Results) == 0 {
return []CharactorParams{}, nil
return []CharacterParams{}, nil
}
result := vndbResp.Results[0]
var charactors []CharactorParams
var characters []CharacterParams
processedCharacters := make(map[string]bool) // 避免重复角色
// 遍历声优信息
@@ -700,7 +700,7 @@ func GetCharactorsFromVndb(vnID string) ([]CharactorParams, error) {
cvName = va.Staff.Name
}
charactor := CharactorParams{
character := CharacterParams{
Name: characterName,
Alias: []string{},
CV: cvName,
@@ -715,14 +715,14 @@ func GetCharactorsFromVndb(vnID string) ([]CharactorParams, error) {
log.Error("Failed to download character image:", err)
// 继续处理，即使图片下载失败
} else {
charactor.Image = imageID
character.Image = imageID
}
}
charactors = append(charactors, charactor)
characters = append(characters, character)
}
return charactors, nil
return characters, nil
}
// downloadAndCreateImage 下载图片并使用 CreateImage 保存