Restore using embeds from the API

app/soapbox/components/status-action-bar.tsx

@@ -284,7 +284,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
 
   const handleEmbed = () => {
     dispatch(openModal('EMBED', {
-      status,
+      url: status.get('url'),
       onError: (error: any) => dispatch(showAlertForError(error)),
     }));
   };
@@ -362,11 +362,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
         icon: require('@tabler/icons/link.svg'),
       });
 
-      menu.push({
+      if (features.embeds) {
-        text: intl.formatMessage(messages.embed),
+        menu.push({
-        action: handleEmbed,
+          text: intl.formatMessage(messages.embed),
-        icon: require('@tabler/icons/share.svg'),
+          action: handleEmbed,
-      });
+          icon: require('@tabler/icons/share.svg'),
+        });
+      }
     }
 
     if (!me) {

app/soapbox/features/ui/components/embed_modal.tsx

@@ -1,17 +1,52 @@
-import React from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import api from 'soapbox/api';
 import { Modal, Stack, Text, Input } from 'soapbox/components/ui';
+import { useAppDispatch } from 'soapbox/hooks';
 
-import type { Status } from 'soapbox/types/entities';
+import type { RootState } from 'soapbox/store';
+
+const fetchEmbed = (url: string) => {
+  return (dispatch: any, getState: () => RootState) => {
+    return api(getState).get('/api/oembed', { params: { url } });
+  };
+};
 
 interface IEmbedModal {
-  status: Status,
+  url: string,
+  onError: (error: any) => void,
 }
 
-const EmbedModal: React.FC<IEmbedModal> = ({ status }) => {
+const EmbedModal: React.FC<IEmbedModal> = ({ url, onError }) => {
-  const url = `${location.origin}/embed/${status.id}`;
+  const dispatch = useAppDispatch();
-  const embed = `<iframe src="${url}" width="100%" height="300" frameborder="0" />`;
+
+  const iframe = useRef<HTMLIFrameElement>(null);
+  const [oembed, setOembed] = useState<any>(null);
+
+  useEffect(() => {
+
+    dispatch(fetchEmbed(url)).then(({ data }) => {
+      if (!iframe.current?.contentWindow) return;
+      setOembed(data);
+
+      const iframeDocument = iframe.current.contentWindow.document;
+
+      iframeDocument.open();
+      iframeDocument.write(data.html);
+      iframeDocument.close();
+
+      const innerFrame = iframeDocument.querySelector('iframe');
+
+      iframeDocument.body.style.margin = '0';
+
+      if (innerFrame) {
+        innerFrame.width = '100%';
+      }
+    }).catch(error => {
+      onError(error);
+    });
+  }, [!!iframe.current]);
 
   const handleInputClick: React.MouseEventHandler<HTMLInputElement> = (e) => {
     e.currentTarget.select();
@@ -28,15 +63,21 @@ const EmbedModal: React.FC<IEmbedModal> = ({ status }) => {
           <Input
             type='text'
             readOnly
-            value={embed}
+            value={oembed?.html || ''}
             onClick={handleInputClick}
           />
         </Stack>
 
-        <div dangerouslySetInnerHTML={{ __html: embed }} />
+        <iframe
+          className='inline-flex rounded-xl overflow-hidden max-w-full'
+          frameBorder='0'
+          ref={iframe}
+          sandbox='allow-same-origin'
+          title='preview'
+        />
       </Stack>
     </Modal>
   );
 };
 
-export default EmbedModal;
+export default EmbedModal;

app/soapbox/utils/features.ts

@@ -238,6 +238,12 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     emailList: features.includes('email_list'),
 
+    /**
+     * Ability to embed posts on external sites.
+     * @see GET /api/oembed
+     */
+    embeds: v.software === MASTODON,
+
     /**
      * Ability to add emoji reactions to a status.
      * @see PUT /api/v1/pleroma/statuses/:id/reactions/:emoji