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

Add UID as parameter for notify repository call

Browse source
This commit is contained in:
nupplaPhil 2020-03-01 22:24:53 +01:00
parent c11cfd5e48
commit 55a5e43715
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/api.php
View file

@ -25,7 +25,6 @@
use Friendica\App; use Friendica\App;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -42,7 +41,6 @@ use Friendica\Model\Item;
use Friendica\Model\Mail; use Friendica\Model\Mail;
use Friendica\Model\Notify; use Friendica\Model\Notify;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Model\UserItem; use Friendica\Model\UserItem;
use Friendica\Network\FKOAuth1; use Friendica\Network\FKOAuth1;
@ -5920,7 +5918,7 @@ function api_friendica_notification_seen($type)
$id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0); $id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
try { try {
$notify = DI::notify()->getByID($id); $notify = DI::notify()->getByID($id, api_user());
DI::notify()->setSeen(true, $notify); DI::notify()->setSeen(true, $notify);
if ($notify->otype === Notify\ObjectType::ITEM) { if ($notify->otype === Notify\ObjectType::ITEM) {

2
src/Module/Notifications/Notification.php
View file

@ -107,7 +107,7 @@ class Notification extends BaseModule
$request_id = $parameters['id'] ?? false; $request_id = $parameters['id'] ?? false;
if ($request_id) { if ($request_id) {
$notify = DI::notify()->getByID($request_id); $notify = DI::notify()->getByID($request_id, local_user());
DI::notify()->setSeen(true, $notify); DI::notify()->setSeen(true, $notify);
if (!empty($notify->link)) { if (!empty($notify->link)) {

11
src/Repository/Notify.php
View file

@ -23,9 +23,9 @@ namespace Friendica\Repository;
use Exception; use Exception;
use Friendica\BaseRepository; use Friendica\BaseRepository;
use Friendica\Collection;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Model; use Friendica\Model;
use Friendica\Collection;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -61,14 +61,17 @@ class Notify extends BaseRepository
} }
/** /**
* {@inheritDoc} * Return one notify instance based on ID / UID
*
* @param int $id The ID of the notify instance
* @param int $uid The user ID, bound to this notify instance (= security check)
* *
* @return Model\Notify * @return Model\Notify
* @throws NotFoundException * @throws NotFoundException
*/ */
public function getByID(int $id) public function getByID(int $id, int $uid)
{ {
return $this->selectFirst(['id' => $id, 'uid' => local_user()]); return $this->selectFirst(['id' => $id, 'uid' => $uid]);
} }
/** /**