mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-25 01:05:36 +00:00
Update StatusController
This commit is contained in:
parent
c99ec6f648
commit
f0425ca011
1 changed files with 35 additions and 1 deletions
|
@ -9,6 +9,7 @@ use App\Media;
|
||||||
use App\Profile;
|
use App\Profile;
|
||||||
use App\Status;
|
use App\Status;
|
||||||
use App\Transformer\ActivityPub\StatusTransformer;
|
use App\Transformer\ActivityPub\StatusTransformer;
|
||||||
|
use App\Transformer\ActivityPub\Verb\CreateNote;
|
||||||
use App\User;
|
use App\User;
|
||||||
use Auth;
|
use Auth;
|
||||||
use Cache;
|
use Cache;
|
||||||
|
@ -55,6 +56,39 @@ class StatusController extends Controller
|
||||||
return view($template, compact('user', 'status'));
|
return view($template, compact('user', 'status'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function showObject(Request $request, $username, int $id)
|
||||||
|
{
|
||||||
|
$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
|
||||||
|
|
||||||
|
if($user->status != null) {
|
||||||
|
return ProfileController::accountCheck($user);
|
||||||
|
}
|
||||||
|
|
||||||
|
$status = Status::whereProfileId($user->id)
|
||||||
|
->whereNotIn('visibility',['draft','direct'])
|
||||||
|
->findOrFail($id);
|
||||||
|
|
||||||
|
if($status->uri) {
|
||||||
|
$url = $status->uri;
|
||||||
|
if(ends_with($url, '/activity')) {
|
||||||
|
$url = str_replace('/activity', '', $url);
|
||||||
|
}
|
||||||
|
return redirect($url);
|
||||||
|
}
|
||||||
|
|
||||||
|
if($status->visibility == 'private' || $user->is_private) {
|
||||||
|
if(!Auth::check()) {
|
||||||
|
abort(403);
|
||||||
|
}
|
||||||
|
$pid = Auth::user()->profile;
|
||||||
|
if($user->followedBy($pid) == false && $user->id !== $pid->id) {
|
||||||
|
abort(403);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->showActivityPub($request, $status);
|
||||||
|
}
|
||||||
|
|
||||||
public function compose()
|
public function compose()
|
||||||
{
|
{
|
||||||
$this->authCheck();
|
$this->authCheck();
|
||||||
|
@ -213,7 +247,7 @@ class StatusController extends Controller
|
||||||
public function showActivityPub(Request $request, $status)
|
public function showActivityPub(Request $request, $status)
|
||||||
{
|
{
|
||||||
$fractal = new Fractal\Manager();
|
$fractal = new Fractal\Manager();
|
||||||
$resource = new Fractal\Resource\Item($status, new StatusTransformer());
|
$resource = new Fractal\Resource\Item($status, new CreateNote());
|
||||||
$res = $fractal->createData($resource)->toArray();
|
$res = $fractal->createData($resource)->toArray();
|
||||||
|
|
||||||
return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
|
return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
|
||||||
|
|
Loading…
Reference in a new issue