friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #543 from annando/nsfw-cw 

nsfw now ignores content warning posts and the code has been reformatted
pull/544/merge
Hypolite Petovan 2018-03-14 18:47:10 -04:00 committed by GitHub
parent 6d3608eec7 93c1914cad
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 $new_body;
}
function nsfw_addon_settings(&$a,&$s) {
if(! local_user())
function nsfw_addon_settings(&$a, &$s)
{
if (!local_user()) {
return;
}
/* 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" ');
$words = PConfig::get(local_user(), 'nsfw', 'words');
if(! $words)
if (!$words) {
$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 .= '<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="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';
return;
}
function nsfw_addon_settings_post(&$a,&$b) {
if(! local_user())
function nsfw_addon_settings_post(&$a, &$b)
{
if (!local_user()) {
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);
$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(&$a, &$b)
{
// 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 (PConfig::get(local_user(), 'nsfw', 'disable')) {
return;
}
if (local_user()) {
$words = PConfig::get(local_user(), 'nsfw', 'words');
}
if ($words) {
$arr = explode(',', $words);
}
else {
} else {
$arr = ['nsfw'];
}
$found = false;
if (count($arr)) {
$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
foreach ($arr as $word) {
@ -145,8 +145,7 @@ function nsfw_prepare_body(&$a,&$b) {
$found = true;
break;
}
}
else {
} else {
if (stristr($body, $word)) {
$found = true;
break;