friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7605 from annando/pending-2 

Pending contacts: Fix contact deletion / added cron job for repairs
This commit is contained in:
Tobias Diekershoff 2019-09-10 06:32:18 +02:00 committed by GitHub
parent 3d5d50a25b 323285216b
commit 5f2028b657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/notifications.php
View File

@ -12,9 +12,11 @@ use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager; use Friendica\Core\NotificationsManager;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Module\Login; use Friendica\Module\Login;
use Friendica\Model\Contact;
function notifications_post(App $a) function notifications_post(App $a)
{ {
@ -46,13 +48,14 @@ function notifications_post(App $a)
if ($_POST['submit'] == L10n::t('Discard')) { if ($_POST['submit'] == L10n::t('Discard')) {
DBA::delete('intro', ['id' => $intro_id]); DBA::delete('intro', ['id' => $intro_id]);
if (!$fid) { if (!$fid) {
// The check for blocked and pending is in case the friendship was already approved // The check for pending is in case the friendship was already approved
// and we just want to get rid of the now pointless notification // and we just want to get rid of the pending contact
$condition = ['id' => $contact_id, 'uid' => local_user(), $condition = ['id' => $contact_id, 'uid' => local_user(),
'self' => false, 'blocked' => true, 'pending' => true]; 'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
DBA::delete('contact', $condition); if (DBA::exists('contact', $condition)) {
Contact::remove($contact_id);
}
} }
$a->internalRedirect('notifications/intros'); $a->internalRedirect('notifications/intros');
} }

10
src/Worker/CronJobs.php
View File

@ -23,6 +23,7 @@ use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
class CronJobs class CronJobs
{ {
@ -301,6 +302,15 @@ class CronJobs
/// - remove sign entries without item /// - remove sign entries without item
/// - remove children when parent got lost /// - remove children when parent got lost
/// - set contact-id in item when not present /// - set contact-id in item when not present
// Add intro entries for pending contacts
$pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
WHERE `pending` AND `rel` IN (?, ?) AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0, Contact::FOLLOWER);
while ($contact = DBA::fetch($pending_contacts)) {
DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);
}
DBA::close($pending_contacts);
} }
/** /**