wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-09 11:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CORL-1185] translate error from iframe embeds (#3026)

Browse Source 
* translate error from iframe embeds

* use transtlate function for iframe error message

* fix import order

* Fix typo in translation key

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Tessa Thornton
2020-07-16 18:45:03 +00:00
committed by GitHub
co-authored by kodiakhq[bot]
parent e7f395190d
commit f26ab60398
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/server/app/handlers/api/oembed/oembed.ts
+24 -22
View File
@@ -1,21 +1,12 @@
import Joi from "@hapi/joi";
import { AppOptions } from "coral-server/app";
import { validate } from "coral-server/app/request/body";
import { supportsMediaType } from "coral-server/models/tenant";
import { translate } from "coral-server/services/i18n";
import { fetchOEmbedResponse } from "coral-server/services/oembed";
import { RequestHandler } from "coral-server/types/express";
const createNotFoundMessage = (type: "twitter" | "youtube") => {
switch (type) {
case "twitter":
return "Tweet could not be found. Perhaps it was deleted?";
case "youtube":
return "YouTube video could not be found. Perhaps it was deleted?";
default:
throw new Error(`invalid type provided: ${type}`);
}
};
const OEmbedQuerySchema = Joi.object().keys({
url: Joi.string().uri().required(),
type: Joi.string().allow("twitter", "youtube").only(),
@@ -28,7 +19,9 @@ interface OEmbedQuery {
maxWidth?: number;
}
export const oembedHandler = (): RequestHandler => {
export type OembedHandler = Pick<AppOptions, "i18n">;
export const oembedHandler = ({ i18n }: OembedHandler): RequestHandler => {
// TODO: add some kind of rate limiting or spam protection
return async (req, res, next) => {
// Tenant is guaranteed at this point.
@@ -46,14 +39,31 @@ export const oembedHandler = (): RequestHandler => {
return;
}
// Get the oEmbed response.
let style = `
body {
margin: 0;
font-family: sans-serif;
}
.container * {
margin: 0!important;
}
`;
const response = await fetchOEmbedResponse(type, url, maxWidth);
if (response === null || !response.html) {
const bundle = i18n.getBundle(tenant.locale);
const message = translate(
bundle,
"Requested media could not be found",
"common-embedNotFound"
);
res.status(404);
res.send(
`<html>
<style>
${style}
</style>
<body>
${createNotFoundMessage(type)}
${message}
</body>
<html>`
);
@@ -63,14 +73,6 @@ export const oembedHandler = (): RequestHandler => {
const { width, height, html } = response;
// Compile the style to be used for the embed.
let style = `
body {
margin: 0;
}
.container * {
margin: 0!important;
}
`;
if (width && height) {
style += `
.container {
src/core/server/app/router/api/index.ts
+1 -1
View File
@@ -54,7 +54,7 @@ export function createAPIRouter(app: AppOptions, options: RouterOptions) {
router.use("/account", createNewAccountRouter(app, options));
router.use("/user", createNewUserRouter(app));
router.get("/oembed", cspSiteMiddleware(app), oembedHandler());
router.get("/oembed", cspSiteMiddleware(app), oembedHandler(app));
// Configure the GraphQL route.
router.use(
src/locales/en-US/common.ftl
+2
View File
@@ -5,3 +5,5 @@ common-banEmailTemplate =
Hello { $username },
Someone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, react or report comments.
common-embedNotFound = Requested media could not be found. May have been deleted.