mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 09:53:09 +02:00
Resolve #2894
This commit is contained in:
parent
946c706913
commit
2b0a919fb5
6 changed files with 19 additions and 15 deletions
|
@ -62,6 +62,8 @@ export type Source = {
|
|||
*/
|
||||
ghost?: string;
|
||||
|
||||
proxy?: string;
|
||||
|
||||
summalyProxy?: string;
|
||||
|
||||
accesslog?: string;
|
||||
|
|
|
@ -51,6 +51,7 @@ export default class Resolver {
|
|||
|
||||
const object = await request({
|
||||
url: value,
|
||||
proxy: config.proxy,
|
||||
timeout: this.timeout,
|
||||
headers: {
|
||||
'User-Agent': config.user_agent,
|
||||
|
|
|
@ -30,22 +30,20 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
|
|||
.replace('{{limit}}', limit)
|
||||
.replace('{{offset}}', offset);
|
||||
|
||||
request(
|
||||
{
|
||||
url: url,
|
||||
timeout: timeout,
|
||||
json: true,
|
||||
followRedirect: true,
|
||||
followAllRedirects: true
|
||||
},
|
||||
(error: any, response: any, body: any) => {
|
||||
if (!error && response.statusCode == 200) {
|
||||
res(body);
|
||||
} else {
|
||||
res([]);
|
||||
}
|
||||
request({
|
||||
url: url,
|
||||
proxy: config.proxy,
|
||||
timeout: timeout,
|
||||
json: true,
|
||||
followRedirect: true,
|
||||
followAllRedirects: true
|
||||
}, (error: any, response: any, body: any) => {
|
||||
if (!error && response.statusCode == 200) {
|
||||
res(body);
|
||||
} else {
|
||||
res([]);
|
||||
}
|
||||
);
|
||||
});
|
||||
} else {
|
||||
// Get 'limit' parameter
|
||||
const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
|
||||
|
|
|
@ -63,6 +63,7 @@ handler.on('status', event => {
|
|||
// Fetch parent status
|
||||
request({
|
||||
url: `${parent.url}/statuses`,
|
||||
proxy: config.proxy,
|
||||
headers: {
|
||||
'User-Agent': 'misskey'
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ module.exports = async (ctx: Koa.Context) => {
|
|||
try {
|
||||
const summary = config.summalyProxy ? await request.get({
|
||||
url: config.summalyProxy,
|
||||
proxy: config.proxy,
|
||||
qs: {
|
||||
url: ctx.query.url
|
||||
},
|
||||
|
|
|
@ -37,6 +37,7 @@ export default async (url: string, user: IUser, folderId: mongodb.ObjectID = nul
|
|||
const requestUrl = URL.parse(url).pathname.match(/[^\u0021-\u00ff]/) ? encodeURI(url) : url;
|
||||
request({
|
||||
url: requestUrl,
|
||||
proxy: config.proxy,
|
||||
headers: {
|
||||
'User-Agent': config.user_agent
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue