mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-14 10:34:31 +00:00
commit
e4db35c6dd
7 changed files with 45 additions and 19 deletions
|
@ -6,6 +6,7 @@
|
||||||
- Update admin dashboard, fix search and dropdown menu ([dac0d083](https://github.com/pixelfed/pixelfed/commit/dac0d083))
|
- Update admin dashboard, fix search and dropdown menu ([dac0d083](https://github.com/pixelfed/pixelfed/commit/dac0d083))
|
||||||
- Update sudo mode view, fix trusted device checkbox ([8ef900bf](https://github.com/pixelfed/pixelfed/commit/8ef900bf))
|
- Update sudo mode view, fix trusted device checkbox ([8ef900bf](https://github.com/pixelfed/pixelfed/commit/8ef900bf))
|
||||||
- Update SearchApiV2Service, improve postgres support ([666e5732](https://github.com/pixelfed/pixelfed/commit/666e5732))
|
- Update SearchApiV2Service, improve postgres support ([666e5732](https://github.com/pixelfed/pixelfed/commit/666e5732))
|
||||||
|
- Update StoryController, show active self stories on home timeline ([633351f6](https://github.com/pixelfed/pixelfed/commit/633351f6))
|
||||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||||
|
|
||||||
## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)
|
## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)
|
||||||
|
|
|
@ -37,7 +37,8 @@ class StoryController extends StoryComposeController
|
||||||
$pid = $request->user()->profile_id;
|
$pid = $request->user()->profile_id;
|
||||||
|
|
||||||
if(config('database.default') == 'pgsql') {
|
if(config('database.default') == 'pgsql') {
|
||||||
$s = Story::select('stories.*', 'followers.following_id')
|
$s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
|
||||||
|
return Story::select('stories.*', 'followers.following_id')
|
||||||
->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
|
->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
|
||||||
->where('followers.profile_id', $pid)
|
->where('followers.profile_id', $pid)
|
||||||
->where('stories.active', true)
|
->where('stories.active', true)
|
||||||
|
@ -51,14 +52,38 @@ class StoryController extends StoryComposeController
|
||||||
return $r;
|
return $r;
|
||||||
})
|
})
|
||||||
->unique('profile_id');
|
->unique('profile_id');
|
||||||
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$s = Story::select('stories.*', 'followers.following_id')
|
$s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
|
||||||
|
return Story::select('stories.*', 'followers.following_id')
|
||||||
->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
|
->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
|
||||||
->where('followers.profile_id', $pid)
|
->where('followers.profile_id', $pid)
|
||||||
->where('stories.active', true)
|
->where('stories.active', true)
|
||||||
->groupBy('followers.following_id')
|
->groupBy('followers.following_id')
|
||||||
->orderByDesc('id')
|
->orderByDesc('id')
|
||||||
->get();
|
->get();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$self = Cache::remember('pf:stories:recent-self:' . $pid, 21600, function() use($pid) {
|
||||||
|
return Story::whereProfileId($pid)
|
||||||
|
->whereActive(true)
|
||||||
|
->orderByDesc('id')
|
||||||
|
->limit(1)
|
||||||
|
->get()
|
||||||
|
->map(function($s) use($pid) {
|
||||||
|
$r = new \StdClass;
|
||||||
|
$r->id = $s->id;
|
||||||
|
$r->profile_id = $pid;
|
||||||
|
$r->type = $s->type;
|
||||||
|
$r->path = $s->path;
|
||||||
|
return $r;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if($self->count()) {
|
||||||
|
$s->prepend($self->first());
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = $s->map(function($s) use($pid) {
|
$res = $s->map(function($s) use($pid) {
|
||||||
|
@ -93,7 +118,7 @@ class StoryController extends StoryComposeController
|
||||||
$profile = Profile::findOrFail($id);
|
$profile = Profile::findOrFail($id);
|
||||||
|
|
||||||
if($authed != $profile->id && !FollowerService::follows($authed, $profile->id)) {
|
if($authed != $profile->id && !FollowerService::follows($authed, $profile->id)) {
|
||||||
return [];
|
return abort([], 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
$stories = Story::whereProfileId($profile->id)
|
$stories = Story::whereProfileId($profile->id)
|
||||||
|
@ -164,7 +189,6 @@ class StoryController extends StoryComposeController
|
||||||
$publicOnly = (bool) $profile->followedBy($authed);
|
$publicOnly = (bool) $profile->followedBy($authed);
|
||||||
abort_if(!$publicOnly, 403);
|
abort_if(!$publicOnly, 403);
|
||||||
|
|
||||||
|
|
||||||
$v = StoryView::firstOrCreate([
|
$v = StoryView::firstOrCreate([
|
||||||
'story_id' => $id,
|
'story_id' => $id,
|
||||||
'profile_id' => $authed->id
|
'profile_id' => $authed->id
|
||||||
|
|
|
@ -95,7 +95,8 @@ class StoryService
|
||||||
|
|
||||||
public static function delLatest($pid)
|
public static function delLatest($pid)
|
||||||
{
|
{
|
||||||
return Cache::forget(self::STORY_KEY . 'latest:pid-' . $pid);
|
Cache::forget(self::STORY_KEY . 'latest:pid-' . $pid);
|
||||||
|
return Cache::forget('pf:stories:recent-self:' . $pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function addSeen($pid, $sid)
|
public static function addSeen($pid, $sid)
|
||||||
|
|
BIN
public/js/home.chunk.07ca9c4759ba59dd.js
vendored
BIN
public/js/home.chunk.07ca9c4759ba59dd.js
vendored
Binary file not shown.
BIN
public/js/home.chunk.25bd77760873ee83.js
vendored
Normal file
BIN
public/js/home.chunk.25bd77760873ee83.js
vendored
Normal file
Binary file not shown.
BIN
public/js/manifest.js
vendored
BIN
public/js/manifest.js
vendored
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue