diff --git a/commands/nitter.js b/commands/nitter.js index e302ea0..8fd17e0 100644 --- a/commands/nitter.js +++ b/commands/nitter.js @@ -10,17 +10,27 @@ const nitter = async (instance, url) => { const req = await instance({ method: 'GET', url }); if (req.statusText !== 'OK') throw req; const dom = new JSDOM(req.data); - const tweet = dom.window.document.querySelector('#m'); + const document = dom.window.document; + const tweet = document.querySelector('#m'); const stats = tweet.querySelectorAll('.tweet-body > .tweet-stats .icon-container'); - const quote = tweet.querySelector('.tweet-body > .quote a.quote-link'); + const quote = tweet.querySelector('.tweet-body > .quote'); + const isReply = tweet.querySelector('.tweet-body > .replying-to'); + const replies = document.querySelectorAll('.main-thread > .before-tweet > .timeline-item'); return { text: tweet.querySelector('.tweet-body > .tweet-content').innerHTML, date: tweet.querySelector('.tweet-body > .tweet-published').textContent, name: tweet.querySelector('.tweet-body > div .fullname').textContent, handle: tweet.querySelector('.tweet-body > div .username').textContent, hasAttachments: !!tweet.querySelector('.tweet-body > .attachments'), - quote: quote ? quote.href : null, - stats: { + quote: quote ? { + path: quote.querySelector('a.quote-link').href, + text: quote.querySelector('.quote-text').innerHTML, + } : null, + isReply: isReply && replies.length > 0 ? { + path: replies[replies.length - 1].querySelector('a.tweet-link').href, + text: replies[replies.length - 1].querySelector('.tweet-content').innerHTML, + } : null, + stats: { replies: stats[0].textContent.trim(), retweets: stats[1].textContent.trim(), favorites: stats[2].textContent.trim() @@ -36,8 +46,8 @@ const card = (tweet, base, path) => `❤️ ${tweet.stats.favorites} ` + `
${tweet.text.replace('\n', '
')}
` + (tweet.hasAttachments ? '
This tweet has attached media.
' : '') + -(tweet.quote ? `
Quoted Tweet
` : ''); - +(tweet.isReply ? `
Replied Tweet
${tweet.isReply.text.replace('\n', '
')}
` : '') + +(tweet.quote ? `
Quoted Tweet
${tweet.quote.text.replace('\n', '
')}
` : ''); const run = async (matrixClient, { roomId }, userInput, registrar) => { const config = registrar.config.nitter; const instance = axios.create({ @@ -49,7 +59,7 @@ const run = async (matrixClient, { roomId }, userInput, registrar) => { const tweet = await nitter(instance, userInput); return await matrixClient.sendHtmlNotice(roomId, '', card(tweet, `https://${config.domain}`, userInput)); } - + exports.runQuery = async (client, room, userInput, registrar) => { try { const url = new URL(userInput);