diff --git a/packages/api/src/routers/article_router.ts b/packages/api/src/routers/article_router.ts
index 5891c025f..f54222b36 100644
--- a/packages/api/src/routers/article_router.ts
+++ b/packages/api/src/routers/article_router.ts
@@ -28,6 +28,7 @@ interface SpeechInput {
voice?: string
secondaryVoice?: string
priority?: 'low' | 'high'
+ language?: string
}
const outputFormats = ['mp3', 'speech-marks', 'speech']
const logger = buildLogger('app.dispatch')
@@ -85,7 +86,8 @@ export function articleRouter() {
async (req, res) => {
const articleId = req.params.id
const outputFormat = req.params.outputFormat
- const { voice, priority, secondaryVoice } = req.query as SpeechInput
+ const { voice, priority, secondaryVoice, language } =
+ req.query as SpeechInput
if (!articleId || outputFormats.indexOf(outputFormat) === -1) {
return res.status(400).send('Invalid data')
}
@@ -117,7 +119,7 @@ export function articleRouter() {
options: {
primaryVoice: voice,
secondaryVoice: secondaryVoice,
- language: page.language,
+ language: language || page.language,
},
})
return res.send({ ...speechFile, pageId: articleId })
diff --git a/packages/content-fetch/package.json b/packages/content-fetch/package.json
index b8d02d063..f58675a74 100644
--- a/packages/content-fetch/package.json
+++ b/packages/content-fetch/package.json
@@ -10,7 +10,8 @@
"jsonwebtoken": "^8.5.1",
"linkedom": "^0.14.9",
"luxon": "^2.3.1",
- "puppeteer-core": "^16.1.0"
+ "puppeteer-core": "^16.1.0",
+ "underscore": "^1.13.4"
},
"scripts": {
"start": "node app.js",
diff --git a/packages/content-fetch/twitter-handler.js b/packages/content-fetch/twitter-handler.js
index 99bab6661..7ae93072c 100644
--- a/packages/content-fetch/twitter-handler.js
+++ b/packages/content-fetch/twitter-handler.js
@@ -6,6 +6,7 @@
require('dotenv').config();
const axios = require('axios');
const { DateTime } = require('luxon');
+const _ = require('underscore');
const TWITTER_BEARER_TOKEN = process.env.TWITTER_BEARER_TOKEN;
const TWITTER_URL_MATCH = /twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)(?:\/.*)?/
@@ -116,7 +117,8 @@ exports.twitterHandler = {
const tweetData = (await getTweetById(tweetId)).data;
const authorId = tweetData.data.author_id;
const author = tweetData.includes.users.filter(u => u.id = authorId)[0];
- const title = titleForAuthor(author)
+ // escape html entities in title
+ const title = _.escape(titleForAuthor(author))
const authorImage = author.profile_image_url.replace('_normal', '_400x400')
let text = tweetData.data.text;
@@ -157,7 +159,7 @@ exports.twitterHandler = {
-
+
${front}
diff --git a/packages/content-fetch/youtube-handler.js b/packages/content-fetch/youtube-handler.js
index 179e4614f..e1866428a 100644
--- a/packages/content-fetch/youtube-handler.js
+++ b/packages/content-fetch/youtube-handler.js
@@ -5,6 +5,7 @@
/* eslint-disable @typescript-eslint/no-require-imports */
require('dotenv').config();
const axios = require('axios');
+const _ = require('underscore');
const YOUTUBE_URL_MATCH =
/^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w-]+\?v=|embed\/|v\/)?)([\w-]+)(\S+)?$/
@@ -36,11 +37,13 @@ exports.youtubeHandler = {
const oembedUrl = `https://www.youtube.com/oembed?format=json&url=` + encodeURIComponent(`https://www.youtube.com/watch?v=${videoId}`)
const oembed = (await axios.get(oembedUrl.toString())).data;
- const title = oembed.title;
+ // escape html entities in title
+ const title = _.escape(oembed.title);
const ratio = oembed.width / oembed.height;
const thumbnail = oembed.thumbnail_url;
const height = 350;
const width = height * ratio;
+ const authorName = _.escape(oembed.author_name);
const content = `
@@ -49,12 +52,12 @@ exports.youtubeHandler = {
-
+
${title}
- By ${oembed.author_name}
+ By ${authorName}
`
diff --git a/packages/puppeteer-parse/package.json b/packages/puppeteer-parse/package.json
index ff4de5e8b..11e60b00d 100644
--- a/packages/puppeteer-parse/package.json
+++ b/packages/puppeteer-parse/package.json
@@ -14,6 +14,7 @@
"linkedom": "^0.14.9",
"luxon": "^2.3.1",
"puppeteer-core": "^16.1.0",
+ "underscore": "^1.13.4",
"winston": "^3.3.3"
},
"devDependencies": {
diff --git a/packages/puppeteer-parse/twitter-handler.js b/packages/puppeteer-parse/twitter-handler.js
index 99bab6661..fe68e4782 100644
--- a/packages/puppeteer-parse/twitter-handler.js
+++ b/packages/puppeteer-parse/twitter-handler.js
@@ -6,6 +6,7 @@
require('dotenv').config();
const axios = require('axios');
const { DateTime } = require('luxon');
+const _ = require("underscore");
const TWITTER_BEARER_TOKEN = process.env.TWITTER_BEARER_TOKEN;
const TWITTER_URL_MATCH = /twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)(?:\/.*)?/
@@ -116,7 +117,7 @@ exports.twitterHandler = {
const tweetData = (await getTweetById(tweetId)).data;
const authorId = tweetData.data.author_id;
const author = tweetData.includes.users.filter(u => u.id = authorId)[0];
- const title = titleForAuthor(author)
+ const title = _.escape(titleForAuthor(author))
const authorImage = author.profile_image_url.replace('_normal', '_400x400')
let text = tweetData.data.text;
@@ -157,7 +158,7 @@ exports.twitterHandler = {
-
+
${front}
diff --git a/packages/puppeteer-parse/youtube-handler.js b/packages/puppeteer-parse/youtube-handler.js
index 179e4614f..68dfc5af6 100644
--- a/packages/puppeteer-parse/youtube-handler.js
+++ b/packages/puppeteer-parse/youtube-handler.js
@@ -5,6 +5,7 @@
/* eslint-disable @typescript-eslint/no-require-imports */
require('dotenv').config();
const axios = require('axios');
+const _ = require("underscore");
const YOUTUBE_URL_MATCH =
/^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w-]+\?v=|embed\/|v\/)?)([\w-]+)(\S+)?$/
@@ -36,11 +37,12 @@ exports.youtubeHandler = {
const oembedUrl = `https://www.youtube.com/oembed?format=json&url=` + encodeURIComponent(`https://www.youtube.com/watch?v=${videoId}`)
const oembed = (await axios.get(oembedUrl.toString())).data;
- const title = oembed.title;
+ const title = _.escape(oembed.title);
const ratio = oembed.width / oembed.height;
const thumbnail = oembed.thumbnail_url;
const height = 350;
const width = height * ratio;
+ const authorName = _.escape(oembed.author_name);
const content = `
@@ -49,12 +51,12 @@ exports.youtubeHandler = {
-
+
${title}
- By ${oembed.author_name}
+ By ${authorName}
`
diff --git a/packages/web/styles/articleInnerStyling.css b/packages/web/styles/articleInnerStyling.css
index 43cdbc11c..7b9681644 100644
--- a/packages/web/styles/articleInnerStyling.css
+++ b/packages/web/styles/articleInnerStyling.css
@@ -309,7 +309,6 @@ on smaller screens we display the note icon
direction: ltr;
unicode-bidi: embed;
color: var(--font-color);
- max-width: -moz-fit-content;
margin: 0;
overflow-x: auto;
word-wrap: normal;