'maxheight' => common_config('thumbnail', 'height'),
);
$metadata = oEmbedHelper::getOembedFrom($api, $url, $params);
+
+ // Facebook just gives us javascript in its oembed html,
+ // so use the content of the title element instead
+ if(strpos($url,'https://www.facebook.com/') === 0) {
+ $metadata->html = @$dom->getElementsByTagName('title')->item(0)->nodeValue;
+ }
+
+ // Wordpress sometimes also just gives us javascript, use og:description if it is available
+ $xpath = new DomXpath($dom);
+ $generatorNode = @$xpath->query('//meta[@name="generator"][1]')->item(0);
+ if ($generatorNode instanceof DomElement) {
+ // when wordpress only gives us javascript, the html stripped from tags
+ // is the same as the title, so this helps us to identify this (common) case
+ if(strpos($generatorNode->getAttribute('content'),'WordPress') === 0
+ && trim(strip_tags($metadata->html)) == trim($metadata->title)) {
+ $propertyNode = @$xpath->query('//meta[@property="og:description"][1]')->item(0);
+ if ($propertyNode instanceof DomElement) {
+ $metadata->html = $propertyNode->getAttribute('content');
+ }
+ }
+ }
} catch (Exception $e) {
common_log(LOG_INFO, 'Could not find an oEmbed endpoint using link headers, trying OpenGraph from HTML.');
// Just ignore it!
$metadata = OpenGraphHelper::ogFromHtml($dom);
}
+
+ if (isset($metadata->thumbnail_url)) {
+ // sometimes sites serve the path, not the full URL, for images
+ // let's "be liberal in what you accept from others"!
+ // add protocol and host if the thumbnail_url starts with /
+ if(substr($metadata->thumbnail_url,0,1) == '/') {
+ $thumbnail_url_parsed = parse_url($metadata->url);
+ $metadata->thumbnail_url = $thumbnail_url_parsed['scheme']."://".$thumbnail_url_parsed['host'].$metadata->thumbnail_url;
+ }
+
+ // some wordpress opengraph implementations sometimes return a white blank image
+ // no need for us to save that!
+ if($metadata->thumbnail_url == 'https://s0.wp.com/i/blank.jpg') {
+ unset($metadata->thumbnail_url);
+ }
+ }
+
}
public function onEndShowHeadElements(Action $action)
return true;
}
+ public function onEndShowStylesheets(Action $action) {
+ $action->cssLink($this->path('css/oembed.css'));
+ return true;
+ }
+
/**
* Save embedding information for a File, if applicable.
*
return true;
}
- foreach (array('mimetype', 'url', 'title', 'modified') as $key) {
- if (!empty($oembed->{$key})) {
+ foreach (array('mimetype', 'url', 'title', 'modified', 'width', 'height') as $key) {
+ if (isset($oembed->{$key}) && !empty($oembed->{$key})) {
$enclosure->{$key} = $oembed->{$key};
}
}
return true;
}
+
+ public function onStartShowAttachmentRepresentation(HTMLOutputter $out, File $file)
+ {
+ try {
+ $oembed = File_oembed::getByFile($file);
+ } catch (NoResultException $e) {
+ return true;
+ }
+
+ // Show thumbnail as usual if it's a photo.
+ if ($oembed->type === 'photo') {
+ return true;
+ }
+
+ $out->elementStart('article', ['class'=>'h-entry oembed']);
+ $out->elementStart('header');
+ try {
+ $thumb = $file->getThumbnail(128, 128);
+ $out->element('img', $thumb->getHtmlAttrs(['class'=>'u-photo oembed']));
+ unset($thumb);
+ } catch (Exception $e) {
+ $out->element('div', ['class'=>'error'], $e->getMessage());
+ }
+ $out->elementStart('h5', ['class'=>'p-name oembed']);
+ $out->element('a', ['class'=>'u-url', 'href'=>$file->getUrl()], common_strip_html($oembed->title));
+ $out->elementEnd('h5');
+ $out->elementStart('div', ['class'=>'p-author oembed']);
+ if (!empty($oembed->author_name)) {
+ // TRANS: text before the author name of oEmbed attachment representation
+ // FIXME: The whole "By x from y" should be i18n because of different language constructions.
+ $out->text(_('By '));
+ $attrs = ['class'=>'h-card p-author'];
+ if (!empty($oembed->author_url)) {
+ $attrs['href'] = $oembed->author_url;
+ $tag = 'a';
+ } else {
+ $tag = 'span';
+ }
+ $out->element($tag, $attrs, $oembed->author_name);
+ }
+ if (!empty($oembed->provider)) {
+ // TRANS: text between the oEmbed author name and provider url
+ // FIXME: The whole "By x from y" should be i18n because of different language constructions.
+ $out->text(_(' from '));
+ $attrs = ['class'=>'h-card'];
+ if (!empty($oembed->provider_url)) {
+ $attrs['href'] = $oembed->provider_url;
+ $tag = 'a';
+ } else {
+ $tag = 'span';
+ }
+ $out->element($tag, $attrs, $oembed->provider);
+ }
+ $out->elementEnd('div');
+ $out->elementEnd('header');
+ $out->elementStart('div', ['class'=>'p-summary oembed']);
+ $out->raw(common_purify($oembed->html));
+ $out->elementEnd('div');
+ $out->elementStart('footer');
+ $out->elementEnd('footer');
+ $out->elementEnd('article');
+
+ return false;
+ }
public function onShowUnsupportedAttachmentRepresentation(HTMLOutputter $out, File $file)
{
// the 'photo' type is shown through ordinary means, using StartShowAttachmentRepresentation!
switch ($oembed->type) {
- case 'rich':
case 'video':
case 'link':
if (!empty($oembed->html)
&& (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
- require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
- $config = array(
- 'safe'=>1,
- 'elements'=>'*+object+embed');
- $out->raw(htmLawed($oembed->html,$config));
+ require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
+ $purifier = new HTMLPurifier();
+ // FIXME: do we allow <object> and <embed> here? we did that when we used htmLawed, but I'm not sure anymore...
+ $out->raw($purifier->purify($oembed->html));
}
return false;
break;
// and File_thumbnail tables respectively. If not, we're not going to do anything.
$file_oembed = File_oembed::getByFile($file);
$thumbnail = File_thumbnail::byFile($file);
- } catch (Exception $e) {
+ } catch (NoResultException $e) {
// Not Oembed data, or at least nothing we either can or want to use.
return true;
}
throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)'));
}
+ $ext = File::guessMimeExtension($info['mime']);
+
// We'll trust sha256 (File::FILEHASH_ALG) not to have collision issues any time soon :)
- $filename = hash(File::FILEHASH_ALG, $imgData) . '.' . common_supported_mime_to_ext($info['mime']);
+ $filename = 'oembed-'.hash(File::FILEHASH_ALG, $imgData) . ".{$ext}";
$fullpath = File_thumbnail::path($filename);
// Write the file to disk. Throw Exception on failure
if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) {
$thumbnail->width = $info[0]; // array indexes documented on php.net:
$thumbnail->height = $info[1]; // https://php.net/manual/en/function.getimagesize.php
// Throws exception on failure.
- $thumbnail->updateWithKeys($orig, 'file_id');
+ $thumbnail->updateWithKeys($orig);
}
public function onPluginVersion(array &$versions)
projects / quix0rs-gnu-social.git / blobdiff