Cleaned up fediverse embeds.

botwiki · Dec 9, 2022 · a19dacd · a19dacd
1 parent dc9196e
commit a19dacd
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 16 deletions.
diff --git a/functions.php b/functions.php
@@ -207,20 +207,15 @@ function load_social_media_embed_js(){
 
 function load_mastodon_js(){
   global $post;
-  $bot_tweets_html = get_post_meta( $post->ID, 'bot_tweets_html', true );
+  global $helpers;
 
-  $known_mastodon_instances = [
-    'botsin.space',
-    'mastodon.social',
-    'beeping.town',
-    'mastodon.archive.org',
-  ];
+  $bot_tweets_html = get_post_meta( $post->ID, 'bot_tweets_html', true );
+  $known_mastodon_instances = $helpers->get_known_mastodon_instances();
 
   foreach ( $known_mastodon_instances as $instance ){
-    if ( strpos( $bot_tweets_html, $instance ) !== false ){ ?>
-      <script src="https://$instance/embed.js" async="async"></script>
-    <?php
-    break;
+    if ( strpos( $bot_tweets_html, $instance ) !== false ){
+      echo $helpers->get_mastodon_embed_script_tag($instance);
+      break;  
     }
   }
 }

diff --git a/includes/helpers.php b/includes/helpers.php
@@ -295,6 +295,25 @@ function get_screenshotable_url( $urls ){
 
     return $screenshotable_url;
   }
+
+
+  function get_known_mastodon_instances(){
+    // TODO: Move these to a settings page for easier maintanance.
+
+    return [
+      'botsin.space',
+      'mastodon.social',
+      'beeping.town',
+      'fedibot.dev',
+      'mastodon.archive.org',
+    ];
+
+  }
+
+  function get_mastodon_embed_script_tag( $instance ){
+    return '<script src="https://' . $instance . '/embed.js" async="async"></script>';
+  }
+
 }
 
 $helpers = new BW_Helpers();
diff --git a/includes/post-types/bots.php b/includes/post-types/bots.php
@@ -698,11 +698,18 @@ function save_meta( $post_id ) {
               // $data = json_decode($json_post);
               // $bot_tweets_html .= $data->html;
             }
-            elseif ( strpos( $tweet_url, 'botsin.space/' ) !== false ||
-                     strpos( $tweet_url, 'beeping.town/' ) !== false ||
-                     strpos( $tweet_url, 'fedibot.dev/' ) !== false ||
-                     strpos( $tweet_url, 'mastodon.social/' ) !== false ) {
-              $bot_tweets_html .= '<blockquote><iframe src="' . $tweet_url . '/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe></blockquote>';
+            else {
+
+                global $helpers;
+                $known_mastodon_instances = $helpers->get_known_mastodon_instances();
+
+                foreach ( $known_mastodon_instances as $instance ){
+                  if ( strpos( $tweet_url, $instance ) !== false ){
+                    $bot_tweets_html .= '<blockquote><iframe src="' . $tweet_url . '/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe></blockquote>';
+                    break;  
+                  }
+                }
+
             }
           }