summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2019-07-21 17:49:15 -0100
committerGitHub <noreply@github.com>2019-07-21 17:49:15 -0100
commite376768c345d829552c684d0027f5179801a0eaf (patch)
tree35ccdb122d12f855bbc874f6d7bac098e4b6f705
parent0b84625c9238e139863b0794a460c75505b66bc9 (diff)
parent92ba1df1131c569e6dd772c9c44623f301ed3a84 (diff)
Merge pull request #643 from StCyr/stCyr_fix640
St cyr fix640
-rw-r--r--lib/Db/StreamRequest.php3
-rw-r--r--lib/Service/NoteService.php2
-rw-r--r--src/App.vue10
3 files changed, 13 insertions, 2 deletions
diff --git a/lib/Db/StreamRequest.php b/lib/Db/StreamRequest.php
index 365d83f5..db2dee29 100644
--- a/lib/Db/StreamRequest.php
+++ b/lib/Db/StreamRequest.php
@@ -518,12 +518,13 @@ class StreamRequest extends StreamRequestBuilder {
* @return array
* @throws Exception
*/
- public function getLiked(int $since = 0, int $limit = 5, bool $localOnly = true): array {
+ public function getTimelineLiked(int $since = 0, int $limit = 5, bool $localOnly = true): array {
$qb = $this->getStreamSelectSql();
$this->limitPaginate($qb, $since, $limit);
$this->limitToType($qb, Note::TYPE);
+ $this->leftJoinStreamAction($qb);
$this->leftJoinCacheActors($qb, 'attributed_to');
$this->leftJoinActions($qb, Like::TYPE);
$this->filterDBField($qb, 'id', '', false, 'a');
diff --git a/lib/Service/NoteService.php b/lib/Service/NoteService.php
index b9043175..f13ffee8 100644
--- a/lib/Service/NoteService.php
+++ b/lib/Service/NoteService.php
@@ -464,7 +464,7 @@ class NoteService {
* @throws Exception
*/
public function getStreamLiked(int $since = 0, int $limit = 5): array {
- return $this->streamRequest->getLiked($since, $limit);
+ return $this->streamRequest->getTimelineLiked($since, $limit);
}
diff --git a/src/App.vue b/src/App.vue
index f70a58e6..ea008365 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -157,6 +157,16 @@ export default {
}
},
{
+ id: 'social-liked',
+ classes: [],
+ icon: 'icon-favorite',
+ text: t('social', 'Liked'),
+ router: {
+ name: 'timeline',
+ params: { type: 'liked' }
+ }
+ },
+ {
id: 'social-local',
classes: [],
icon: 'icon-category-monitoring',