Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 07:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10807 from annando/emoji-media

Browse source 
Don't store emoji images as media but links
This commit is contained in:
Hypolite Petovan 2021-10-03 05:49:30 -04:00 committed by GitHub
commit cd9caec06b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Model/Post/Link.php
View file

@ -36,6 +36,18 @@ use Friendica\Util\Proxy;
*/
class Link
{
/**
* Check if the link is stored
*
* @param int $uri_id
* @param string $url
* @return bool
*/
public static function exists(int $uri_id, string $url)
{
return DBA::exists('post-link', ['uri-id' => $uri_id, 'url' => $url]);
}
public static function getByLink(int $uri_id, string $url, $size = '')
{
if (empty($uri_id) || empty($url) || Proxy::isLocalImage($url)) {

4
src/Model/Post/Media.php
View file

@ -388,6 +388,10 @@ class Media
}
foreach ($attachments as $attachment) {
if (Post\Link::exists($uriid, $attachment['preview'] ?? $attachment['url'])) {
continue;
}
// Only store attachments that are part of the unshared body
if (Item::containsLink($unshared_body, $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
self::insert($attachment);

8
src/Protocol/ActivityPub/Processor.php
View file

@ -90,7 +90,7 @@ class Processor
*
* @return string with replaced emojis
*/
private static function replaceEmojis($body, array $emojis)
private static function replaceEmojis(int $uri_id, $body, array $emojis)
{
$body = strtr($body,
array_combine(
@ -101,6 +101,10 @@ class Processor
)
);
// We store the emoji here to be able to avoid storing it in the media
foreach ($emojis as $emoji) {
Post\Link::getByLink($uri_id, $emoji['href']);
}
return $body;
}
@ -456,7 +460,7 @@ class Processor
}
if (!empty($activity['emojis'])) {
$content = self::replaceEmojis($content, $activity['emojis']);
$content = self::replaceEmojis($item['uri-id'], $content, $activity['emojis']);
}
$content = self::addMentionLinks($content, $activity['tags']);