X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nsfw%2Fnsfw.php;h=4a54d899e201c2eb9d77477a2def9679fef945e8;hb=2a782b512e7b038c450318abaa464bcaab7eb823;hp=29b95fcb127a50513dbdc933ecba5cc73fc324a6;hpb=44636c146148da6fca72f6039d98438581ae0049;p=friendica-addons.git diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 29b95fcb..4a54d899 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -7,9 +7,10 @@ * Author: Mike Macgirvin * */ + +use Friendica\App; use Friendica\Core\Hook; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\DI; function nsfw_install() @@ -19,14 +20,6 @@ function nsfw_install() Hook::register('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); } -function nsfw_uninstall() -{ - Hook::unregister('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter'); - Hook::unregister('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body'); - Hook::unregister('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); - Hook::unregister('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 // quick and dirty filter to pull out embedded photo blobs because 'nsfw' seems to come up // inside them quite often. We don't need anything fancy, just pull out the data blob so we can @@ -58,68 +51,66 @@ function nsfw_extract_photos($body) return $new_body; } -function nsfw_addon_settings(&$a, &$s) +function nsfw_addon_settings(array &$data) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - $a->page['htmlhead'] .= '' . "\r\n"; - - $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); - $words = PConfig::get(local_user(), 'nsfw', 'words'); - if (!$words) { - $words = 'nsfw,'; - } - - $s .= ''; - $s .= '

' . L10n::t('Content Filter (NSFW and more)') . '

'; - $s .= ''; - $s .= ''; - return; + $enabled = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable'); + $words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words', 'nsfw,'); + + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/nsfw/'); + $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.'), + '$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, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)')], + ]); + + $data = [ + 'addon' => 'nsfw', + 'title' => DI::l10n()->t('Content Filter (NSFW and more)'), + 'html' => $html, + ]; } -function nsfw_addon_settings_post(&$a, &$b) +function nsfw_addon_settings_post(array &$b) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } if (!empty($_POST['nsfw-submit'])) { - PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words'])); - $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0); + $enable = !empty($_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); + + $words = trim($_POST['nsfw-words']); + $word_list = explode(',', $words); + foreach ($word_list as $word) { + $word = trim($word); + if (!$words || strpos($word, '/') !== 0) { + continue; + } + + if (@preg_match($word, '') === false) { + DI::sysmsg()->addNotice(DI::l10n()->t('Regular expression "%s" fails to compile', $word)); + }; + } + + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'nsfw', 'words', $words); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'nsfw', 'disable', $disable); } } -function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) +function nsfw_prepare_body_content_filter(&$hook_data) { $words = null; - if (PConfig::get(local_user(), 'nsfw', 'disable')) { + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable')) { return; } - if (local_user()) { - $words = PConfig::get(local_user(), 'nsfw', 'words'); + if (DI::userSession()->getLocalUserId()) { + $words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words'); } if ($words) { @@ -141,14 +132,14 @@ function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) $tag_search = false; switch ($word[0]) { case '/'; // Regular expression - $found = preg_match($word, $body); + $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; 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; } @@ -160,9 +151,9 @@ function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) if ($found) { if ($tag_search) { - $hook_data['filter_reasons'][] = L10n::t('Filtered tag: %s', $word); + $hook_data['filter_reasons'][] = DI::l10n()->t('Filtered tag: %s', $word); } else { - $hook_data['filter_reasons'][] = L10n::t('Filtered word: %s', $word); + $hook_data['filter_reasons'][] = DI::l10n()->t('Filtered word: %s', $word); } } }