mirror/php-rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-10-25 13:36:08 +02:00
Code Issues Releases Wiki Activity

[GitlabIssueBridge] No warnings on missing authors

Browse Source 
Avoid warnings by not accessing author properties when author is null.

This also removes all HTML from the author field.
This commit is contained in:
Mynacol
2025-09-05 16:07:00 +00:00
parent 430ffb4f44
commit 2571530633
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bridges/GitlabIssueBridge.php
View File

@@ -128,9 +128,10 @@ class GitlabIssueBridge extends BridgeAbstract
// TODO fix invalid timestamps (fdroid bot)
$item['timestamp'] = $comment->created_at ?? $comment->updated_at ?? $comment->last_edited_at;
$author = $comment->author ?? $comment->last_edited_by;
$item['author'] = '<img src="' . $author->avatar_url . '" width=24></img> <a href="https://' .
$this->getInput('h') . $author->path . '">' . $author->name . ' @' . $author->username . '</a>';
$author = $comment->author ?? $comment->last_edited_by ?? null;
if ($author !== null) {
$item['author'] = $author->name . ' @' . $author->username;
}
$content = '';
if ($comment->system) {
@@ -151,7 +152,11 @@ class GitlabIssueBridge extends BridgeAbstract
$content = $comment->note_html;
}
}
$item['title'] = $author->name . " $content";
if ($author !== null) {
$item['title'] = $author->name . ' ';
}
$item['title'] .= $content;
$content = $this->fixImgSrc($comment->note_html);
$item['content'] = defaultLinkTo($content, 'https://' . $this->getInput('h') . '/');
@@ -227,9 +232,14 @@ class GitlabIssueBridge extends BridgeAbstract
$authors = $description_html->find('.issuable-meta a.author-link, .merge-request a.author-link');
$editors = $description_html->find('.edited-text a.author-link');
if ($authors === [] && $editors === []) {
return null;
}
$authors = array_map(fn($author): string => $author->plaintext, $authors);
$editors = array_map(fn($author): string => $author->plaintext, $editors);
$author_str = implode(' ', $authors);
if ($editors) {
$author_str .= ', ' . implode(' ', $editors);