bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl

Browse source 
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
This commit is contained in:
Philipp 2019-07-03 16:47:37 +02:00 committed by GitHub
parent a248da8f2e 50fa6b7e02
commit f60792348a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Console/GlobalCommunitySilence.php
View file

@ -2,10 +2,9 @@
namespace Friendica\Console; namespace Friendica\Console;
use Friendica\Core\Protocol; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Network\Probe; use Friendica\Model\Contact;
use Friendica\Util\Strings;
use RuntimeException; use RuntimeException;
/** /**
@ -47,8 +46,6 @@ HELP;
protected function doExecute() protected function doExecute()
{ {
$a = \get_app();
if ($this->getOption('v')) { if ($this->getOption('v')) {
$this->out('Class: ' . __CLASS__); $this->out('Class: ' . __CLASS__);
$this->out('Arguments: ' . var_export($this->args, true)); $this->out('Arguments: ' . var_export($this->args, true));
@ -64,27 +61,16 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
} }
if ($a->getMode()->isInstall()) { if (BaseObject::getApp()->getMode()->isInstall()) {
throw new RuntimeException('Database isn\'t ready or populated yet'); throw new RuntimeException('Database isn\'t ready or populated yet');
} }
/** $contact_id = Contact::getIdForURL($this->getArgument(0));
* 1. make nurl from last parameter if ($contact_id) {
* 2. check DB (contact) if there is a contact with uid=0 and that nurl, get the ID DBA::update('contact', ['hidden' => true], ['id' => $contact_id]);
* 3. set the flag hidden=1 for the contact entry with the found ID $this->out('The account has been successfully silenced from the global community page.');
* */
$net = Probe::uri($this->getArgument(0));
if (in_array($net['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
throw new RuntimeException('This account seems not to exist.');
}
$nurl = Strings::normaliseLink($net['url']);
$contact = DBA::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]);
if (DBA::isResult($contact)) {
DBA::update("contact", ["hidden" => true], ["id" => $contact["id"]]);
$this->out('NOTICE: The account should be silenced from the global community page');
} else { } else {
throw new RuntimeException('NOTICE: Could not find any entry for this URL (' . $nurl . ')'); throw new RuntimeException('Could not find any public contact entry for this URL (' . $this->getArgument(0) . ')');
} }
return 0; return 0;