clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete introductions when referenced contact id doesn't exist anymore in Ping module 

- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
This commit is contained in:
Hypolite Petovan 2022-12-08 09:24:06 -05:00
parent b29e520a25
commit d87585477c
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Module/Notifications/Ping.php
View File

@ -48,6 +48,7 @@ use Friendica\Navigation\Notifications\Factory;
use Friendica\Navigation\Notifications\Repository; use Friendica\Navigation\Notifications\Repository;
use Friendica\Navigation\Notifications\ValueObject; use Friendica\Navigation\Notifications\ValueObject;
use Friendica\Navigation\SystemMessages; use Friendica\Navigation\SystemMessages;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
@ -229,7 +230,11 @@ class Ping extends BaseModule
// merge all notification types in one array // merge all notification types in one array
foreach ($intros as $intro) { foreach ($intros as $intro) {
$navNotifications[] = $this->formattedNavNotification->createFromIntro($intro); try {
$navNotifications[] = $this->formattedNavNotification->createFromIntro($intro);
} catch (HTTPException\NotFoundException $e) {
$this->introductionRepo->delete($intro);
}
} }
if (count($registrations) <= 1 || $this->pconfig->get($this->session->getLocalUserId(), 'system', 'detailed_notif')) { if (count($registrations) <= 1 || $this->pconfig->get($this->session->getLocalUserId(), 'system', 'detailed_notif')) {
@ -242,7 +247,7 @@ class Ping extends BaseModule
new Uri($this->baseUrl->get(true) . '/moderation/users/pending') new Uri($this->baseUrl->get(true) . '/moderation/users/pending')
); );
} }
} elseif (count($registrations) > 1) { } else {
$navNotifications[] = $this->formattedNavNotification->createFromParams( $navNotifications[] = $this->formattedNavNotification->createFromParams(
$registrations[0]['name'], $registrations[0]['name'],
$registrations[0]['url'], $registrations[0]['url'],

24
src/Navigation/Notifications/Factory/FormattedNavNotification.php
View File

@ -28,7 +28,7 @@ use Friendica\Model\Contact;
use Friendica\Navigation\Notifications\Entity; use Friendica\Navigation\Notifications\Entity;
use Friendica\Navigation\Notifications\Exception\NoMessageException; use Friendica\Navigation\Notifications\Exception\NoMessageException;
use Friendica\Navigation\Notifications\ValueObject; use Friendica\Navigation\Notifications\ValueObject;
use Friendica\Network\HTTPException\ServiceUnavailableException; use Friendica\Network\HTTPException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy; use Friendica\Util\Proxy;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
@ -73,7 +73,7 @@ class FormattedNavNotification extends BaseFactory
* @param Uri $href * @param Uri $href
* @param bool $seen * @param bool $seen
* @return ValueObject\FormattedNavNotification * @return ValueObject\FormattedNavNotification
* @throws ServiceUnavailableException * @throws HTTPException\ServiceUnavailableException
*/ */
public function createFromParams(string $contact_name, string $contact_url, string $message, \DateTime $date, Uri $href, bool $seen = false): ValueObject\FormattedNavNotification public function createFromParams(string $contact_name, string $contact_url, string $message, \DateTime $date, Uri $href, bool $seen = false): ValueObject\FormattedNavNotification
{ {
@ -115,9 +115,9 @@ class FormattedNavNotification extends BaseFactory
* @param Entity\Notification $notification * @param Entity\Notification $notification
* @return ValueObject\FormattedNavNotification * @return ValueObject\FormattedNavNotification
* @throws NoMessageException * @throws NoMessageException
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \Friendica\Network\HTTPException\NotFoundException * @throws HTTPException\NotFoundException
* @throws \Friendica\Network\HTTPException\ServiceUnavailableException * @throws HTTPException\ServiceUnavailableException
*/ */
public function createFromNotification(Entity\Notification $notification): ValueObject\FormattedNavNotification public function createFromNotification(Entity\Notification $notification): ValueObject\FormattedNavNotification
{ {
@ -141,10 +141,20 @@ class FormattedNavNotification extends BaseFactory
); );
} }
/**
* @param \Friendica\Contact\Introduction\Entity\Introduction $intro
* @return ValueObject\FormattedNavNotification
* @throws HTTPException\NotFoundException when the contact record couldn't be located
* @throws HTTPException\ServiceUnavailableException
*/
public function createFromIntro(\Friendica\Contact\Introduction\Entity\Introduction $intro): ValueObject\FormattedNavNotification public function createFromIntro(\Friendica\Contact\Introduction\Entity\Introduction $intro): ValueObject\FormattedNavNotification
{ {
if (!isset(self::$contacts[$intro->cid])) { if (empty(self::$contacts[$intro->cid])) {
self::$contacts[$intro->cid] = Contact::getById($intro->cid, ['name', 'url', 'pending']); if ($contact = Contact::getById($intro->cid, ['name', 'url', 'pending'])) {
self::$contacts[$intro->cid] = $contact;
} else {
throw new HTTPException\NotFoundException('Contact not found with id' . $intro->cid);
}
} }
if (self::$contacts[$intro->cid]['pending']) { if (self::$contacts[$intro->cid]['pending']) {