diff --git a/lib/config.js b/lib/config.js index 499ae98d3..14ec37d51 100644 --- a/lib/config.js +++ b/lib/config.js @@ -40,8 +40,6 @@ module.exports = { }, nodeName: process.env.NODE_NAME, pixiv: { - client_id: 'MOBrBDS8blbauoSck0ZfDbtuzpyT', - client_secret: 'lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj', username: process.env.PIXIV_USERNAME, password: process.env.PIXIV_PASSWORD, }, diff --git a/lib/routes/pixiv/bookmarks.js b/lib/routes/pixiv/bookmarks.js index 8cfb91a2e..e0d334bbc 100644 --- a/lib/routes/pixiv/bookmarks.js +++ b/lib/routes/pixiv/bookmarks.js @@ -4,7 +4,7 @@ const getUserDetail = require('./api/getUserDetail'); const config = require('@/config'); module.exports = async (ctx) => { - if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) { + if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) { throw 'pixiv RSS is disabled due to the lack of relevant config'; } diff --git a/lib/routes/pixiv/ranking.js b/lib/routes/pixiv/ranking.js index ea355979d..ab68d6a09 100644 --- a/lib/routes/pixiv/ranking.js +++ b/lib/routes/pixiv/ranking.js @@ -33,7 +33,7 @@ const links = { }; module.exports = async (ctx) => { - if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) { + if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) { throw 'pixiv RSS is disabled due to the lack of relevant config'; } diff --git a/lib/routes/pixiv/search.js b/lib/routes/pixiv/search.js index 50915d146..7abfaa165 100644 --- a/lib/routes/pixiv/search.js +++ b/lib/routes/pixiv/search.js @@ -4,7 +4,7 @@ const searchIllust = require('./api/searchIllust'); const config = require('@/config'); module.exports = async (ctx) => { - if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) { + if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) { throw 'pixiv RSS is disabled due to the lack of relevant config'; } diff --git a/lib/routes/pixiv/token.js b/lib/routes/pixiv/token.js index b44dd2829..2b81d5924 100644 --- a/lib/routes/pixiv/token.js +++ b/lib/routes/pixiv/token.js @@ -10,8 +10,8 @@ const pixivConfig = config.pixiv; let token = null; const authorizationInfo = { - client_id: pixivConfig.client_id, - client_secret: pixivConfig.client_secret, + client_id: 'MOBrBDS8blbauoSck0ZfDbtuzpyT', + client_secret: 'lsACyCD94FhDUtGTXi3QzcFE2uU1hqtDaKeqrdwj', username: pixivConfig.username, password: pixivConfig.password, }; @@ -94,7 +94,7 @@ async function tokenLoop() { } } -if (config.pixiv && config.pixiv.client_id && config.pixiv.client_secret && config.pixiv.username && config.pixiv.password) { +if (config.pixiv && config.pixiv.username && config.pixiv.password) { tokenLoop(); } diff --git a/lib/routes/pixiv/user.js b/lib/routes/pixiv/user.js index d54f6ea7b..09ef08e10 100644 --- a/lib/routes/pixiv/user.js +++ b/lib/routes/pixiv/user.js @@ -3,7 +3,7 @@ const getIllusts = require('./api/getIllusts'); const config = require('@/config'); module.exports = async (ctx) => { - if (!config.pixiv || !config.pixiv.client_id || !config.pixiv.client_secret || !config.pixiv.username || !config.pixiv.password) { + if (!config.pixiv || !config.pixiv.username || !config.pixiv.password) { throw 'pixiv RSS is disabled due to the lack of relevant config'; }