wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-27 17:20:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix push subscription retrieval

Browse source 
Updates the push subscription query to retrieve a provider string rather
than only its numeric internal ID.

Change-Id: I910173409e48e8b6a6739d3122165c40b0d52b7f
This commit is contained in:
Michael Holloway 2020-06-02 19:20:06 -04:00 committed by Mateus Santos
parent a145bd0cbe
commit a5bcc65504
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Push/Subscription.php
View file

@ -22,7 +22,7 @@ class Subscription {
*/
public static function newFromRow( object $row ) {
return new self(
$row->eps_provider,
$row->epp_name,
$row->eps_token,
new ConvertibleTimestamp( $row->eps_updated )
);

6
includes/Push/SubscriptionManager.php
View file

@ -70,10 +70,12 @@ class SubscriptionManager extends EchoAbstractMapper {
*/
public function getSubscriptionsForUser( int $centralId ) {
$res = $this->dbr->select(
'echo_push_subscription',
[ 'echo_push_subscription', 'echo_push_provider' ],
'*',
[ 'eps_user' => $centralId ],
__METHOD__
__METHOD__,
[],
[ 'echo_push_provider' => [ 'INNER JOIN', [ 'eps_provider = epp_id' ] ] ]
);
$result = [];
foreach ( $res as $row ) {

2
tests/phpunit/unit/Push/SubscriptionTest.php
View file

@ -9,7 +9,7 @@ class SubscriptionTest extends MediaWikiUnitTestCase {
public function testNewFromRow(): void {
$row = new stdClass();
$row->eps_token = 'ABC123';
$row->eps_provider = 'fcm';
$row->epp_name = 'fcm';
$row->eps_updated = '2020-01-01 10:10:10';
$subscription = Subscription::newFromRow( $row );