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

Merge pull request #8208 from nupplaphil/bug/8205-notifcations_clear 

Fix Notifications cleared for threads
This commit is contained in:
Hypolite Petovan 2020-01-31 16:29:08 -05:00 committed by GitHub
parent 4ab893a561 abbf036685
commit 855e970606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/api.php
View File

@ -5957,11 +5957,11 @@ function api_friendica_notification_seen($type)
$id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
try {
$notification = DI::notify()->getByID($id);
$notification->setSeen();
$notify = DI::notify()->getByID($id);
DI::notify()->setSeen(true, $notify);
if ($notification->otype === Notify::OTYPE_ITEM) {
$item = Item::selectFirstForUser(api_user(), [], ['id' => $notification->iid, 'uid' => api_user()]);
if ($notify->otype === Notify::OTYPE_ITEM) {
$item = Item::selectFirstForUser(api_user(), [], ['id' => $notify->iid, 'uid' => api_user()]);
if (DBA::isResult($item)) {
// we found the item, return it to the user
$ret = api_format_items([$item], $user_info, false, $type);
@ -5972,7 +5972,9 @@ function api_friendica_notification_seen($type)
}
return api_format_data('result', $type, ['result' => "success"]);
} catch (NotFoundException $e) {
throw new BadRequestException('Invalid argument');
throw new BadRequestException('Invalid argument', $e);
} catch (Exception $e) {
throw new InternalServerErrorException('Internal Server exception', $e);
}
}

19
src/Model/Notify.php
View File

@ -2,7 +2,6 @@
namespace Friendica\Model;
use Exception;
use Friendica\BaseModel;
use Friendica\Content\Text\BBCode;
use Friendica\Database\Database;
@ -50,24 +49,6 @@ class Notify extends BaseModel
$this->setMsgCache();
}
/**
* Set the notification as seen
*
* @param bool $seen true, if seen
*
* @return bool True, if the seen state could be saved
*/
public function setSeen(bool $seen = true)
{
$this->seen = $seen;
try {
return $this->repo->update($this);
} catch (Exception $e) {
$this->logger->warning('Update failed.', ['$this' => $this, 'exception' => $e]);
return false;
}
}
/**
* Sets the pre-formatted name (caching)
*/

13
src/Module/Notifications/Notification.php
View File

@ -44,8 +44,8 @@ class Notification extends BaseModule
// @TODO: Replace with parameter from router
if (DI::args()->get(1) === 'mark' && DI::args()->get(2) === 'all') {
try {
$success = DI::notify()->setAllSeen();
}catch (\Exception $e) {
$success = DI::notify()->setSeen();
} catch (\Exception $e) {
DI::logger()->warning('set all seen failed.', ['exception' => $e]);
$success = false;
}
@ -66,11 +66,11 @@ class Notification extends BaseModule
if ($request_id) {
try {
$notification = DI::notify()->getByID($request_id);
$notification->setSeen();
$notify = DI::notify()->getByID($request_id);
DI::notify()->setSeen(true, $notify);
if (!empty($notification->link)) {
System::externalRedirect($notification->link);
if (!empty($notify->link)) {
System::externalRedirect($notify->link);
}
} catch (HTTPException\NotFoundException $e) {
@ -83,4 +83,3 @@ class Notification extends BaseModule
DI::baseUrl()->redirect('notifications/system');
}
}

25
src/Repository/Notify.php
View File

@ -7,6 +7,7 @@ use Friendica\BaseRepository;
use Friendica\Core\Hook;
use Friendica\Model;
use Friendica\Collection;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat;
@ -52,14 +53,28 @@ class Notify extends BaseRepository
}
/**
* {@inheritDoc}
* Set seen state of notifications of the local_user()
*
* @param bool $seen optional true or false. default true
* @param Model\Notify $notify optional a notify, which should be set seen (including his parents)
*
* @return bool true on success, false on error
*
* @throws Exception
*/
public function setAllSeen(bool $seen = true)
public function setSeen(bool $seen = true, Model\Notify $notify = null)
{
return $this->dba->update('notify', ['seen' => $seen], ['uid' => local_user()]);
if (empty($notify)) {
$conditions = ['uid' => local_user()];
} else {
$conditions = ['(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
$notify->link,
$notify->parent,
$notify->otype,
local_user()];
}
return $this->dba->update('notify', ['seen' => $seen], $conditions);
}
/**
@ -67,12 +82,12 @@ class Notify extends BaseRepository
*
* @return Model\Notify|false
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws InternalServerErrorException
* @throws Exception
*/
public function insert(array $fields)
{
$fields['date'] = DateTimeFormat::utcNow();
$fields['date'] = DateTimeFormat::utcNow();
Hook::callAll('enotify_store', $fields);

4
tests/include/ApiTest.php
View File

@ -19,6 +19,7 @@ use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Network\HTTPException;
use Friendica\Test\Util\Database\StaticDatabase;
use Friendica\Util\Temporal;
use Monolog\Handler\TestHandler;
require_once __DIR__ . '/../../include/api.php';
@ -3940,10 +3941,11 @@ class ApiTest extends DatabaseTest
$this->app->argv = ['api', 'friendica', 'notification'];
$this->app->argc = count($this->app->argv);
$result = api_friendica_notification('xml');
$dateRel = Temporal::getRelativeDate('2020-01-01 12:12:02');
$assertXml=<<<XML
<?xml version="1.0"?>
<notes>
<note id="1" hash="" type="8" name="Reply to" url="http://localhost/display/1" photo="http://localhost/" date="2020-01-01 12:12:02" msg="A test reply from an item" uid="42" link="http://localhost/notification/1" iid="4" parent="0" seen="0" verb="" otype="item" name_cache="" msg_cache="A test reply from an item" timestamp="1577880722" date_rel="4 weeks ago" msg_html="A test reply from an item" msg_plain="A test reply from an item"/>
<note id="1" hash="" type="8" name="Reply to" url="http://localhost/display/1" photo="http://localhost/" date="2020-01-01 12:12:02" msg="A test reply from an item" uid="42" link="http://localhost/notification/1" iid="4" parent="0" seen="0" verb="" otype="item" name_cache="" msg_cache="A test reply from an item" timestamp="1577880722" date_rel="{$dateRel}" msg_html="A test reply from an item" msg_plain="A test reply from an item"/>
</notes>
XML;
$this->assertXmlStringEqualsXmlString($assertXml, $result);