GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[COMPONENT][Link] Ignore html anchors that include mention class

This commit is contained in:
Diogo Peralta Cordeiro 2021-12-24 17:35:32 +00:00
parent 0d5e545a6e
commit 36483a6ecd
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/Link/Link.php
View File

@ -41,7 +41,8 @@ class Link extends Component
{ {
if (Common::config('attachments', 'process_links')) { if (Common::config('attachments', 'process_links')) {
$matched_urls = []; $matched_urls = [];
preg_match_all($this->getURLRegex(), $content, $matched_urls); // TODO: This solution to ignore mentions when content is in html is far from ideal
preg_match_all($this->getURLRegex(), preg_replace('#<a href="(.*?)" class="u-url mention">#', '', $content), $matched_urls);
$matched_urls = array_unique($matched_urls[1]); $matched_urls = array_unique($matched_urls[1]);
foreach ($matched_urls as $match) { foreach ($matched_urls as $match) {
try { try {

4
plugins/ActivityPub/Util/Model/Note.php
View File

@ -90,7 +90,7 @@ class Note extends Model
{ {
$handleInReplyTo = function (AbstractObject|string $type_note): ?int { $handleInReplyTo = function (AbstractObject|string $type_note): ?int {
try { try {
$parent_note = is_null($type_note->get('inReplyTo')) ? null : ActivityPub::getObjectByUri($type_note->get('inReplyTo'), try_online: true); $parent_note = \is_null($type_note->get('inReplyTo')) ? null : ActivityPub::getObjectByUri($type_note->get('inReplyTo'), try_online: true);
if ($parent_note instanceof \App\Entity\Note) { if ($parent_note instanceof \App\Entity\Note) {
return $parent_note->getId(); return $parent_note->getId();
} elseif ($parent_note instanceof Type\AbstractObject && $parent_note->get('type') === 'Note') { } elseif ($parent_note instanceof Type\AbstractObject && $parent_note->get('type') === 'Note') {
@ -201,7 +201,7 @@ class Note extends Model
Conversation::assignLocalConversation($obj, $reply_to); Conversation::assignLocalConversation($obj, $reply_to);
// Need file and note ids for the next step // Need file and note ids for the next step
Event::handle('ProcessNoteContent', [$obj, $obj->getContent(), $obj->getContentType(), $process_note_content_extra_args = []]); Event::handle('ProcessNoteContent', [$obj, $obj->getRendered(), $obj->getContentType(), $process_note_content_extra_args = []]);
if ($processed_attachments !== []) { if ($processed_attachments !== []) {
foreach ($processed_attachments as [$a, $fname]) { foreach ($processed_attachments as [$a, $fname]) {