mirror of https://github.com/pixelfed/pixelfed.git
commit
e36d7da841
|
@ -10,6 +10,7 @@
|
|||
### Updates
|
||||
- Update FollowerService, add forget method to RelationshipService call to reduce load when mass purging ([347e4f59](https://github.com/pixelfed/pixelfed/commit/347e4f59))
|
||||
- Update FollowServiceWarmCache, improve handling larger following/follower lists ([61a6d904](https://github.com/pixelfed/pixelfed/commit/61a6d904))
|
||||
- Update StoryApiV1Controller, add viewers route to view story viewers ([941736ce](https://github.com/pixelfed/pixelfed/commit/941736ce))
|
||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||
|
||||
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)
|
||||
|
|
|
@ -643,7 +643,7 @@ trait AdminReportController
|
|||
$q->whereNull('admin_seen') :
|
||||
$q->whereNotNull('admin_seen');
|
||||
})
|
||||
->groupBy(['object_id', 'object_type'])
|
||||
->groupBy(['id', 'object_id', 'object_type'])
|
||||
->cursorPaginate(6)
|
||||
->withQueryString()
|
||||
);
|
||||
|
|
|
@ -415,7 +415,7 @@ class ComposeController extends Controller
|
|||
$results = Profile::select('id','domain','username')
|
||||
->whereNotIn('id', $blocked)
|
||||
->where('username','like','%'.$q.'%')
|
||||
->groupBy('domain')
|
||||
->groupBy('id', 'domain')
|
||||
->limit(15)
|
||||
->get()
|
||||
->map(function($profile) {
|
||||
|
|
|
@ -20,6 +20,7 @@ use App\Jobs\StoryPipeline\StoryViewDeliver;
|
|||
use App\Services\AccountService;
|
||||
use App\Services\MediaPathService;
|
||||
use App\Services\StoryService;
|
||||
use App\Http\Resources\StoryView as StoryViewResource;
|
||||
|
||||
class StoryApiV1Controller extends Controller
|
||||
{
|
||||
|
@ -355,4 +356,26 @@ class StoryApiV1Controller extends Controller
|
|||
$path = $photo->storePubliclyAs($storagePath, Str::random(random_int(2, 12)) . '_' . Str::random(random_int(32, 35)) . '_' . Str::random(random_int(1, 14)) . '.' . $photo->extension());
|
||||
return $path;
|
||||
}
|
||||
|
||||
public function viewers(Request $request)
|
||||
{
|
||||
abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
|
||||
|
||||
$this->validate($request, [
|
||||
'sid' => 'required|string|min:1|max:50'
|
||||
]);
|
||||
|
||||
$pid = $request->user()->profile_id;
|
||||
$sid = $request->input('sid');
|
||||
|
||||
$story = Story::whereProfileId($pid)
|
||||
->whereActive(true)
|
||||
->findOrFail($sid);
|
||||
|
||||
$viewers = StoryView::whereStoryId($story->id)
|
||||
->orderByDesc('id')
|
||||
->cursorPaginate(10);
|
||||
|
||||
return StoryViewResource::collection($viewers);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use App\Services\AccountService;
|
||||
|
||||
class StoryView extends JsonResource
|
||||
{
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function toArray(Request $request)
|
||||
{
|
||||
return AccountService::get($this->profile_id, true);
|
||||
}
|
||||
}
|
|
@ -120,6 +120,9 @@ class InstanceService
|
|||
$pixels[] = $row;
|
||||
}
|
||||
|
||||
// Free the allocated GdImage object from memory:
|
||||
imagedestroy($image);
|
||||
|
||||
$components_x = 4;
|
||||
$components_y = 4;
|
||||
$blurhash = Blurhash::encode($pixels, $components_x, $components_y);
|
||||
|
|
|
@ -44,6 +44,9 @@ class Blurhash {
|
|||
$pixels[] = $row;
|
||||
}
|
||||
|
||||
// Free the allocated GdImage object from memory:
|
||||
imagedestroy($image);
|
||||
|
||||
$components_x = 4;
|
||||
$components_y = 4;
|
||||
$blurhash = BlurhashEngine::encode($pixels, $components_x, $components_y);
|
||||
|
@ -53,4 +56,4 @@ class Blurhash {
|
|||
return $blurhash;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -316,6 +316,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
|
|||
Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware);
|
||||
Route::post('self-expire/{id}', 'Stories\StoryApiV1Controller@delete')->middleware($middleware);
|
||||
Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware);
|
||||
Route::get('viewers', 'Stories\StoryApiV1Controller@viewers')->middleware($middleware);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue