UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-24 14:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2770 from pixelfed/staging

Browse source 
Update AdminStatsService, fix postgres bug
This commit is contained in:
daniel 2021-05-25 01:37:13 -06:00 committed by GitHub
commit bfe6969dae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -94,6 +94,7 @@
- Updated StatusTransformer, fix missing tags attribute. ([dac326e9](https://github.com/pixelfed/pixelfed/commit/dac326e9)) - Updated StatusTransformer, fix missing tags attribute. ([dac326e9](https://github.com/pixelfed/pixelfed/commit/dac326e9))
- Updated ComposeController, bail on empty attachments. ([061b145b](https://github.com/pixelfed/pixelfed/commit/061b145b)) - Updated ComposeController, bail on empty attachments. ([061b145b](https://github.com/pixelfed/pixelfed/commit/061b145b))
- Updated landing and about page. ([92dc7af6](https://github.com/pixelfed/pixelfed/commit/92dc7af6)) - Updated landing and about page. ([92dc7af6](https://github.com/pixelfed/pixelfed/commit/92dc7af6))
- Updated AdminStatsService, fix postgres bug. ([af719135](https://github.com/pixelfed/pixelfed/commit/af719135))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10) ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)

7
app/Services/AdminStatsService.php
View file

@ -67,10 +67,11 @@ class AdminStatsService
protected static function postsGraph() protected static function postsGraph()
{ {
$ttl = now()->addHours(12); $ttl = now()->addHours(12);
return Cache::remember('admin:dashboard:home:data-postsGraph:v0:24hr', $ttl, function() { return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function() {
$gb = config('database.default') == 'pgsql' ? ['statuses.id', DB::raw('Date(created_at)')] : DB::raw('Date(created_at)');
$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
->where('created_at', '>=', now()->subWeek()) ->where('created_at', '>=', now()->subWeek())
->groupBy(DB::raw('Date(created_at)')) ->groupBy($gb)
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
->pluck('count', 'date'); ->pluck('count', 'date');
@ -88,7 +89,7 @@ class AdminStatsService
$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
->where('created_at', '>=', now()->subWeeks(2)) ->where('created_at', '>=', now()->subWeeks(2))
->where('created_at', '<=', now()->subWeeks(1)) ->where('created_at', '<=', now()->subWeeks(1))
->groupBy(DB::raw('Date(created_at)')) ->groupBy($gb)
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
->pluck('count', 'date'); ->pluck('count', 'date');