From b66432f8d0af41c67bde926236f0835d08443f9f Mon Sep 17 00:00:00 2001 From: okpierre <1679025+okpierre@users.noreply.github.com> Date: Mon, 9 Sep 2019 22:30:18 -0400 Subject: [PATCH 1/4] Update package.json change from "quill": "^1.3.6", to "quill": "^1.3.7", --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c87516db..2bed7b899 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "plyr": "^3.5.6", "promise-polyfill": "8.1.0", "pusher-js": "^4.4.0", - "quill": "^1.3.6", + "quill": "^1.3.7", "readmore-js": "^2.2.1", "socket.io-client": "^2.2.0", "sweetalert": "^2.1.2", From 22d9449936414c8f9fc26466aeb05bc8c4b41c7e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 17:18:28 -0600 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c35c38d..2e3507d38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Changed - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690) +- Updated quill.js to v1.3.7 [#1692](https://github.com/pixelfed/pixelfed/pull/1690) ## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3) From fe736f2b4404287f4321e06f9c9059171184f1db Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 22:03:45 -0600 Subject: [PATCH 3/4] Update StatusHashtagService, fix count bug --- app/Services/StatusHashtagService.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index 7c5ed87bb..6107c293b 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -56,11 +56,11 @@ class StatusHashtagService { public static function count($id) { - $count = Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); - if(empty($count)) { - $count = StatusHashtag::whereHashtagId($id)->count(); - } - return $count; + $key = 'pf:services:status-hashtag:count:' . $id; + $ttl = now()->addHours(6); + return Cache::remember($key, $ttl, function() use($id) { + return StatusHashtag::whereHashtagId($id)->count(); + }); } public static function getStatus($statusId, $hashtagId) From 59aae7907d97ed0344b7fb2984849c546ea04962 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 22:10:08 -0600 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e3507d38..eef7017eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,9 @@ ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.3...dev) ### Added -- ### Fixed -- +- Fixed count bug in StatusHashtagService [#1694]((https://github.com/pixelfed/pixelfed/pull/1694) ### Changed - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690)