Fix the detection of image posts
This commit is contained in:
parent
d7d44e1af7
commit
7d0ebe8bbe
1 changed files with 8 additions and 4 deletions
|
@ -251,8 +251,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) {
|
if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) {
|
||||||
if ((count($pictures) == 1) && !$has_title) {
|
if ((count($pictures) == 1) && !$has_title) {
|
||||||
|
if (!empty($item['object-type']) && ($item['object-type'] == ACTIVITY_OBJ_IMAGE)) {
|
||||||
|
$data = ['url' => $pictures[0][1], 'type' => 'photo'];
|
||||||
|
} else {
|
||||||
// Checking, if the link goes to a picture
|
// Checking, if the link goes to a picture
|
||||||
$data = ParseUrl::getSiteinfoCached($pictures[0][1], true);
|
$data = ParseUrl::getSiteinfoCached($pictures[0][1], true);
|
||||||
|
}
|
||||||
|
|
||||||
// Workaround:
|
// Workaround:
|
||||||
// Sometimes photo posts to the own album are not detected at the start.
|
// Sometimes photo posts to the own album are not detected at the start.
|
||||||
|
@ -271,14 +275,14 @@ class BBCode extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
$post["preview"] = $pictures[0][2];
|
$post["preview"] = $pictures[0][2];
|
||||||
$post["text"] = str_replace($pictures[0][0], "", $body);
|
$post["text"] = trim(str_replace($pictures[0][0], "", $body));
|
||||||
} else {
|
} else {
|
||||||
$imgdata = Image::getInfoFromURL($pictures[0][1]);
|
$imgdata = Image::getInfoFromURL($pictures[0][1]);
|
||||||
if ($imgdata && substr($imgdata["mime"], 0, 6) == "image/") {
|
if ($imgdata && substr($imgdata["mime"], 0, 6) == "image/") {
|
||||||
$post["type"] = "photo";
|
$post["type"] = "photo";
|
||||||
$post["image"] = $pictures[0][1];
|
$post["image"] = $pictures[0][1];
|
||||||
$post["preview"] = $pictures[0][2];
|
$post["preview"] = $pictures[0][2];
|
||||||
$post["text"] = str_replace($pictures[0][0], "", $body);
|
$post["text"] = trim(str_replace($pictures[0][0], "", $body));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif (count($pictures) > 0) {
|
} elseif (count($pictures) > 0) {
|
||||||
|
|
Loading…
Reference in a new issue