X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nsfw%2Fnsfw.php;h=31d17f74a8fbf59c0e7a2881dc50683ce3bdc431;hb=6fb41f942925a32519799e8d4f8695addc1fa5de;hp=bb0932496ea4bb1574a5d14c28125a5ae93649d8;hpb=7a29893ecb79f55a01b3655b64371ef8bcc4a806;p=friendica-addons.git diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index bb093249..31d17f74 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -7,23 +7,17 @@ * Author: Mike Macgirvin * */ -use Friendica\Core\Addon; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; -function nsfw_install() -{ - Addon::registerHook('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter', 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'); -} +use Friendica\App; +use Friendica\Core\Hook; +use Friendica\Core\Renderer; +use Friendica\DI; -function nsfw_uninstall() +function nsfw_install() { - Addon::unregisterHook('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter'); - 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 @@ -57,68 +51,52 @@ function nsfw_extract_photos($body) return $new_body; } -function nsfw_addon_settings(&$a, &$s) +function nsfw_addon_settings(App &$a, 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(App $a, 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 = (x($_POST, 'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'nsfw', 'words', trim($_POST['nsfw-words'])); + $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); + 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(App $a, &$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) { @@ -147,7 +125,7 @@ function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) $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; } @@ -159,9 +137,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); } } }