aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Articles.php2
-rw-r--r--Zotlabs/Module/Channel.php16
-rw-r--r--include/opengraph.php123
3 files changed, 75 insertions, 66 deletions
diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
index e3ad54be8..2c43b4764 100644
--- a/Zotlabs/Module/Articles.php
+++ b/Zotlabs/Module/Articles.php
@@ -211,7 +211,7 @@ class Articles extends Controller {
}
// Add Opengraph markup
- opengraph_add_meta(((! empty($items)) ? $r[0] : array()), App::$profile);
+ opengraph_add_meta((! empty($items) ? $r[0] : []), $channel);
$mode = 'articles';
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 3f617fd18..6034bd7da 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -110,8 +110,20 @@ class Channel extends Controller {
// Run profile_load() here to make sure the theme is set before
// we start loading content
-
profile_load($which,$profile);
+
+ // Add Opengraph markup
+ $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
+ if(strpos($mid,'b64.') === 0)
+ $mid = @base64url_decode(substr($mid,4));
+
+ if($mid)
+ $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
+ dbesc($mid),
+ intval($channel['channel_id'])
+ );
+
+ opengraph_add_meta($r ? $r[0] : [], $channel);
}
function get($update = 0, $load = false) {
@@ -376,7 +388,7 @@ class Channel extends Controller {
}
// Add Opengraph markup
- opengraph_add_meta((isset($decoded) && (! empty($items)) ? $r[0] : array()), App::$profile);
+ opengraph_add_meta((! empty($items) ? $r[0] : array()), App::$profile);
if((! $update) && (! $load)) {
diff --git a/include/opengraph.php b/include/opengraph.php
index 9de021d54..4c88570d3 100644
--- a/include/opengraph.php
+++ b/include/opengraph.php
@@ -3,73 +3,70 @@
* @file include/opengraph.php
* @brief Add Opengraph metadata and related functions.
*/
-
-
+
+
/**
* @brief Adds Opengraph meta tags into HTML head
*
* @param array $item
- * @param array $profile
+ * @param array $channel
*
*/
-
- function opengraph_add_meta($item, $profile) {
-
- if(! empty($item)) {
-
- if(! empty($item['title']))
- $ogtitle = $item['title'];
-
- // 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);
- }
-
- // use summary as description if exist
- $ogdesc = (empty($item['summary']) ? $item['body'] : $item['summary'] );
-
- $ogdesc = str_replace("#^[", "[", $ogdesc);
-
- $ogdesc = bbcode($ogdesc, [ 'tryoembed' => false ]);
- $ogdesc = trim(html2plain($ogdesc, 0, true));
- $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
-
- // remove all URLs
- $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
-
- // shorten description
- $ogdesc = substr($ogdesc, 0, 300);
- $ogdesc = str_replace("\n", " ", $ogdesc);
- while (strpos($ogdesc, " ") !== false)
- $ogdesc = str_replace(" ", " ", $ogdesc);
- $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
-
- $ogtype = "article";
- }
-
- $channel = channelx_by_n($profile['profile_uid']);
-
- if(! isset($ogdesc)) {
- if($profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
- $ogdesc = $profile['about'];
- }
- else {
- $ogdesc = sprintf( t('This is the home page of %s.'), $channel['channel_name']);
- }
- }
-
- 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="' . $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";
-
- return true;
+
+ function opengraph_add_meta($item, $channel) {
+
+ if(! empty($item)) {
+
+ if(! empty($item['title']))
+ $ogtitle = $item['title'];
+
+ // 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);
+ }
+
+ // use summary as description if exist
+ $ogdesc = (empty($item['summary']) ? $item['body'] : $item['summary'] );
+
+ $ogdesc = str_replace("#^[", "[", $ogdesc);
+
+ $ogdesc = bbcode($ogdesc, [ 'tryoembed' => false ]);
+ $ogdesc = trim(html2plain($ogdesc, 0, true));
+ $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
+
+ // remove all URLs
+ $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
+
+ // shorten description
+ $ogdesc = substr($ogdesc, 0, 300);
+ $ogdesc = str_replace("\n", " ", $ogdesc);
+ while (strpos($ogdesc, " ") !== false)
+ $ogdesc = str_replace(" ", " ", $ogdesc);
+ $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
+
+ $ogtype = "article";
+ }
+
+ if(! isset($ogdesc)) {
+ if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
+ $ogdesc = App::$profile['about'];
+ }
+ else {
+ $ogdesc = sprintf( t('This is the home page of %s.'), $channel['channel_name']);
+ }
+ }
+
+ 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="' . $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";
+
+ return true;
}
- \ No newline at end of file