From 221ae0f1213fabcf8a3e67e65939b5556f83e32c Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 16 Oct 2019 11:08:22 -0100 Subject: [PATCH 1/2] forward type of action Signed-off-by: Maxence Lange --- lib/Controller/OStatusController.php | 33 ++++++++++++++++++++++++++-- lib/Db/StreamRequest.php | 2 -- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/Controller/OStatusController.php b/lib/Controller/OStatusController.php index 10441966..633982a3 100644 --- a/lib/Controller/OStatusController.php +++ b/lib/Controller/OStatusController.php @@ -141,10 +141,10 @@ class OStatusController extends Controller { } try { - $post = $this->streamService->getStreamById($uri, true, true); + $this->streamService->getStreamById($uri, true, true); $link = $this->urlGenerator->linkToRouteAbsolute('social.SocialPub.displayRemotePost') - . '?id=' . $uri; + . '?id=' . $uri . '&type=' . $this->parseRefererType(); return new RedirectResponse($link); } catch (Exception $e) { @@ -243,5 +243,34 @@ class OStatusController extends Controller { } } + + /** + * @return string + */ + private function parseRefererType(): string { + $referer = $this->request->getHeader('Referer'); + $params = explode('&', parse_url($referer, PHP_URL_QUERY)); + $type = ''; + foreach ($params as $param) { + list($key, $value) = explode('=', $param); + if ($key === 'type') { + $type = $value; + } + } + + switch ($type) { + case 'reblog': + return 'boost'; + + case 'favourite': + return 'like'; + + case 'reply': + return 'reply'; + } + + return ''; + } + } diff --git a/lib/Db/StreamRequest.php b/lib/Db/StreamRequest.php index 9a2d9f0f..542c5614 100644 --- a/lib/Db/StreamRequest.php +++ b/lib/Db/StreamRequest.php @@ -241,8 +241,6 @@ class StreamRequest extends StreamRequestBuilder { }; $qb = $this->getStreamSelectSql(); - $expr = $qb->expr(); - $qb->limitToIdPrim($qb->prim($id)); $qb->linkToCacheActors('ca', 's.attributed_to_prim'); From aafb970a84c171ea7085659a9d1147c8392e407c Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 16 Oct 2019 11:18:30 -0100 Subject: [PATCH 2/2] cleaning Signed-off-by: Maxence Lange --- lib/Controller/SocialPubController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Controller/SocialPubController.php b/lib/Controller/SocialPubController.php index 5e67913b..fc40ac78 100644 --- a/lib/Controller/SocialPubController.php +++ b/lib/Controller/SocialPubController.php @@ -255,7 +255,6 @@ class SocialPubController extends Controller { * @param string $id * * @return TemplateResponse - * @throws SocialAppConfigException * @throws StreamNotFoundException */ public function displayRemotePost(string $id): TemplateResponse { @@ -280,9 +279,7 @@ class SocialPubController extends Controller { ], 'application' => 'Social' ]; - - $this->miscService->log('----- ' . json_encode($data)); - + return new TemplateResponse(Application::APP_NAME, 'stream', $data); }