summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2019-05-29 21:40:51 -0100
committerMaxence Lange <maxence@artificial-owl.com>2019-05-29 21:40:51 -0100
commit2dca0728e9d00fda1572d5ed51094afa1e10543e (patch)
treeac62a48c7e0b647bd6752f53813d55b3553a50c5
parentd7baae9735bcc8f97a330447ab0d2321ba3ddf67 (diff)
cleaning
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r--lib/Db/StreamRequestBuilder.php28
1 files changed, 13 insertions, 15 deletions
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;
}