friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Merge pull request #1314 from MrPetovan/task/nsfw-case-sensitive

Browse source 
[nsfw] Match regular words with case sensitivity
This commit is contained in:
Tobias Diekershoff 2022-11-18 18:07:24 +01:00 committed by GitHub
parent 174fae82ac ba6f6f11c5
commit e8daa6b97d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nsfw/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-21 19:15-0500\n" "POT-Creation-Date: 2022-11-18 11:57-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -34,7 +34,9 @@ msgid "Comma separated list of keywords to hide"
msgstr "" msgstr ""
#: nsfw.php:67 #: nsfw.php:67
msgid "Use /expression/ to provide regular expressions" msgid ""
"Use /expression/ to provide regular expressions, #tag to specfically match "
"hashtags (case-insensitive), or regular words (case-sensitive)"
msgstr "" msgstr ""
#: nsfw.php:72 #: nsfw.php:72

4
nsfw/nsfw.php
View file

@ -64,7 +64,7 @@ function nsfw_addon_settings(App &$a, array &$data)
$html = Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$info' => DI::l10n()->t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'), '$info' => DI::l10n()->t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'),
'$enabled' => ['nsfw-enable', DI::l10n()->t('Enable Content filter'), $enabled], '$enabled' => ['nsfw-enable', DI::l10n()->t('Enable Content filter'), $enabled],
'$words' => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions')], '$words' => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)')],
]); ]);
$data = [ $data = [
@ -125,7 +125,7 @@ function nsfw_prepare_body_content_filter(App $a, &$hook_data)
$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 = stripos($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;
} }