diff --git a/commands/message/search/bing-images.js b/commands/message/search/bing-images.js index c489049..66f0cfc 100644 --- a/commands/message/search/bing-images.js +++ b/commands/message/search/bing-images.js @@ -39,7 +39,7 @@ module.exports = { context.triggerTyping(); if(!args.query) return editOrReply(context, {embeds:[createEmbed("warning", context, `Missing Parameter (query).`)]}) try{ - let search = await bingImages(context, args.query) + let search = await bingImages(context, args.query, context.channel.nsfw) search = search.response let pages = [] diff --git a/commands/message/search/bing.js b/commands/message/search/bing.js index 99e3ba4..7a99df7 100644 --- a/commands/message/search/bing.js +++ b/commands/message/search/bing.js @@ -35,7 +35,7 @@ module.exports = { context.triggerTyping(); if(!args.query) return editOrReply(context, {embeds:[createEmbed("warning", context, `Missing Parameter (query).`)]}) try{ - let search = await bing(context, args.query) + let search = await bing(context, args.query, context.channel.nsfw) search = search.response let pages = [] diff --git a/commands/message/search/google-images.js b/commands/message/search/google-images.js index 6c082c8..8422d95 100644 --- a/commands/message/search/google-images.js +++ b/commands/message/search/google-images.js @@ -39,7 +39,7 @@ module.exports = { context.triggerTyping(); if(!args.query) return editOrReply(context, {embeds:[createEmbed("warning", context, `Missing Parameter (query).`)]}) try{ - let search = await googleImages(context, args.query) + let search = await googleImages(context, args.query, context.channel.nsfw) search = search.response let pages = [] diff --git a/commands/message/search/google.js b/commands/message/search/google.js index 65c24a9..bdb3ce3 100644 --- a/commands/message/search/google.js +++ b/commands/message/search/google.js @@ -36,7 +36,7 @@ module.exports = { context.triggerTyping(); if(!args.query) return editOrReply(context, {embeds:[createEmbed("warning", context, `Missing Parameter (query).`)]}) try{ - let search = await google(context, args.query) + let search = await google(context, args.query, context.channel.nsfw) search = search.response if(search.body.status == 2) return editOrReply(context, {embeds:[createEmbed("error", context, search.body.message)]}) diff --git a/commands/message/utils/screenshot.js b/commands/message/utils/screenshot.js index 822c0ed..5197c79 100644 --- a/commands/message/utils/screenshot.js +++ b/commands/message/utils/screenshot.js @@ -23,7 +23,7 @@ module.exports = { try{ const t = Date.now(); - let ss = await screenshot(context, args.url) + let ss = await screenshot(context, args.url, context.channel.nsfw) if(ss.response.body.status && ss.response.body.status !== 3){ if(ss.response.body.image) return await response.edit({ diff --git a/labscore/api/index.js b/labscore/api/index.js index 37a313f..dc31778 100644 --- a/labscore/api/index.js +++ b/labscore/api/index.js @@ -104,15 +104,17 @@ module.exports.lyrics = async function(context, query){ }) } -module.exports.google = async function(context, query){ +module.exports.google = async function(context, query, nsfw){ return await request(Api.SEARCH_GOOGLE, "GET", {}, { - q: query + q: query, + nsfw: nsfw }) } -module.exports.googleImages = async function(context, query){ +module.exports.googleImages = async function(context, query, nsfw){ return await request(Api.SEARCH_GOOGLE_IMAGES, "GET", {}, { - q: query + q: query, + nsfw: nsfw }) } @@ -130,15 +132,17 @@ module.exports.rule34 = async function(context, query, site){ }) } -module.exports.bing = async function(context, query){ +module.exports.bing = async function(context, query, nsfw){ return await request(Api.SEARCH_BING, "GET", {}, { - q: query + q: query, + nsfw: nsfw }) } -module.exports.bingImages = async function(context, query){ +module.exports.bingImages = async function(context, query, nsfw){ return await request(Api.SEARCH_BING_IMAGES, "GET", {}, { - q: query + q: query, + nsfw: nsfw }) } @@ -252,9 +256,10 @@ module.exports.inferkit = async function(context, input){ }) } -module.exports.screenshot = async function(context, url){ +module.exports.screenshot = async function(context, url, nsfw){ return await request(Api.UTILS_SCREENSHOT, "GET", {}, { - url: url + url: url, + nsfw: nsfw }) }