haheute/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request 'Bluesky: fix problems with links and hashtags' (#1470) from heluecht/friendica-addons:bluesky-tags into 2024.03-rc

Browse source 
Reviewed-on: friendica/friendica-addons#1470
This commit is contained in:
Tobias Diekershoff 2024-03-01 07:44:23 +01:00
parent bdc27184fc 7580054394
commit 9168f3d167
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bluesky/bluesky.php
View file

@ -764,7 +764,7 @@ function bluesky_get_urls(string $body): array
if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) { if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
foreach ($matches as $match) { foreach ($matches as $match) {
$text = '#' . $match[2]; $text = '#' . $match[2];
$urls[] = ['tag' => $match[2], 'text' => $text, 'hash' => $text]; $urls[strpos($body, $match[0])] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
$body = str_replace($match[0], $text, $body); $body = str_replace($match[0], $text, $body);
} }
} }
@ -774,7 +774,7 @@ function bluesky_get_urls(string $body): array
foreach ($matches as $match) { foreach ($matches as $match) {
$text = Strings::getStyledURL($match[1]); $text = Strings::getStyledURL($match[1]);
$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text)); $hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash]; $urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
$body = str_replace($match[0], $hash, $body); $body = str_replace($match[0], $hash, $body);
} }
} }
@ -789,17 +789,19 @@ function bluesky_get_urls(string $body): array
} }
if (mb_strlen($text) < 100) { if (mb_strlen($text) < 100) {
$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text)); $hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash]; $urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
$body = str_replace($match[0], $hash, $body); $body = str_replace($match[0], $hash, $body);
} else { } else {
$text = Strings::getStyledURL($match[1]); $text = Strings::getStyledURL($match[1]);
$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text)); $hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash]; $urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
$body = str_replace($match[0], $text . ' ' . $hash, $body); $body = str_replace($match[0], $text . ' ' . $hash, $body);
} }
} }
} }
asort($urls);
return ['body' => $body, 'urls' => $urls]; return ['body' => $body, 'urls' => $urls];
} }