merge opengraph fixes from dev
This commit is contained in:
Mario
parent
8727f12b18
commit
004861fbb7
@ -211,7 +211,7 @@ class Articles extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add Opengraph markup
|
// Add Opengraph markup
|
||||||
opengraph_add_meta(((! empty($items)) ? $r[0] : array()), App::$profile);
|
opengraph_add_meta((! empty($items) ? $r[0] : []), $channel);
|
||||||
|
|
||||||
$mode = 'articles';
|
$mode = 'articles';
|
||||||
|
|
||||||
|
|||||||
@ -110,8 +110,20 @@ class Channel extends Controller {
|
|||||||
|
|
||||||
// Run profile_load() here to make sure the theme is set before
|
// Run profile_load() here to make sure the theme is set before
|
||||||
// we start loading content
|
// we start loading content
|
||||||
|
|
||||||
profile_load($which,$profile);
|
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) {
|
function get($update = 0, $load = false) {
|
||||||
@ -375,9 +387,6 @@ class Channel extends Controller {
|
|||||||
$items = array();
|
$items = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add Opengraph markup
|
|
||||||
opengraph_add_meta((isset($decoded) && (! empty($items)) ? $r[0] : array()), App::$profile);
|
|
||||||
|
|
||||||
if((! $update) && (! $load)) {
|
if((! $update) && (! $load)) {
|
||||||
|
|
||||||
if($decoded)
|
if($decoded)
|
||||||
|
|||||||
@ -3,73 +3,70 @@
|
|||||||
* @file include/opengraph.php
|
* @file include/opengraph.php
|
||||||
* @brief Add Opengraph metadata and related functions.
|
* @brief Add Opengraph metadata and related functions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Adds Opengraph meta tags into HTML head
|
* @brief Adds Opengraph meta tags into HTML head
|
||||||
*
|
*
|
||||||
* @param array $item
|
* @param array $item
|
||||||
* @param array $profile
|
* @param array $channel
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function opengraph_add_meta($item, $profile) {
|
|
||||||
|
|
||||||
if(! empty($item)) {
|
function opengraph_add_meta($item, $channel) {
|
||||||
|
|
||||||
if(! empty($item['title']))
|
if(! empty($item)) {
|
||||||
$ogtitle = $item['title'];
|
|
||||||
|
|
||||||
// find first image if exist
|
if(! empty($item['title']))
|
||||||
if(preg_match("/\[[zi]mg(=[0-9]+x[0-9]+)?\]([^\[]+)/is", $item['body'], $matches)) {
|
$ogtitle = $item['title'];
|
||||||
$ogimage = $matches[2];
|
|
||||||
$ogimagetype = guess_image_type($ogimage);
|
|
||||||
}
|
|
||||||
|
|
||||||
// use summary as description if exist
|
// find first image if exist
|
||||||
$ogdesc = (empty($item['summary']) ? $item['body'] : $item['summary'] );
|
if(preg_match("/\[[zi]mg(=[0-9]+x[0-9]+)?\]([^\[]+)/is", $item['body'], $matches)) {
|
||||||
|
$ogimage = $matches[2];
|
||||||
$ogdesc = str_replace("#^[", "[", $ogdesc);
|
$ogimagetype = guess_image_type($ogimage);
|
||||||
|
}
|
||||||
$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']);
|
// use summary as description if exist
|
||||||
|
$ogdesc = (empty($item['summary']) ? $item['body'] : $item['summary'] );
|
||||||
|
|
||||||
if(! isset($ogdesc)) {
|
$ogdesc = str_replace("#^[", "[", $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";
|
$ogdesc = bbcode($ogdesc, [ 'tryoembed' => false ]);
|
||||||
App::$page['htmlhead'] .= '<meta property="og:image" content="' . $ogimage . '">' . "\r\n";
|
$ogdesc = trim(html2plain($ogdesc, 0, true));
|
||||||
App::$page['htmlhead'] .= '<meta property="og:image:type" content="' . $ogimagetype . '">' . "\r\n";
|
$ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
|
||||||
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;
|
// 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user