Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-31 16:42:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Diaspora: Photos are now transmitted separately

Browse source
This commit is contained in:
Michael 2023-01-07 15:11:34 +00:00
parent 9a1a406c03
commit d86045058e
4 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Module/Photo.php
View file

@ -137,6 +137,18 @@ class Photo extends BaseModule
$scale = intval(substr($photoid, -1, 1));
$photoid = substr($photoid, 0, -2);
}
if (!empty($this->parameters['size'])) {
switch ($this->parameters['size']) {
case 'thumb_small':
$scale = 2;
break;
case 'scaled_full':
$scale = 1;
break;
}
}
$photo = MPhoto::getPhoto($photoid, $scale);
if ($photo === false) {
throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));

1
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1707,6 +1707,7 @@ class Transmitter
$language = self::getLanguage($item);
if (!empty($language)) {
$richbody = BBCode::setMentionsToNicknames($item['body'] ?? '');
$richbody = Post\Media::removeFromEndOfBody($richbody);
if (!empty($item['quote-uri-id'])) {
if ($real_quote) {
$richbody = DI::contentItem()->addShareLink($richbody, $item['quote-uri-id']);

37
src/Protocol/Diaspora.php
View file

@ -3317,8 +3317,10 @@ class Diaspora
$type = 'reshare';
} else {
$item['body'] = Post\Media::removeFromEndOfBody($item['body']);
$title = $item['title'];
$body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
$body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item), [Post\Media::AUDIO, Post\Media::VIDEO]);
// Fetch the title from an attached link - if there is one
if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
@ -3366,6 +3368,8 @@ class Diaspora
'location' => $location
];
$message = self::addPhotos($item, $message);
// Diaspora rejects messages when they contain a location without "lat" or "lng"
if (!isset($location['lat']) || !isset($location['lng'])) {
unset($message['location']);
@ -3400,6 +3404,37 @@ class Diaspora
return $msg;
}
private static function addPhotos(array $item, array $message): array
{
$medias = Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE]);
$public = ($item['private'] == Item::PRIVATE ? 'false' : 'true');
$counter = 0;
foreach ($medias as $media) {
if (Item::containsLink($item['body'], $media['preview'] ?? $media['url'], $media['type'])) {
continue;
}
$name = basename($media['url']);
$path = str_replace($name, '', $media['url']);
$message[++$counter . ':photo'] = [
'guid' => Item::guid(['uri' => $media['url']], false),
'author' => $item['author-addr'],
'public' => $public,
'created_at' => $item['created'],
'remote_photo_path' => $path,
'remote_photo_name' => $name,
'status_message_guid' => $item['guid'],
'height' => $media['height'],
'width' => $media['width'],
'text' => $media['description'],
];
}
return $message;
}
private static function prependParentAuthorMention(string $body, string $profile_url): string
{
$profile = Contact::getByURL($profile_url, false, ['addr', 'name']);

1
static/routes.config.php
View file

@ -554,6 +554,7 @@ return [
'/permission/tooltip/{type}/{id:\d+}' => [Module\PermissionTooltip::class, [R::GET]],
'/photo' => [
'/{size:thumb_small|scaled_full}_{name}' => [Module\Photo::class, [R::GET]],
'/{name}' => [Module\Photo::class, [R::GET]],
'/{type}/{id:\d+}' => [Module\Photo::class, [R::GET]],
'/{type:contact|header}/{guid}' => [Module\Photo::class, [R::GET]],