GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[StoreRemoteMedia] Implement the first version of it in v3

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2021-08-12 00:39:36 +01:00
committed by Hugo Sales
parent 63cbf4052f
commit bac18715c5
3 changed files with 130 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entity/RemoteURL.php
View File

@@ -22,6 +22,7 @@ namespace App\Entity;
use App\Core\DB\DB;
use App\Core\Entity;
use App\Core\Event;
use App\Core\GSFile;
use App\Core\HTTPClient;
use App\Util\Common;
use App\Util\Exception\DuplicateFoundException;
@@ -137,7 +138,7 @@ class RemoteURL extends Entity
$head = HTTPClient::head($url);
// This must come before getInfo given that Symfony HTTPClient is lazy (thus forcing curl exec)
$headers = $head->getHeaders();
$url = $head->getInfo('url'); // The last effective url (after getHeaders so it follows redirects)
$url = $head->getInfo('url'); // The last effective url (after getHeaders, so it follows redirects)
$url_hash = hash(self::URLHASH_ALGO, $url);
try {
return DB::findOneBy('remoteurl', ['remote_url_hash' => $url_hash]);
@@ -149,7 +150,7 @@ class RemoteURL extends Entity
'mimetype' => $headers['content-type'][0],
]);
DB::persist($remoteurl);
Event::handle('RemoteURLStoreNew', [&$remoteurl]);
Event::handle('RemoteURLStoredNew', [&$remoteurl]);
return $remoteurl;
}
} else {

18
src/Entity/RemoteURLToNote.php
View File

@@ -19,7 +19,9 @@
namespace App\Entity;
use App\Core\DB\DB;
use App\Core\Entity;
use App\Core\Event;
use DateTimeInterface;
/**
@@ -73,6 +75,22 @@ class RemoteURLToNote extends Entity
return $this->modified;
}
/**
* Create an instance of RemoteURLToNote or fill in the
* properties of $obj with the associative array $args. Doesn't
* persist the result
*
* @param null|mixed $obj
*/
public static function create(array $args, $obj = null)
{
$remoteURL = DB::find('remoteurl', ['id' => $args['remoteurl_id']]);
$note = DB::find('note', ['id' => $args['note_id']]);
Event::handle('NewRemoteURLFromNote', [$remoteURL, $note]);
$obj = new self();
return parent::create($args, $obj);
}
// @codeCoverageIgnoreEnd
// }}} Autocode