Make the info available if the avatar was uploaded or generated
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
3e0668e348
commit
decd196162
|
@ -132,12 +132,13 @@ class AvatarController extends Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$avatar = $this->avatarManager->getAvatar($userId)->getFile($size);
|
$avatar = $this->avatarManager->getAvatar($userId);
|
||||||
|
$avatarFile = $avatar->getFile($size);
|
||||||
$resp = new FileDisplayResponse(
|
$resp = new FileDisplayResponse(
|
||||||
$avatar,
|
$avatarFile,
|
||||||
Http::STATUS_OK,
|
$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
|
||||||
['Content-Type' => $avatar->getMimeType()
|
['Content-Type' => $avatarFile->getMimeType()]
|
||||||
]);
|
);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$resp = new Http\Response();
|
$resp = new Http\Response();
|
||||||
$resp->setStatus(Http::STATUS_NOT_FOUND);
|
$resp->setStatus(Http::STATUS_NOT_FOUND);
|
||||||
|
|
|
@ -119,6 +119,15 @@ class Avatar implements IAvatar {
|
||||||
return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
|
return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the avatar of a user is a custom uploaded one
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isCustomAvatar(): bool {
|
||||||
|
return !$this->folder->fileExists('generated');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sets the users avatar
|
* sets the users avatar
|
||||||
* @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
|
* @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
|
||||||
|
@ -362,7 +371,7 @@ class Avatar implements IAvatar {
|
||||||
* @param string $font font path
|
* @param string $font font path
|
||||||
* @param int $size font size
|
* @param int $size font size
|
||||||
* @param int $angle
|
* @param int $angle
|
||||||
* @return Array
|
* @return array
|
||||||
*/
|
*/
|
||||||
protected function imageTTFCenter($image, string $text, string $font, int $size, $angle = 0): array {
|
protected function imageTTFCenter($image, string $text, string $font, int $size, $angle = 0): array {
|
||||||
// Image width & height
|
// Image width & height
|
||||||
|
|
|
@ -53,6 +53,14 @@ interface IAvatar {
|
||||||
*/
|
*/
|
||||||
public function exists();
|
public function exists();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the avatar of a user is a custom uploaded one
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function isCustomAvatar(): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sets the users avatar
|
* sets the users avatar
|
||||||
* @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
|
* @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
|
||||||
|
|
Loading…
Reference in New Issue