sekretaerbaer/friendica-addons-sekb
1
0
Fork 0
forked from Friendica/friendica-addons
Code Pull requests Activity

Merge pull request #543 from annando/nsfw-cw

Browse source 
nsfw now ignores content warning posts and the code has been reformatted
This commit is contained in:
Hypolite Petovan 2018-03-14 18:47:10 -04:00 committed by GitHub
commit 46a6f55247
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
nsfw/nsfw.php
View file

@ -51,20 +51,17 @@ function nsfw_extract_photos($body)
} }
if(! $cnt) if (!$cnt) {
return $body; return $body;
}
return $new_body; return $new_body;
} }
function nsfw_addon_settings(&$a, &$s)
{
if (!local_user()) {
function nsfw_addon_settings(&$a,&$s) {
if(! local_user())
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ /* Add our stylesheet to the page so we can make our settings look nice */
@ -72,8 +69,9 @@ function nsfw_addon_settings(&$a,&$s) {
$enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
$words = PConfig::get(local_user(), 'nsfw', 'words'); $words = PConfig::get(local_user(), 'nsfw', 'words');
if(! $words) if (!$words) {
$words = 'nsfw,'; $words = 'nsfw,';
}
$s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">'; $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
$s .= '<h3>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>'; $s .= '<h3>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
@ -94,45 +92,47 @@ function nsfw_addon_settings(&$a,&$s) {
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
$s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>'; $s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';
return; return;
} }
function nsfw_addon_settings_post(&$a,&$b) { function nsfw_addon_settings_post(&$a, &$b)
{
if(! local_user()) if (!local_user()) {
return; return;
}
if ($_POST['nsfw-submit']) { if ($_POST['nsfw-submit']) {
PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words'])); PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
$enable = ((x($_POST,'nsfw-enable')) ? intval($_POST['nsfw-enable']) : 0); $enable = (x($_POST,'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
$disable = 1-$enable; $disable = 1-$enable;
PConfig::set(local_user(), 'nsfw', 'disable', $disable); PConfig::set(local_user(), 'nsfw', 'disable', $disable);
info(L10n::t('NSFW Settings saved.') . EOL); info(L10n::t('NSFW Settings saved.') . EOL);
} }
} }
function nsfw_prepare_body(&$a,&$b) { function nsfw_prepare_body(&$a, &$b)
{
// Don't do the check when there is a content warning
if (!empty($b['item']['content-warning'])) {
return;
}
$words = null; $words = null;
if(PConfig::get(local_user(),'nsfw','disable')) if (PConfig::get(local_user(), 'nsfw', 'disable')) {
return; return;
}
if (local_user()) { if (local_user()) {
$words = PConfig::get(local_user(), 'nsfw', 'words'); $words = PConfig::get(local_user(), 'nsfw', 'words');
} }
if ($words) { if ($words) {
$arr = explode(',', $words); $arr = explode(',', $words);
} } else {
else {
$arr = ['nsfw']; $arr = ['nsfw'];
} }
$found = false; $found = false;
if (count($arr)) { if (count($arr)) {
$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']); $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
foreach ($arr as $word) { foreach ($arr as $word) {
@ -145,8 +145,7 @@ function nsfw_prepare_body(&$a,&$b) {
$found = true; $found = true;
break; break;
} }
} } else {
else {
if (stristr($body, $word)) { if (stristr($body, $word)) {
$found = true; $found = true;
break; break;