Lucas/PoorBooru
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api, backend: improve references uses

Browse Source
This commit is contained in:
Lucas 2023-03-15 22:41:45 +00:00
parent 672192441d
commit 37a2806f03
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/PoorBooru/API/V0/Controller/Media.pm
View File

@ -21,14 +21,14 @@ sub list ($self)
) if $v->has_error; ) if $v->has_error;
my $paged_media = $self->schema->resultset("Media") my $paged_media = $self->schema->resultset("Media")
->search({}, $MEDIA_SEARCH_OPTS)->page($page); ->search(undef, { $MEDIA_SEARCH_OPTS->%* })->page($page);
my @media = map +{ my @media = map +{
media_id => $_->media_id, media_id => $_->media_id,
seaweedfs_fid => $_->seaweedfs_fid, seaweedfs_fid => $_->seaweedfs_fid,
}, $paged_media->all; }, $paged_media->all;
return $self->render(json => { return $self->render(json => {
media => \@media, media => [ @media ],
pager => { $self->pager($paged_media->pager) }, pager => { $self->pager($paged_media->pager) },
}); });
}; };

10
lib/PoorBooru/API/V0/Controller/Tags.pm
View File

@ -25,7 +25,7 @@ sub list ($self)
) if $v->has_error; ) if $v->has_error;
my $paged_tags = $self->schema->resultset("TagCountView") my $paged_tags = $self->schema->resultset("TagCountView")
->search(undef, $TAGS_COUNT_VIEW_SEARCH_OPTS)->page($page); ->search(undef, { $TAGS_COUNT_VIEW_SEARCH_OPTS->%* })->page($page);
my @tags = map +{ my @tags = map +{
id => $_->tag_id, id => $_->tag_id,
name => $_->name, name => $_->name,
@ -33,7 +33,7 @@ sub list ($self)
}, $paged_tags->all; }, $paged_tags->all;
return $self->render(json => { return $self->render(json => {
tags => \@tags, tags => [ @tags ],
pager => { $self->pager($paged_tags->pager) }, pager => { $self->pager($paged_tags->pager) },
}); });
}; };
@ -57,7 +57,7 @@ sub show ($self)
push @search, { name => $tag_id_or_name }; push @search, { name => $tag_id_or_name };
} }
my $tag = $self->schema->resultset("Tag")->single(\@search); my $tag = $self->schema->resultset("Tag")->single([ @search ]);
return $self->render( return $self->render(
json => {error => "Tag not found"}, json => {error => "Tag not found"},
@ -65,7 +65,7 @@ sub show ($self)
) if !defined($tag); ) if !defined($tag);
my $paged_media = $self->schema->resultset("TaggedMediaView") my $paged_media = $self->schema->resultset("TaggedMediaView")
->search({ tag_id => $tag->tag_id }, $MEDIA_SEARCH_OPTS) ->search({ tag_id => $tag->tag_id }, { $MEDIA_SEARCH_OPTS->%* })
->page($page); ->page($page);
my @media = map +{ my @media = map +{
media_id => $_->media_id, media_id => $_->media_id,
@ -75,7 +75,7 @@ sub show ($self)
return $self->render(json => { return $self->render(json => {
id => $tag->tag_id, id => $tag->tag_id,
name => $tag->name, name => $tag->name,
media => \@media, media => [ @media ],
pager => { $self->pager($paged_media->pager) }, pager => { $self->pager($paged_media->pager) },
}); });
}; };

2
lib/PoorBooru/Backend/Controller/Gallery.pm
View File

@ -30,7 +30,7 @@ sub index ($self)
return $self->render( return $self->render(
template => "gallery", template => "gallery",
media => \@media, media => [ @media ],
pager => { $self->pager_links($res->json->{pager}) }, pager => { $self->pager_links($res->json->{pager}) },
); );
}; };

4
lib/PoorBooru/Backend/Controller/Tags.pm
View File

@ -28,7 +28,7 @@ sub list ($self)
return $self->render( return $self->render(
template => "tags", template => "tags",
tags => \@tags, tags => [ @tags ],
pager => { $self->pager_links($res->json->{pager}) }, pager => { $self->pager_links($res->json->{pager}) },
); );
}; };
@ -57,7 +57,7 @@ sub show ($self)
return $self->render( return $self->render(
template => "gallery", template => "gallery",
media => \@media, media => [ @media ],
pager => { $self->pager_links($res->json->{pager}) }, pager => { $self->pager_links($res->json->{pager}) },
); );
}; };