*/
public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string
{
- $media = self::fetchAdditionalData(['type' => self::DOCUMENT, 'url' => $href,
- 'size' => $length, 'mimetype' => $type, 'description' => $title]);
+ $media = self::fetchAdditionalData([
+ 'type' => self::DOCUMENT, 'url' => $href,
+ 'size' => $length, 'mimetype' => $type, 'description' => $title
+ ]);
return '[attach]href="' . $media['url'] . '" length="' . $media['size'] .
'" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]';
return $media;
}
- if (!empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) &&
- parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)) {
+ if (
+ !empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) &&
+ parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)
+ ) {
Logger::debug('Not a link to an activity', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]);
return $media;
}
*/
private static function isPictureLink(string $page, string $preview): bool
{
- return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-1\.#ism', $preview);
+ return (preg_match('#/photo/.*-0\.#ism', $page) || preg_match('#/photos/.*/image/#ism', $page)) && preg_match('#/photo/.*-[01]\.#ism', $preview);
}
/**
$attachments = [];
if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]$endmatchpattern#ism", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
- if (!self::isPictureLink($picture[1], $picture[2])) {
- continue;
+ if (self::isPictureLink($picture[1], $picture[2])) {
+ $body = str_replace($picture[0], '', $body);
+ $image = str_replace('-1.', '-0.', $picture[2]);
+ $attachments[$image] = [
+ 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
+ 'preview' => $picture[2], 'description' => $picture[3]
+ ];
+ } else {
+ $body = str_replace($picture[0], '', $body);
+ $attachments[$picture[1]] = [
+ 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1],
+ 'preview' => $picture[2], 'description' => $picture[3]
+ ];
}
- $body = str_replace($picture[0], '', $body);
- $image = str_replace('-1.', '-0.', $picture[2]);
- $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
- 'preview' => $picture[2], 'description' => $picture[3]];
}
}
if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]$endmatchpattern#ism", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
- if (!self::isPictureLink($picture[1], $picture[2])) {
- continue;
+ if (self::isPictureLink($picture[1], $picture[2])) {
+ $body = str_replace($picture[0], '', $body);
+ $image = str_replace('-1.', '-0.', $picture[2]);
+ $attachments[$image] = [
+ 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
+ 'preview' => $picture[2], 'description' => null
+ ];
+ } else {
+ $body = str_replace($picture[0], '', $body);
+ $attachments[$picture[1]] = [
+ 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1],
+ 'preview' => $picture[2], 'description' => null
+ ];
}
- $body = str_replace($picture[0], '', $body);
- $image = str_replace('-1.', '-0.', $picture[2]);
- $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
- 'preview' => $picture[2], 'description' => null];
}
}
return $body;
}
+ /**
+ * Remove media from the body
+ *
+ * @param string $body
+ * @return string
+ */
+ public static function removeFromBody(string $body): string
+ {
+ do {
+ $prebody = $body;
+ $body = self::insertFromBody(0, $body);
+ } while ($prebody != $body);
+ return $body;
+ }
+
/**
* Add media links from a relevant url in the body
*
public static function insertFromAttachmentData(int $uriid, string $body)
{
$data = BBCode::getAttachmentData($body);
- if (empty($data)) {
+ if (empty($data)) {
return;
}
continue;
}
- if (in_array($medium['type'], [self::AUDIO, self::IMAGE]) ||
- in_array($filetype, ['audio', 'image'])) {
+ if (
+ in_array($medium['type'], [self::AUDIO, self::IMAGE]) ||
+ in_array($filetype, ['audio', 'image'])
+ ) {
$attachments['visual'][] = $medium;
} elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) {
if (!empty($medium['height'])) {
if ($media['type'] == self::IMAGE) {
if (!empty($media['preview'])) {
if (!empty($media['description'])) {
- $body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] .'[/img][/url]';
+ $body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] . '[/img][/url]';
} else {
- $body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] .'[/img][/url]';
+ $body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] . '[/img][/url]';
}
} else {
if (!empty($media['description'])) {
- $body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
+ $body .= "\n[img=" . $media['url'] . ']' . $media['description'] . '[/img]';
} else {
- $body .= "\n[img]" . $media['url'] .'[/img]';
+ $body .= "\n[img]" . $media['url'] . '[/img]';
}
}
} elseif ($media['type'] == self::AUDIO) {