Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

temporary fix model.ts json api #3112

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

temporary fix model.ts json api #3112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
147d5e9
temporary fix model.ts json api
SpaghettiMonkey Mar 10, 2024
b043dbc
Update model.ts
SpaghettiMonkey Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/sites/Kemono/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function parseJsonImage(data: any): IImage {
user: data["user"],
id: data["id"],
}
if (data["attachments"].length > 1) {
if (data["attachments"].length > 0) {
img.type = "gallery";
img.gallery_count = data["attachments"].length;
}
Expand Down Expand Up @@ -63,7 +63,7 @@ export const source: ISource = {
if (query.search) {
return {error: "The JSON API does not support arbitrary search."};
}
return "/api/recent?limit=" + opts.limit + "&o=" + offset; // + "&q=" + encodeURIComponent(query.search);
return "/api/v1/recent?limit=" + opts.limit + "&o=" + offset; // + "&q=" + encodeURIComponent(query.search);
},
parse: (src: string): IParsedSearch | IError => {
const data = JSON.parse(src);
Expand All @@ -74,10 +74,10 @@ export const source: ISource = {
gallery: {
url: (query: IGalleryQuery): string => {
const identity = query.identity!;
return `/api/${identity["service"]}/user/${identity["user"]}/post/${identity["id"]}`;
return `/api/v1/${identity["service"]}/user/${identity["user"]}/post/${identity["id"]}`;
},
parse: (src: string): IParsedGallery => {
const data = JSON.parse(src)[0];
const data = JSON.parse(src);
const image = parseJsonImage(data);

// Duplicate the root data for each attachment
Expand Down Expand Up @@ -151,7 +151,7 @@ export const source: ISource = {

// Detect galleries with multiple files
const attachmentCount = parseInt(Grabber.regexToConst("count", "(?<count>\\d+) attachments?", article.innerHTML()), 10)
if (attachmentCount > 1) {
if (attachmentCount > 0) {
image.type = "gallery";
image.gallery_count = attachmentCount;
}
Expand Down