From 2dca0728e9d00fda1572d5ed51094afa1e10543e Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 29 May 2019 21:40:51 -0100 Subject: cleaning Signed-off-by: Maxence Lange --- lib/Db/StreamRequestBuilder.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php index f5358bcc..89a71028 100644 --- a/lib/Db/StreamRequestBuilder.php +++ b/lib/Db/StreamRequestBuilder.php @@ -30,6 +30,7 @@ declare(strict_types=1); namespace OCA\Social\Db; +use daita\MySmallPhpTools\Exceptions\CacheItemNotFoundException; use daita\MySmallPhpTools\Traits\TArrayTools; use Doctrine\DBAL\Query\QueryBuilder; use OCA\Social\Exceptions\InvalidResourceException; @@ -408,24 +409,21 @@ class StreamRequestBuilder extends CoreRequestBuilder { } catch (InvalidResourceException $e) { } - try { - $action = $this->parseStreamActionsLeftJoin($data); - if ($item->hasCache()) { - $cache = $item->getCache(); - if ($cache->hasItem($action->getStreamId())) { - $cachedItem = $item->getCache() - ->getItem($action->getStreamId()); - $cachedObject = $cachedItem->getObject(); - $cachedObject['action'] = $action; - $cachedItem->setContent(json_encode($cachedObject)); - $cache->updateItem($cachedItem, false); - } + $action = $this->parseStreamActionsLeftJoin($data); + if ($item->hasCache()) { + $cache = $item->getCache(); + try { + $cachedItem = $cache->getItem($action->getStreamId()); + $cachedObject = $cachedItem->getObject(); + $cachedObject['action'] = $action; + $cachedItem->setContent(json_encode($cachedObject)); + $cache->updateItem($cachedItem, false); + } catch (CacheItemNotFoundException $e) { } - - $item->setAction($action); - } catch (InvalidResourceException $e) { } + $item->setAction($action); + return $item; } -- cgit v1.2.3