friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify image url

pull/13107/head
Michael 2023-05-17 20:30:45 +00:00
parent 7c266be206
commit 1010443031
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Content/Text/HTML.php
View File

@ -24,7 +24,6 @@ namespace Friendica\Content\Text;
use DOMDocument; use DOMDocument;
use DOMXPath; use DOMXPath;
use Friendica\Protocol\HTTP\MediaType; use Friendica\Protocol\HTTP\MediaType;
use Friendica\Content\Widget\ContactBlock;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Search; use Friendica\Core\Search;

2
src/Model/Post/Media.php
View File

@ -1004,7 +1004,7 @@ class Media
} }
if ($media['type'] == self::IMAGE) { if ($media['type'] == self::IMAGE) {
$body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description']); $body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description'] ?? '');
} elseif ($media['type'] == self::AUDIO) { } elseif ($media['type'] == self::AUDIO) {
$body .= "\n[audio]" . $media['url'] . "[/audio]\n"; $body .= "\n[audio]" . $media['url'] . "[/audio]\n";
} elseif ($media['type'] == self::VIDEO) { } elseif ($media['type'] == self::VIDEO) {

2
src/Module/Media/Photo/Upload.php
View File

@ -179,7 +179,7 @@ class Upload extends \Friendica\BaseModule
} }
$this->logger->info('upload done'); $this->logger->info('upload done');
$this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n"); $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n");
} }
/** /**

16
src/Util/Images.php
View File

@ -327,7 +327,7 @@ class Images
* @param string $description * @param string $description
* @return string * @return string
*/ */
public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = null): string public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string
{ {
return self::getBBCodeByUrl( return self::getBBCodeByUrl(
DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id, DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
@ -344,20 +344,12 @@ class Images
* @param string $description * @param string $description
* @return string * @return string
*/ */
public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string
{ {
if (!empty($preview)) { if (!empty($preview)) {
if (!is_null($description)) { return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]';
return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]';
} else {
return '[url=' . $photo . '][img]' . $preview . '[/img][/url]';
}
} }
if (!is_null($description)) { return '[img=' . $photo . ']' . $description . '[/img]';
return '[img=' . $photo . ']' . $description . '[/img]';
} else {
return '[img]' . $photo . '[/img]';
}
} }
} }