diff --git a/dots/.config/quickshell/ii/services/Booru.qml b/dots/.config/quickshell/ii/services/Booru.qml index 090476b9f..4cba189df 100644 --- a/dots/.config/quickshell/ii/services/Booru.qml +++ b/dots/.config/quickshell/ii/services/Booru.qml @@ -190,19 +190,19 @@ Singleton { "waifu.im": { "name": "waifu.im", "url": "https://waifu.im", - "api": "https://api.waifu.im/search", + "api": "https://api.waifu.im/images", "description": Translation.tr("Waifus only | Excellent quality, limited quantity"), "mapFunc": (response) => { - response = response.images + response = response.items return response.map(item => { return { - "id": item.image_id, + "id": item.id, "width": item.width, "height": item.height, "aspect_ratio": item.width / item.height, "tags": item.tags.map(tag => {return tag.name}).join(" "), - "rating": item.is_nsfw ? "e" : "s", - "is_nsfw": item.is_nsfw, + "rating": item.isNsfw ? "e" : "s", + "is_nsfw": item.isNsfw, "md5": item.md5, "preview_url": item.sample_url ?? item.url, // preview_url just says access denied (maybe i fucked up and sent too many requests idk) "sample_url": item.url, @@ -212,10 +212,9 @@ Singleton { } }) }, - "tagSearchTemplate": "https://api.waifu.im/tags", + "tagSearchTemplate": "https://api.waifu.im/tags?Name={{query}}", "tagMapFunc": (response) => { - return [...response.versatile.map(item => {return {"name": item}}), - ...response.nsfw.map(item => {return {"name": item}})] + return response.items.map(item => {return {"name": item.name}}) } }, "t.alcy.cc": { @@ -276,7 +275,7 @@ Singleton { property var currentProvider: Persistent.states.booru.provider function getWorkingImageSource(url) { - if (url.includes('pximg.net')) { + if (url?.includes('pximg.net')) { return `https://www.pixiv.net/en/artworks/${url.substring(url.lastIndexOf('/') + 1).replace(/_p\d+\.(png|jpg|jpeg|gif)$/, '')}`; } return url; @@ -330,10 +329,10 @@ Singleton { else if (currentProvider === "waifu.im") { var tagsArray = tagString.split(" "); tagsArray.forEach(tag => { - params.push("included_tags=" + encodeURIComponent(tag)); + params.push("IncludedTags=" + encodeURIComponent(tag.toLowerCase())); }); - params.push("limit=" + Math.min(limit, 30)) // Only admin can do > 30 - params.push("is_nsfw=" + (nsfw ? "null" : "false")) // null is random + params.push("PageSize=" + Math.min(limit, 30)) // Only admin can do > 30 + params.push("IsNsfw=" + (nsfw ? "All" : "False")) // null is random } else if (currentProvider === "t.alcy.cc") { url += tagString