use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\Post;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Util\Images;
use Friendica\Util\Network;
// Workaround for systems that can't handle a HEAD request
if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() == 405)) {
- $curlResult = DI::httpClient()->get($media['url'], [HttpClientOptions::TIMEOUT => $timeout]);
+ $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::DEFAULT, [HttpClientOptions::TIMEOUT => $timeout]);
}
if ($curlResult->isSuccess()) {
$condition = DBA::mergeConditions($condition, ['type' => $types]);
}
- return DBA::selectToArray('post-media', [], $condition);
+ return DBA::selectToArray('post-media', [], $condition, ['order' => ['id']]);
}
/**
* @param int $uri_id
* @param string $guid
* @param array $links list of links that shouldn't be added
+ * @param bool $has_media
* @return array attachments
*/
- public static function splitAttachments(int $uri_id, string $guid = '', array $links = [])
+ public static function splitAttachments(int $uri_id, string $guid = '', array $links = [], bool $has_media = true)
{
$attachments = ['visual' => [], 'link' => [], 'additional' => []];
+ if (!$has_media) {
+ return $attachments;
+ }
+
$media = self::getByURIId($uri_id);
if (empty($media)) {
return $attachments;