diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index eed4b776..d82db948 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -53,7 +53,7 @@ class Handler extends ExceptionHandler { parent::report($throwable); - if ($this->shouldReport($throwable)) { + if (config('logging.slack') && $this->shouldReport($throwable)) { $guzzle = new Client([ 'headers' => [ 'Content-Type' => 'application/json', diff --git a/app/Http/Controllers/Admin/NotesController.php b/app/Http/Controllers/Admin/NotesController.php index 75a15231..31ad4822 100644 --- a/app/Http/Controllers/Admin/NotesController.php +++ b/app/Http/Controllers/Admin/NotesController.php @@ -41,13 +41,14 @@ class NotesController extends Controller /** * Process a request to make a new note. * - * @return \Illuminate\Http\RedirectResponse + * @param Request $request + * @return RedirectResponse */ - public function store(): RedirectResponse + public function store(Request $request): RedirectResponse { Note::create([ - 'in-reply-to' => request()->input('in-reply-to'), - 'note' => request()->input('content'), + 'in_reply_to' => $request->input('in-reply-to'), + 'note' => $request->input('content'), ]); return redirect('/admin/notes'); diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php index a1468cbb..eb8c1a17 100644 --- a/app/Http/Controllers/FeedsController.php +++ b/app/Http/Controllers/FeedsController.php @@ -111,7 +111,7 @@ class FeedsController extends Controller */ public function notesJson() { - $notes = Note::latest()->take(20)->get(); + $notes = Note::latest()->with('media')->take(20)->get(); $data = [ 'version' => 'https://jsonfeed.org/version/1', 'title' => 'The JSON Feed for ' . config('app.display_name') . '’s notes', diff --git a/app/Http/Controllers/FrontPageController.php b/app/Http/Controllers/FrontPageController.php index 05731663..bcf82af4 100644 --- a/app/Http/Controllers/FrontPageController.php +++ b/app/Http/Controllers/FrontPageController.php @@ -23,7 +23,7 @@ class FrontPageController extends Controller return (new ActivityStreamsService())->siteOwnerResponse(); } - $notes = Note::latest()->get(); + $notes = Note::latest()->with(['media', 'client', 'place'])->get(); $articles = Article::latest()->get(); $bookmarks = Bookmark::latest()->get(); $likes = Like::latest()->get(); diff --git a/app/Models/Note.php b/app/Models/Note.php index b37f914c..c6639901 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -141,7 +141,6 @@ class Note extends Model * * @return array */ - #[ArrayShape(['note' => 'null|string'])] public function toSearchableArray(): array { return [ @@ -190,7 +189,7 @@ class Note extends Model /** * Provide the content_html for JSON feed. * - * In particular we want to include media links such as images. + * In particular, we want to include media links such as images. * * @return string */ diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9a14487b..f75ee2ae 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -5,6 +5,7 @@ namespace App\Providers; use App\Models\Note; use App\Observers\NoteObserver; use Codebird\Codebird; +use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -102,6 +103,9 @@ class AppServiceProvider extends ServiceProvider ->forceAttribute('a', 'rel', 'noopener nofollow') ); }); + + // Turn on Eloquent strict mode when developing + Model::shouldBeStrict(! $this->app->isProduction()); } /** diff --git a/resources/views/templates/mini-hcard.blade.php b/resources/views/templates/mini-hcard.blade.php index 6ec30989..11f99ad8 100644 --- a/resources/views/templates/mini-hcard.blade.php +++ b/resources/views/templates/mini-hcard.blade.php @@ -1 +1 @@ -{!! $contact->name !!}@if ($contact->facebook) {{ $contact->facebook_name ?: 'Facebook' }}@endif @if ($contact->twitter) {{ $contact->twitter }}@endif +{!! $contact->name !!}@if ($contact->facebook) Facebook@endif @if ($contact->twitter) {{ $contact->twitter }}@endif diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index ebb2cbe4..3e0c542d 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -9,10 +9,10 @@
{!! $note->note !!} @foreach($note->media as $media) -@if($media->type == 'image') image_widths !== null) srcset="{{ $media->url }} {{ $media->image_widths }}w, {{ $media->mediumurl }} 1000w, {{ $media->smallurl }} 500w" sizes="80vh"@endif>@endif -@if($media->type == 'audio')
@if ($note->twitter_content) @@ -25,7 +25,6 @@ @if($note->client) via {{ $note->client->client_name }}@endif @if($note->place)@if($note->getOriginal('note')) in {{ $note->address }}@endif @elseif($note->address) in {!! $note->address !!}@endif -@if($note->replies_count > 0) @include('templates.replies-icon'): {{ $note->replies_count }}@endif
diff --git a/tests/Feature/Admin/NotesTest.php b/tests/Feature/Admin/NotesTest.php index 26b9ac0e..ac60004b 100644 --- a/tests/Feature/Admin/NotesTest.php +++ b/tests/Feature/Admin/NotesTest.php @@ -41,6 +41,7 @@ class NotesTest extends TestCase $this->actingAs($user)->post('/admin/notes', [ 'content' => 'A new test note', ]); + $this->assertDatabaseHas('notes', [ 'note' => 'A new test note', ]);