From d778c3cf1992c51bf394308a944961fc863fb4be Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Tue, 15 Oct 2019 14:03:41 +0200
Subject: Better Opengraph image type detection

---
 include/opengraph.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/opengraph.php b/include/opengraph.php
index 2d72ffca1..5360468eb 100644
--- a/include/opengraph.php
+++ b/include/opengraph.php
@@ -21,8 +21,10 @@
 			$ogtitle = $item['title'];
 
 		// find first image if exist
-		if(preg_match("/\[[zi]mg(=[0-9]+x[0-9]+)?\]([^\[]+)/is", $item['body'], $matches))
+		if(preg_match("/\[[zi]mg(=[0-9]+x[0-9]+)?\]([^\[]+)/is", $item['body'], $matches)) {
 			$ogimage = $matches[2];
+		    $ogimagetype = guess_image_type($ogimage);	
+		}
 
 		// use summary as description if exist
 		$ogdesc = (empty($item['summary']) ? $item['body'] : $item['summary'] );
@@ -57,12 +59,14 @@
 		}
 	}
 	
-	if(! isset($ogimage))
+	if(! isset($ogimage)) {
 		$ogimage = $channel['xchan_photo_l'];
+	    $ogimagetype = $channel['xchan_photo_mimetype'];
+	}
 
 	App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars((isset($ogtitle) ? $ogtitle : $channel['channel_name'])) . '">' . "\r\n";
 	App::$page['htmlhead'] .= '<meta property="og:image" content="' . $ogimage . '">' . "\r\n";
-	App::$page['htmlhead'] .= '<meta property="og:image:type" content="' . guess_image_type($ogimage) . '">' . "\r\n";
+	App::$page['htmlhead'] .= '<meta property="og:image:type" content="' . $ogimagetype . '">' . "\r\n";
 	App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars($ogdesc) . '">' . 	"\r\n";
 	App::$page['htmlhead'] .= '<meta property="og:type" content="' . (isset($ogtype) ? $ogtype : "profile") . '">' . "\r\n";
 
-- 
cgit v1.2.3


From 1a56ecaa393f9cd307c0fc883b6f2d8a17a07718 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Tue, 15 Oct 2019 14:04:24 +0200
Subject: Update opengraph.php

---
 include/opengraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/opengraph.php b/include/opengraph.php
index 5360468eb..ba97d4f4f 100644
--- a/include/opengraph.php
+++ b/include/opengraph.php
@@ -23,7 +23,7 @@
 		// find first image if exist
 		if(preg_match("/\[[zi]mg(=[0-9]+x[0-9]+)?\]([^\[]+)/is", $item['body'], $matches)) {
 			$ogimage = $matches[2];
-		    $ogimagetype = guess_image_type($ogimage);	
+			$ogimagetype = guess_image_type($ogimage);	
 		}
 
 		// use summary as description if exist
@@ -61,7 +61,7 @@
 	
 	if(! isset($ogimage)) {
 		$ogimage = $channel['xchan_photo_l'];
-	    $ogimagetype = $channel['xchan_photo_mimetype'];
+		$ogimagetype = $channel['xchan_photo_mimetype'];
 	}
 
 	App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars((isset($ogtitle) ? $ogtitle : $channel['channel_name'])) . '">' . "\r\n";
-- 
cgit v1.2.3