npm - ghost - Versions diffs - 4.22.3 → 4.25.0 - Mend

ghost 4.22.3 → 4.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (230) hide show

package/core/server/services/mega/mega.js CHANGED Viewed

@@ -131,7 +131,7 @@ const transformEmailRecipientFilter = (emailRecipientFilter, {errorProperty = 'e
     // `paid` and `free` were swapped out for NQL filters in 4.5.0, we shouldn't see them here now
     case 'paid':
     case 'free':
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.unexpectedFilterError, {
                 property: errorProperty,
                 value: emailRecipientFilter
@@ -140,7 +140,7 @@ const transformEmailRecipientFilter = (emailRecipientFilter, {errorProperty = 'e
     case 'all':
         return 'subscribed:true';
     case 'none':
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             message: tpl(messages.noneFilterError, {
                 property: errorProperty
             })
@@ -352,7 +352,7 @@ async function sendEmailJob({emailModel, options}) {
             error: errorMessage
         }, {patch: true});
-        throw new errors.GhostError({
+        throw new errors.InternalServerError({
             err: error,
             context: tpl(messages.sendEmailRequestFailed)
         });
@@ -416,7 +416,9 @@ function partitionMembersBySegment(memberRows, segments) {
             segmentedMemberRows = memberRows.filter(member => member.status !== 'free');
             memberRows = memberRows.filter(member => member.status === 'free');
         } else {
-            throw new errors.ValidationError(tpl(messages.invalidSegment));
+            throw new errors.ValidationError({
+                message: tpl(messages.invalidSegment)
+            });
         }
         partitions[memberSegment] = segmentedMemberRows;

package/core/server/services/mega/post-email-serializer.js CHANGED Viewed

@@ -3,7 +3,6 @@ const template = require('./template');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const moment = require('moment-timezone');
-const cheerio = require('cheerio');
 const api = require('../../api');
 const {URL} = require('url');
 const mobiledocLib = require('../../lib/mobiledoc');
@@ -24,6 +23,8 @@ const formatHtmlForEmail = function formatHtmlForEmail(html) {
     // convert juiced HTML to a DOM-like interface for further manipulation
     // happens after inlining of CSS so we can change element types without worrying about styling
+    const cheerio = require('cheerio');
     const _cheerio = cheerio.load(juicedHtml);
     // force all links to open in new tab
@@ -243,6 +244,7 @@ const serialize = async (postModel, options = {isBrowserPreview: false, apiVersi
     // perform any email specific adjustments to the mobiledoc->HTML render output
     // body wrapper is required so we can get proper top-level selections
+    const cheerio = require('cheerio');
     let _cheerio = cheerio.load(`<body>${post.html}</body>`);
     // remove leading/trailing HRs
     _cheerio(`
@@ -311,6 +313,8 @@ const serialize = async (postModel, options = {isBrowserPreview: false, apiVersi
 };
 function renderEmailForSegment(email, memberSegment) {
+    const cheerio = require('cheerio');
     const result = {...email};
     const $ = cheerio.load(result.html);

package/core/server/services/mega/segment-parser.js CHANGED Viewed

@@ -1,6 +1,5 @@
-const cheerio = require('cheerio');
 const getSegmentsFromHtml = (html) => {
+    const cheerio = require('cheerio');
     const $ = cheerio.load(html);
     const allSegments = $('[data-gh-segment]')

package/core/server/services/mega/template.js CHANGED Viewed

@@ -544,60 +544,75 @@ figure blockquote p {
     border-width: 0.8em 0 0.8em 1.5em;
 }
-a.kg-nft-card {
+.kg-nft-link {
+    display: block;
+    text-decoration: none !important;
+    color: #15212A !important;
+    font-family: inherit !important;
+    font-size: 14px;
+    line-height: 1.3em;
+    padding-top: 4px;
+    padding-right: 20px;
+    padding-left: 20px;
+    padding-bottom: 4px;
+}
+.kg-callout-card {
     display: flex;
-    flex-direction: column;
-    color: #15212A;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
-    font-size: 15px;
-    text-decoration: none;
+    margin: 0 0 1.5em 0;
+    padding: 20px 28px;
     border-radius: 3px;
-    border: 1px solid #e5eff5;
-    width: 100%;
-    max-width: 512px;
-    color: #222;
+}
+.kg-callout-card p {
+    margin: 0
+}
+.kg-callout-card-grey {
+    background: #eef0f2;
+}
+.kg-callout-card-white {
     background: #fff;
-    margin: 0 auto;
+    box-shadow: inset 0 0 0 1px #dddedf;
 }
-.kg-nft-metadata {
-    padding: 20px;
+.kg-callout-card-blue {
+    background: #E9F6FB;
 }
-.kg-nft-image {
-    border-radius: 2px 2px 0 0;
+.kg-callout-card-green {
+    background: #E8F8EA;
 }
-.kg-nft-header {
-    display: flex;
-    justify-content: space-between;
-    gap: 20px;
+.kg-callout-card-yellow {
+    background: #FCF4E3;
 }
-.kg-nft-title {
-    font-family: inherit;
-    font-size: 19px;
-    font-weight: 700;
-    margin: 0;
-    color: #222;
+.kg-callout-card-red {
+    background: #FBE9E9;
 }
-.kg-nft-creator {
-    font-family: inherit;
-    margin: 4px 0 0;
-    color: #ababab;
+.kg-callout-card-pink {
+    background: #FCEEF8;
 }
-.kg-nft-creator-name {
-    font-weight: 500;
-    color: #222;
+.kg-callout-card-purple {
+    background: #F2EDFC;
 }
-.kg-nft-description {
-    font-family: inherit;
-    line-height: 1.4em;
-    margin: 12px 0 0;
-    color: #222;
+.kg-callout-card-accent {
+    background: ${templateSettings.accentColor || '#15212A'};
+    color: #fff;
+}
+.kg-callout-card-accent a {
+    color: #fff;
+}
+.kg-callout-emoji {
+    padding-right: 12px;
+    font-size: 20px;
 }
 /* -------------------------------------

package/core/server/services/members/api.js CHANGED Viewed

@@ -6,6 +6,7 @@ const mail = require('../mail');
 const models = require('../../models');
 const signinEmail = require('./emails/signin');
 const signupEmail = require('./emails/signup');
+const signupPaidEmail = require('./emails/signup-paid');
 const subscribeEmail = require('./emails/subscribe');
 const updateEmail = require('./emails/updateEmail');
 const SingleUseTokenProvider = require('./SingleUseTokenProvider');
@@ -49,6 +50,8 @@ function createApiInstance(config) {
                     return `📫 Confirm your subscription to ${siteTitle}`;
                 case 'signup':
                     return `🙌 Complete your sign up to ${siteTitle}!`;
+                case 'signup-paid':
+                    return `🙌 Thank you for signing up to ${siteTitle}!`;
                 case 'updateEmail':
                     return `📫 Confirm your email update for ${siteTitle}!`;
                 case 'signin':
@@ -93,6 +96,23 @@ function createApiInstance(config) {
                         Sent to ${email}
                         If you did not make this request, you can simply delete this message. You will not be signed up, and no account will be created for you.
                         `;
+                case 'signup-paid':
+                    return `
+                        Thank you for subscribing to ${siteTitle}!
+                        Tap the link below to be automatically signed in:
+                        ${url}
+                        For your security, the link will expire in 24 hours time.
+                        See you soon!
+                        ---
+                        Sent to ${email}
+                        Thank you for subscribing to ${siteTitle}!
+                        `;
                 case 'updateEmail':
                     return `
                             Hey there,
@@ -139,6 +159,8 @@ function createApiInstance(config) {
                     return subscribeEmail({url, email, siteTitle, accentColor, siteDomain, siteUrl});
                 case 'signup':
                     return signupEmail({url, email, siteTitle, accentColor, siteDomain, siteUrl});
+                case 'signup-paid':
+                    return signupPaidEmail({url, email, siteTitle, accentColor, siteDomain, siteUrl});
                 case 'updateEmail':
                     return updateEmail({url, email, siteTitle, accentColor, siteDomain, siteUrl});
                 case 'signin':

package/core/server/services/members/config.js CHANGED Viewed

@@ -98,7 +98,7 @@ class MembersConfigProvider {
      */
     getStripeKeys(type) {
         if (type !== 'direct' && type !== 'connect') {
-            throw new errors.IncorrectUsageError(tpl(messages.incorrectKeyType));
+            throw new errors.IncorrectUsageError({message: tpl(messages.incorrectKeyType)});
         }
         const secretKey = this._settingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}secret_key`);

package/core/server/services/members/emails/signup-paid.js ADDED Viewed

@@ -0,0 +1,168 @@
+module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, siteUrl}) => `
+<!doctype html>
+   <html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>🙌 Thank you for signing up to ${siteTitle}!</title>
+    <style>
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+      table[class=body] h1 {
+        font-size: 28px !important;
+        margin-bottom: 10px !important;
+      }
+      table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+        font-size: 16px !important;
+      }
+      table[class=body] .wrapper,
+            table[class=body] .article {
+        padding: 10px !important;
+      }
+      table[class=body] .content {
+        padding: 0 !important;
+      }
+      table[class=body] .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+      table[class=body] .main {
+        border-left-width: 0 !important;
+        border-radius: 0 !important;
+        border-right-width: 0 !important;
+      }
+      table[class=body] .btn table {
+        width: 100% !important;
+      }
+      table[class=body] .btn a {
+        width: 100% !important;
+      }
+      table[class=body] .img-responsive {
+        height: auto !important;
+        max-width: 100% !important;
+        width: auto !important;
+      }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+        line-height: 100%;
+      }
+      .recipient-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+    }
+    hr {
+      border-width: 0;
+      height: 0;
+      margin-top: 34px;
+      margin-bottom: 34px;
+      border-bottom-width: 1px;
+      border-bottom-color: #EEF5F8;
+    }
+    a {
+      color: #3A464C;
+    }
+    </style>
+  </head>
+  <body class="" style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;">
+      <tr>
+        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>
+        <td class="container" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;">
+          <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;">
+            <!-- START CENTERED WHITE CONTAINER -->
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Complete signup for ${siteTitle}!</span>
+            <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
+                  <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    <tr>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Thank you for subscribing to ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 32px;">Tap the link below to be automatically signed in:</p>
+                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; padding-bottom: 35px;">
+                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                  <tbody>
+                                    <tr>
+                                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; background-color: ${accentColor}; border-radius: 5px; text-align: center;"> <a href="${url}" target="_blank" style="display: inline-block; color: #ffffff; background-color: ${accentColor}; border: solid 1px ${accentColor}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: ${accentColor};">Confirm signup</a> </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!</p>
+                        <hr/>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top: 0; color: #3A464C;">${url}</p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <!-- START FOOTER -->
+              <tr>
+                <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;">
+                  <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="${siteUrl}" style="text-decoration: underline; color: #738A94; font-size: 11px;">${siteDomain}</a> to <a class="small" href="mailto:${email}" style="text-decoration: underline; color: #738A94; font-size: 11px;">${email}</a></p>
+                </td>
+              </tr>
+              <!-- END FOOTER -->
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+          <!-- END CENTERED WHITE CONTAINER -->
+          </div>
+        </td>
+        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
+`;

package/core/server/services/members/service.js CHANGED Viewed

@@ -159,12 +159,16 @@ const membersService = {
             }
             if (stripeService.api.configured && stripeService.api.mode === 'live') {
-                throw new errors.IncorrectUsageError(tpl(messages.noLiveKeysInDevelopment));
+                throw new errors.IncorrectUsageError({
+                    message: tpl(messages.noLiveKeysInDevelopment)
+                });
             }
         } else {
             const siteUrl = urlUtils.getSiteUrl();
             if (!/^https/.test(siteUrl) && stripeService.api.configured) {
-                throw new errors.IncorrectUsageError(tpl(messages.sslRequiredForStripe));
+                throw new errors.IncorrectUsageError({
+                    message: tpl(messages.sslRequiredForStripe)
+                });
             }
         }
         if (!membersApi) {

package/core/server/services/members/stripe-connect.js CHANGED Viewed

@@ -63,7 +63,7 @@ async function getStripeConnectTokenData(encodedData, getSessionProp) {
     const state = await getSessionProp(STATE_PROP);
     if (state !== data.s) {
-        throw new errors.NoPermissionError(tpl(messages.incorrectState));
+        throw new errors.NoPermissionError({message: tpl(messages.incorrectState)});
     }
     return {
@@ -81,7 +81,9 @@ function checkCanConnect() {
     const siteUrlUsingSSL = /^https/.test(siteUrl);
     const cannotConnectToStripe = productionMode && !siteUrlUsingSSL;
     if (cannotConnectToStripe) {
-        throw new errors.BadRequestError('Cannot connect to stripe unless site is using https://');
+        throw new errors.BadRequestError({
+            message: 'Cannot connect to stripe unless site is using https://'
+        });
     }
 }

package/core/server/services/nft-oembed.js CHANGED Viewed

@@ -28,42 +28,33 @@ class NFTOEmbedProvider {
      * @param {URL} url
      * @param {IExternalRequest} externalRequest
      *
-     * @returns {Promise<import('oembed-parser').RichTypeData & Object<string, any>>}
+     * @returns {Promise<object>}
      */
     async getOEmbedData(url, externalRequest) {
         const [match, transaction, asset] = url.pathname.match(OPENSEA_PATH_REGEX);
         if (!match) {
             return null;
         }
-        const result = await externalRequest(`https://api.opensea.io/api/v1/asset/${transaction}/${asset}/`, {
-            json: true
+        const headers = {};
+        if (this.dependencies.config.apiKey) {
+            headers['X-API-KEY'] = this.dependencies.config.apiKey;
+        }
+        const result = await externalRequest(`https://api.opensea.io/api/v1/asset/${transaction}/${asset}/?format=json`, {
+            json: true,
+            headers
         });
         return {
             version: '1.0',
-            type: 'rich',
+            type: 'nft',
             title: result.body.name,
             author_name: result.body.creator.user.username,
             author_url: `https://opensea.io/${result.body.creator.user.username}`,
             provider_name: 'OpenSea',
             provider_url: 'https://opensea.io',
-            html: `
-            <a href="${result.body.permalink}" class="kg-nft-card">
-                <img class="kg-nft-image" src="${result.body.image_url}">
-                <div class="kg-nft-metadata">
-                    <div class="kg-nft-header">
-                        <h4 class="kg-nft-title"> ${result.body.name} </h4>
-                    </div>
-                    <div class="kg-nft-creator">
-                        Created by <span class="kg-nft-creator-name">${result.body.creator.user.username}</span>
-                        ${(result.body.collection.name ? `&bull; ${result.body.collection.name}` : ``)}
-                    </div>
-                    ${(result.body.description ? `<p class="kg-nft-description">${result.body.description}</p>` : ``)}
-                </div>
-            </a>
-            `,
-            width: 1000,
-            height: 1000,
-            noIframe: true
+            image_url: result.body.image_url,
+            creator_name: result.body.creator.user.username,
+            description: result.body.description,
+            collection_name: result.body.collection.name
         };
     }
 }

package/core/server/services/oembed.js CHANGED Viewed

@@ -1,5 +1,6 @@
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
+const logging = require('@tryghost/logging');
 const {extract, hasProvider} = require('oembed-parser');
 const cheerio = require('cheerio');
 const _ = require('lodash');
@@ -62,6 +63,7 @@ class OEmbed {
      */
     constructor({config, externalRequest}) {
         this.config = config;
         /** @type {IExternalRequest} */
         this.externalRequest = async (url, requestConfig) => {
             if (this.isIpOrLocalhost(url)) {
@@ -73,6 +75,7 @@ class OEmbed {
             }
             return response;
         };
         /** @type {ICustomProvider[]} */
         this.customProviders = [];
     }
@@ -107,24 +110,6 @@ class OEmbed {
         }
     }
-    /**
-     * @param {string} url
-     */
-    errorHandler(url) {
-        /**
-         * @param {Error|errors.GhostError} err
-         */
-        return async (err) => {
-            // allow specific validation errors through for better error messages
-            if (errors.utils.isIgnitionError(err) && err.errorType === 'ValidationError') {
-                throw err;
-            }
-            // default to unknown provider to avoid leaking any app specifics
-            return this.unknownProvider(url);
-        };
-    }
     async fetchBookmarkData(url) {
         const metascraper = require('metascraper')([
             require('metascraper-url')(),
@@ -296,10 +281,13 @@ class OEmbed {
      * @returns {Promise<Object>}
      */
     async fetchOembedDataFromUrl(url, type) {
-        let data;
         try {
             const urlObject = new URL(url);
+            // Trimming solves the difference of url validation between `new URL(url)`
+            // and metascraper.
+            url = url.trim();
             for (const provider of this.customProviders) {
                 if (await provider.canSupportRequest(urlObject)) {
                     const result = await provider.getOEmbedData(urlObject, this.externalRequest);
@@ -309,23 +297,39 @@ class OEmbed {
                 }
             }
+            // fetch only bookmark when explicitly requested
             if (type === 'bookmark') {
                 return this.fetchBookmarkData(url);
             }
-            data = await this.fetchOembedData(url);
+            // attempt to fetch oembed
+            let data = await this.fetchOembedData(url);
+            // fallback to bookmark when we can't get oembed
             if (!data && !type) {
                 data = await this.fetchBookmarkData(url);
             }
+            // couldn't get anything, throw a validation error
             if (!data) {
-                data = await this.unknownProvider(url);
+                return this.unknownProvider(url);
             }
             return data;
-        } catch (e) {
-            return this.errorHandler(url);
+        } catch (err) {
+            // allow specific validation errors through for better error messages
+            if (errors.utils.isGhostError(err) && err.errorType === 'ValidationError') {
+                throw err;
+            }
+            // log the real error because we're going to throw a generic "Unknown provider" error
+            logging.error(new errors.InternalServerError({
+                message: 'Encountered error when fetching oembed',
+                err
+            }));
+            // default to unknown provider to avoid leaking any app specifics
+            return this.unknownProvider(url);
         }
     }
 }

package/core/server/services/permissions/can-this.js CHANGED Viewed

@@ -128,7 +128,7 @@ CanThisResult.prototype.beginCheck = function (context) {
     context = parseContext(context);
     if (actionsMap.empty()) {
-        throw new errors.GhostError({message: tpl(messages.noActionsMapFoundError)});
+        throw new errors.InternalServerError({message: tpl(messages.noActionsMapFoundError)});
     }
     // Kick off loading of user permissions if necessary

package/core/server/services/public-config/config.js CHANGED Viewed

@@ -17,7 +17,7 @@ module.exports = function getConfigProperties() {
         mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun,
         emailAnalytics: config.get('emailAnalytics'),
         hostSettings: config.get('hostSettings'),
-        tenorApiKey: config.get('tenorApiKey')
+        tenor: config.get('tenor')
     };
     const billingUrl = config.get('hostSettings:billing:enabled') ? config.get('hostSettings:billing:url') : '';