doesnm/ligh7hau5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(archive): add title to response

Browse source
This commit is contained in:
vulet 2020-07-03 22:16:41 +08:00
parent 2d714943e7
commit 59afdde7d4
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
commands/archive.js
View file

@ -1,5 +1,6 @@
const qs = require('qs'); const qs = require('qs');
const axios = require('axios'); const axios = require('axios');
const { JSDOM } = require('jsdom');
const registrar = require('../registrar.js'); const registrar = require('../registrar.js');
const sleep = ms => new Promise(r => setTimeout(r, ms)); const sleep = ms => new Promise(r => setTimeout(r, ms));
@ -36,9 +37,10 @@ const archive = async (instance, url, rearchive) => {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
data: qs.stringify({ anyway: rearchive ? '1' : undefined, submitid: submitId ? submitId[1] : undefined, url }) data: qs.stringify({ anyway: rearchive ? '1' : undefined, submitid: submitId ? submitId[1] : undefined, url })
}); });
submit.title = new JSDOM(submit.data).window.document.title;
if (submit.statusText !== 'OK') throw submit; if (submit.statusText !== 'OK') throw submit;
if (submit.request.path !== '/submit/') if (submit.request.path !== '/submit/')
return { id: submit.request.path, date: submit.headers['memento-datetime'] }; return { id: submit.request.path, date: submit.headers['memento-datetime'], title: submit.title };
if (submit.headers.refresh) if (submit.headers.refresh)
return { refresh: submit.headers.refresh.split(';url=')[1] }; return { refresh: submit.headers.refresh.split(';url=')[1] };
throw submit; throw submit;
@ -46,7 +48,7 @@ const archive = async (instance, url, rearchive) => {
const reqStr = str => `<em>Sending archive request for <code>${str}</code></em>`; const reqStr = str => `<em>Sending archive request for <code>${str}</code></em>`;
const arc1Str = str => `<em>Archiving page <code>${str}</code></em>`; const arc1Str = str => `<em>Archiving page <code>${str}</code></em>`;
const arc2Str = (str, date) => `<em>Archived page <code>${str}</code> [${date}]</em>`; const arc2Str = (str, title, date) => `<em>Archived page <code><a href="https://${str}">${str}</code> [${date}]</em><br /><b>${title}</b>`;
const arc3Str = str => `<em>Timed out <code>${str}</code></em>`; const arc3Str = str => `<em>Timed out <code>${str}</code></em>`;
const run = async (matrixClient, { roomId }, userInput, rearchive, registrar) => { const run = async (matrixClient, { roomId }, userInput, rearchive, registrar) => {
@ -57,12 +59,13 @@ const run = async (matrixClient, { roomId }, userInput, rearchive, registrar) =>
transformResponse: [], transformResponse: [],
timeout: 10 * 1000 timeout: 10 * 1000
}); });
let reply = null; let reply = null;
try { try {
reply = await matrixClient.sendHtmlNotice(roomId, '', reqStr(userInput)); reply = await matrixClient.sendHtmlNotice(roomId, '', reqStr(userInput));
const { refresh, id, date } = await archive(instance, userInput, rearchive); const { refresh, id, title, date } = await archive(instance, userInput, rearchive);
if (id) if (id)
return await editNoticeHTML(matrixClient, roomId, reply, arc2Str(`${config.domain}${id}`, date)); return await editNoticeHTML(matrixClient, roomId, reply, arc2Str(`${config.domain}${id}`, title, date));
if (refresh) { if (refresh) {
const path = refresh.split(`https://${config.domain}`); const path = refresh.split(`https://${config.domain}`);
if (!path[1]) throw refresh; if (!path[1]) throw refresh;
@ -70,10 +73,13 @@ const run = async (matrixClient, { roomId }, userInput, rearchive, registrar) =>
let tries = 30; let tries = 30;
while (tries--) { while (tries--) {
await sleep(10000); await sleep(10000);
const { request: { path: reqPath }, headers: { 'memento-datetime': date } } = await instance({ method: 'HEAD', url: path[1] }) const { title, date } = await archive(instance, userInput);
if (rearchive == false && title !== undefined)
return await editNoticeHTML(matrixClient, roomId, reply, arc2Str(`${config.domain}`, title, date));
const { request: { path: reqPath }, headers: { 'memento-datetime': rearchiveDate } } = await instance({ method: 'HEAD', url: path[1] })
.catch(e => ({ request: { path: path[1] } })); .catch(e => ({ request: { path: path[1] } }));
if (reqPath !== path[1]) if (rearchive == true && reqPath !== path[1])
return await editNoticeHTML(matrixClient, roomId, reply, arc2Str(`${config.domain}${reqPath}`, date)); return await editNoticeHTML(matrixClient, roomId, reply, arc2Str(`${config.domain}${reqPath}`, title, rearchiveDate));
} }
return await editNoticeHTML(matrixClient, roomId, reply, arc3Str(refresh)); return await editNoticeHTML(matrixClient, roomId, reply, arc3Str(refresh));
} }
@ -85,6 +91,7 @@ const run = async (matrixClient, { roomId }, userInput, rearchive, registrar) =>
else else
matrixClient.sendHtmlNotice(roomId, 'sad', sad).catch(() => {}); matrixClient.sendHtmlNotice(roomId, 'sad', sad).catch(() => {});
} }
} };
exports.runQuery = run; exports.runQuery = run;