X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=nsfw%2Fnsfw.php;h=9f81b29d8333557f669a26dc735a9a23c711616b;hb=af10b60e97b94ba5e8bf60195038c51433966e08;hp=836f6541f9b5825c93cad706a02708ebadc6d197;hpb=dbe8118e406510d85404d9577f83d68782cfe2a0;p=friendica-addons.git
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 836f6541..9f81b29d 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -1,4 +1,5 @@
*
*/
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\DI;
function nsfw_install()
{
- Addon::registerHook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body', 10);
- Addon::registerHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
- Addon::registerHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
-}
-
-
-function nsfw_uninstall()
-{
- Addon::unregisterHook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body');
- Addon::unregisterHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
- Addon::unregisterHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
+ Hook::register('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter', 10);
+ Hook::register('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
+ Hook::register('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
}
// This function isn't perfect and isn't trying to preserve the html structure - it's just a
@@ -39,7 +31,7 @@ function nsfw_extract_photos($body)
$cnt = 0;
- while($img_end !== false) {
+ while ($img_end !== false) {
$img_end += $img_start;
$new_body = $new_body . substr($body, 0, $img_start);
@@ -48,7 +40,6 @@ function nsfw_extract_photos($body)
$img_start = strpos($body, 'src="data:');
$img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);
-
}
if (!$cnt) {
@@ -65,33 +56,33 @@ function nsfw_addon_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= ' ' . "\r\n";
+ DI::page()['htmlhead'] .= ' ' . "\r\n";
- $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
- $words = PConfig::get(local_user(), 'nsfw', 'words');
+ $enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
+ $words = DI::pConfig()->get(local_user(), 'nsfw', 'words');
if (!$words) {
$words = 'nsfw,';
}
$s .= '';
- $s .= '' . L10n::t('Content Filter (NSFW and more)') . ' ';
+ $s .= '' . DI::l10n()->t('Content Filter (NSFW and more)') . ' ';
$s .= ' ';
$s .= '
';
$s .= '
';
- $s .= '' . L10n::t('Content Filter (NSFW and more)') . ' ';
+ $s .= '' . DI::l10n()->t('Content Filter (NSFW and more)') . ' ';
$s .= ' ';
$s .= '
';
- $s .= '
' . 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.') . '
';
- $s .= '
' . L10n::t('Enable Content filter') . ' ';
+ $s .= '
' . 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.') . '
';
+ $s .= '
' . DI::l10n()->t('Enable Content filter') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Comma separated list of keywords to hide') . ' ';
- $s .= '
';
+ $s .= '
' . DI::l10n()->t('Comma separated list of keywords to hide') . ' ';
+ $s .= '
';
$s .= '
';
- $s .= '
';
- $s .= '
' . L10n::t('Use /expression/ to provide regular expressions') . '
';
+ $s .= '
';
+ $s .= '' . DI::l10n()->t('Use /expression/ to provide regular expressions') . '
';
return;
}
@@ -101,69 +92,79 @@ function nsfw_addon_settings_post(&$a, &$b)
return;
}
- 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;
- PConfig::set(local_user(), 'nsfw', 'disable', $disable);
- info(L10n::t('NSFW Settings saved.') . EOL);
+ if (!empty($_POST['nsfw-submit'])) {
+ DI::pConfig()->set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
+ $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0);
+ $disable = 1 - $enable;
+ DI::pConfig()->set(local_user(), 'nsfw', 'disable', $disable);
}
}
-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')) {
+ if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) {
return;
}
if (local_user()) {
- $words = PConfig::get(local_user(), 'nsfw', 'words');
+ $words = DI::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;
- }
- } else {
- if (stristr($body, $word)) {
- $found = true;
+ case '#': // Hashtag-only search
+ $tag_search = true;
+ $found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1));
break;
- }
- if (is_array($b['item']['tags']) && count($b['item']['tags'])) {
- foreach ($b['item']['tags'] as $t) {
- if (stristr($t, '>' . $word . '<')) {
- $found = true;
- break;
- }
- }
- }
+ default:
+ $found = stripos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
+ 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'][] = DI::l10n()->t('Filtered tag: %s', $word);
+ } else {
+ $hook_data['filter_reasons'][] = DI::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;
+}