jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Change some first Eloquent methods to firstOrFail

Browse source
This commit is contained in:
Jonny Barnes 2017-08-09 22:15:45 +01:00
parent e3fff4b9a8
commit 64f541d30d
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ArticlesController.php
View file

@ -29,7 +29,7 @@ class ArticlesController extends Controller
*/ */
public function show($year, $month, $slug) public function show($year, $month, $slug)
{ {
$article = Article::where('titleurl', $slug)->first(); $article = Article::where('titleurl', $slug)->firstOrFail();
if ($article->updated_at->year != $year || $article->updated_at->month != $month) { if ($article->updated_at->year != $year || $article->updated_at->month != $month) {
throw new \Exception; throw new \Exception;
} }

2
app/Http/Controllers/MicropubClientController.php
View file

@ -269,7 +269,7 @@ class MicropubClientController extends Controller
]; ];
if ($request->session()->has('me')) { if ($request->session()->has('me')) {
$data['me'] = normalize_url($request->session()->get('me')); $data['me'] = normalize_url($request->session()->get('me'));
$user = IndieWebUser::where('me', $request->session()->get('me'))->first(); $user = IndieWebUser::where('me', $request->session()->get('me'))->firstOrFail();
$data['token'] = $user->token ?? 'none defined'; $data['token'] = $user->token ?? 'none defined';
$data['syndication'] = $user->syndication ?? 'none defined'; $data['syndication'] = $user->syndication ?? 'none defined';
$data['media-endpoint'] = $user->mediaEndpoint ?? 'none defined'; $data['media-endpoint'] = $user->mediaEndpoint ?? 'none defined';

5
app/Http/Controllers/MicropubController.php
View file

@ -9,6 +9,7 @@ use Monolog\Handler\StreamHandler;
use Illuminate\Http\{Request, Response}; use Illuminate\Http\{Request, Response};
use App\Exceptions\InvalidTokenException; use App\Exceptions\InvalidTokenException;
use Phaza\LaravelPostgis\Geometries\Point; use Phaza\LaravelPostgis\Geometries\Point;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
use App\Services\{NoteService, PlaceService, TokenService}; use App\Services\{NoteService, PlaceService, TokenService};
@ -214,8 +215,8 @@ class MicropubController extends Controller
//is it a note we are updating? //is it a note we are updating?
if (mb_substr($urlPath, 1, 5) === 'notes') { if (mb_substr($urlPath, 1, 5) === 'notes') {
try { try {
$note = Note::nb60(basename($urlPath))->first(); $note = Note::nb60(basename($urlPath))->firstOrFail();
} catch (\Exception $exception) { } catch (ModelNotFoundException $exception) {
return response()->json([ return response()->json([
'error' => 'invalid_request', 'error' => 'invalid_request',
'error_description' => 'No known note with given ID', 'error_description' => 'No known note with given ID',

2
app/Http/Controllers/NotesController.php
View file

@ -35,7 +35,7 @@ class NotesController extends Controller
*/ */
public function show($urlId) public function show($urlId)
{ {
$note = Note::nb60($urlId)->with('webmentions')->first(); $note = Note::nb60($urlId)->with('webmentions')->firstOrFail();
return view('notes.show', compact('note')); return view('notes.show', compact('note'));
} }