X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nsfw%2Fnsfw.php;h=2ea20b4a92a8063077e0c913d8c37f14e8a7ec05;hb=8a700150cc8c0d430ca2b245618cc3aa4df375c7;hp=2b9c4a22b63c86c034f1ebce1aa6446e531b04d7;hpb=f0b5acc7028c11b2bf75e2a25e5292774a6dbb7b;p=friendica-addons.git
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 2b9c4a22..2ea20b4a 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -1,4 +1,5 @@
') : false);
-
}
if (!$cnt) {
@@ -74,11 +74,11 @@ function nsfw_addon_settings(&$a, &$s)
}
$s .= '';
- $s .= '' . L10n::t('Content Filter (NSFW tag and more)') . '
';
+ $s .= '' . L10n::t('Content Filter (NSFW and more)') . '
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '' . L10n::t('Content Filter (NSFW tag and more)') . '
';
+ $s .= '' . L10n::t('Content Filter (NSFW and more)') . '
';
$s .= '';
$s .= '
';
@@ -87,7 +87,7 @@ function nsfw_addon_settings(&$a, &$s)
$s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
@@ -103,20 +103,15 @@ function nsfw_addon_settings_post(&$a, &$b)
if ($_POST['nsfw-submit']) {
PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
- $enable = (x($_POST,'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
- $disable = 1-$enable;
+ $enable = (x($_POST, 'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
+ $disable = 1 - $enable;
PConfig::set(local_user(), 'nsfw', 'disable', $disable);
info(L10n::t('NSFW Settings saved.') . EOL);
}
}
-function nsfw_prepare_body(&$a, &$b)
+function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data)
{
- // Don't do the check when there is a content warning
- if (!empty($b['item']['content-warning'])) {
- return;
- }
-
$words = null;
if (PConfig::get(local_user(), 'nsfw', 'disable')) {
return;
@@ -125,46 +120,61 @@ function nsfw_prepare_body(&$a, &$b)
if (local_user()) {
$words = PConfig::get(local_user(), 'nsfw', 'words');
}
+
if ($words) {
- $arr = explode(',', $words);
+ $word_list = explode(',', $words);
} else {
- $arr = ['nsfw'];
+ $word_list = ['nsfw'];
}
$found = false;
- if (count($arr)) {
- $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
+ if (count($word_list)) {
+ $body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
- foreach ($arr as $word) {
+ foreach ($word_list as $word) {
$word = trim($word);
if (!strlen($word)) {
continue;
}
- if (strpos($word,'/') === 0) {
- if (preg_match($word, $body)) {
- $found = true;
+
+ $tag_search = false;
+ switch ($word[0]) {
+ case '/'; // Regular expression
+ $found = preg_match($word, $body);
+ break;
+ case '#': // Hashtag-only search
+ $tag_search = true;
+ $found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1));
break;
- }
- } else {
- if (stristr($body, $word)) {
- $found = true;
+ default:
+ $found = stripos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
break;
- }
- if (is_array($b['item']['tags']) && count($b['item']['tags'])) {
- foreach ($b['item']['tags'] as $t) {
- if (stristr($t, '>' . $word . '<')) {
- $found = true;
- break;
- }
- }
- }
+ }
+
+ if ($found) {
+ break;
}
}
}
if ($found) {
- $rnd = random_string(8);
- $b['html'] = '
' . L10n::t('%s - Click to open/close', $word) . '
' . $b['html'] . '
';
+ if ($tag_search) {
+ $hook_data['filter_reasons'][] = L10n::t('Filtered tag: %s', $word);
+ } else {
+ $hook_data['filter_reasons'][] = L10n::t('Filtered word: %s', $word);
+ }
}
}
+function nsfw_find_word_in_item_tags($item_tags, $word)
+{
+ if (is_array($item_tags)) {
+ foreach ($item_tags as $tag) {
+ if (stripos($tag, '>' . $word . '<') !== false) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}