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

Merge pull request #8239 from nupplaphil/task/move_enotify_parts

Browse Source 
Move Notify "type" and "otype" into own enum classes
This commit is contained in:
Hypolite Petovan
2020-02-05 16:56:54 -05:00
committed by GitHub
parent b6764468e0 d3929267d0
commit 6347578978
17 changed files with 149 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Module/Delegation.php
View File

@@ -9,6 +9,7 @@ use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Notify\Type;
use Friendica\Model\User;
use Friendica\Network\HTTPException\ForbiddenException;
@@ -111,7 +112,7 @@ class Delegation extends BaseModule
$identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, Type::MAIL];
$params = ['distinct' => true, 'expression' => 'parent'];
$notifications = DBA::count('notify', $condition, $params);

2
src/Module/Register.php
View File

@@ -348,7 +348,7 @@ class Register extends BaseModule
// send notification to admins
while ($admin = DBA::fetch($admins_stmt)) {
\notification([
'type' => NOTIFY_SYSTEM,
'type' => Model\Notify\Type::SYSTEM,
'event' => 'SYSTEM_REGISTER_REQUEST',
'source_name' => $user['username'],
'source_mail' => $user['email'],