1 files changed, 13 insertions, 8 deletions

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 27f7ad2de..296b9e7d7 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -6,6 +6,7 @@ import UserStore from '../stores/user_store.jsx';
 import * as Utils from '../utils/utils.jsx';
 import * as Emoji from '../utils/emoticons.jsx';
 import Constants from '../utils/constants.jsx';
+const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES;
 import * as TextFormatting from '../utils/text_formatting.jsx';
 import twemoji from 'twemoji';
 import PostBodyAdditionalContent from './post_body_additional_content.jsx';
@@ -109,11 +110,14 @@ export default class PostBody extends React.Component {
 
         const trimmedLink = link.trim();
 
-        if (this.checkForOembedContent(trimmedLink)) {
-            post.props.oEmbedLink = trimmedLink;
-            post.type = 'oEmbed';
-            this.setState({post});
-            return '';
+        if (Utils.isFeatureEnabled(PreReleaseFeatures.EMBED_PREVIEW)) {
+            const provider = this.getOembedProvider(trimmedLink);
+            if (provider != null) {
+                post.props.oEmbedLink = trimmedLink;
+                post.type = 'oEmbed';
+                this.setState({post, provider});
+                return '';
+            }
         }
 
         const embed = this.createYoutubeEmbed(link);
@@ -133,15 +137,15 @@ export default class PostBody extends React.Component {
         return null;
     }
 
-    checkForOembedContent(link) {
+    getOembedProvider(link) {
         for (let i = 0; i < providers.length; i++) {
             for (let j = 0; j < providers[i].patterns.length; j++) {
                 if (link.match(providers[i].patterns[j])) {
-                    return true;
+                    return providers[i];
                 }
             }
         }
-        return false;
+        return null;
     }
 
     loadImg(src) {
@@ -399,6 +403,7 @@ export default class PostBody extends React.Component {
                     </div>
                     <PostBodyAdditionalContent
                         post={this.state.post}
+                        provider={this.state.provider}
                     />
                     {fileAttachmentHolder}
                     {this.embed}