Merge pull request 'Fix several warnings' (#1613) from heluecht/friendica-addons:warnings into 2025.07-rc

Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1613
This commit is contained in:
Philipp Holzer 2025-08-07 21:08:38 +02:00
commit 28fcccd9d5
3 changed files with 5 additions and 5 deletions

View file

@ -120,7 +120,7 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
$expressionLanguage = new ExpressionLanguage\ExpressionLanguage(); $expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
} }
$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId(); $uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
if (!$uid) { if (!$uid) {
return; return;
} }

View file

@ -99,7 +99,7 @@ function langfilter_addon_settings_post(array &$b)
function langfilter_prepare_body_content_filter(&$hook_data) function langfilter_prepare_body_content_filter(&$hook_data)
{ {
$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId(); $uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
if (!$uid) { if (!$uid) {
return; return;
} }

View file

@ -104,7 +104,7 @@ function nsfw_addon_settings_post(array &$b)
function nsfw_prepare_body_content_filter(&$hook_data) function nsfw_prepare_body_content_filter(&$hook_data)
{ {
$words = null; $words = null;
$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId(); $uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
if (DI::pConfig()->get($uid, 'nsfw', 'disable')) { if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
return; return;
} }
@ -137,10 +137,10 @@ function nsfw_prepare_body_content_filter(&$hook_data)
break; break;
case '#': // Hashtag-only search case '#': // Hashtag-only search
$tag_search = true; $tag_search = true;
$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1)); $found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'] ?? [], substr($word, 1));
break; break;
default: default:
$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word); $found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'] ?? [], $word);
break; break;
} }