|
@@ -91,13 +91,13 @@ discard block |
|
|
block discarded – undo |
|
91
|
91
|
$this->onUserSeen($instanceName, $connectionStatus->user); |
|
92
|
92
|
|
|
93
|
93
|
$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user) |
|
94
|
|
- ->findOne(); |
|
|
94
|
+ ->findOne(); |
|
95
|
95
|
} |
|
96
|
96
|
|
|
97
|
97
|
$connection = new Connection(); |
|
98
|
98
|
$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer) |
|
99
|
|
- ->setUser($user) |
|
100
|
|
- ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save(); |
|
|
99
|
+ ->setUser($user) |
|
|
100
|
+ ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save(); |
|
101
|
101
|
|
|
102
|
102
|
$this->_logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [ |
|
103
|
103
|
'instanceName' => $instanceName, |
|
@@ -185,8 +185,8 @@ discard block |
|
|
block discarded – undo |
|
185
|
185
|
|
|
186
|
186
|
$subscription = new Subscription(); |
|
187
|
187
|
$subscription->setInstance($instance)->setUser($user)->setChannel($channel) |
|
188
|
|
- ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title) |
|
189
|
|
- ->setService($status->service); |
|
|
188
|
+ ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title) |
|
|
189
|
+ ->setService($status->service); |
|
190
|
190
|
$subscription->save(); |
|
191
|
191
|
|
|
192
|
192
|
$this->_logger->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})', |
|
@@ -210,8 +210,8 @@ discard block |
|
|
block discarded – undo |
|
210
|
210
|
|
|
211
|
211
|
// Find the latest matching subscription |
|
212
|
212
|
$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName) |
|
213
|
|
- ->filterBySubscriptionId($stateChange->getSubscriptionId()) |
|
214
|
|
- ->addDescendingOrderByColumn('started')->findOne(); |
|
|
213
|
+ ->filterBySubscriptionId($stateChange->getSubscriptionId()) |
|
|
214
|
+ ->addDescendingOrderByColumn('started')->findOne(); |
|
215
|
215
|
|
|
216
|
216
|
if ($subscription === null) |
|
217
|
217
|
{ |
|
@@ -259,7 +259,7 @@ discard block |
|
|
block discarded – undo |
|
259
|
259
|
private function hasConnection($instanceName, ConnectionStatus $connectionStatus) |
|
260
|
260
|
{ |
|
261
|
261
|
return ConnectionQuery::create()->filterByInstanceName($instanceName)->filterByPeer($connectionStatus->peer) |
|
262
|
|
- ->filterByStarted($connectionStatus->started)->findOne() !== null; |
|
|
262
|
+ ->filterByStarted($connectionStatus->started)->findOne() !== null; |
|
263
|
263
|
} |
|
264
|
264
|
|
|
265
|
265
|
|
|
@@ -284,7 +284,7 @@ discard block |
|
|
block discarded – undo |
|
284
|
284
|
private function hasChannel($instanceName, $channelName) |
|
285
|
285
|
{ |
|
286
|
286
|
return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName) |
|
287
|
|
- ->findOne() !== null; |
|
|
287
|
+ ->findOne() !== null; |
|
288
|
288
|
} |
|
289
|
289
|
|
|
290
|
290
|
|
|
@@ -307,9 +307,9 @@ discard block |
|
|
block discarded – undo |
|
307
|
307
|
$userId = $user !== null ? $user->getId() : null; |
|
308
|
308
|
|
|
309
|
309
|
return SubscriptionQuery::create()->filterByInstance($instance)->filterByUserId($userId) |
|
310
|
|
- ->filterByChannel($channel) |
|
311
|
|
- ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start) |
|
312
|
|
- ->findOne() !== null; |
|
|
310
|
+ ->filterByChannel($channel) |
|
|
311
|
+ ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start) |
|
|
312
|
+ ->findOne() !== null; |
|
313
|
313
|
} |
|
314
|
314
|
|
|
315
|
315
|
} |