Merge pull request #293 from jonnybarnes/develop

MTM Mentions Improvements

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/phpunit.yml

@@ -0,0 +1,68 @@
+name: PHP Unit
+
+on:
+  pull_request:
+
+jobs:
+  phpunit:
+    runs-on: ubuntu-latest
+
+    name: PHPUnit test suite
+
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: jbukdev_testing
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Node and dependencies
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'npm'
+      - run: npm ci
+
+      - name: Setup PHP with pecl extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: phpredis,imagick
+
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.github', '.env');"
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer Dependencies
+        run: composer install --quiet --no-ansi --no-interaction --no-progress
+
+      - name: Generate Key
+        run: php artisan key:generate
+
+      - name: Setup Directory Permissions
+        run: chmod -R 777 storage bootstrap/cache
+
+      - name: Setup Database
+        run: php artisan migrate
+
+      - name: Execute PHPUnit Tests
+        run: vendor/bin/phpunit

.github/workflows/pint.yml

@@ -0,0 +1,38 @@
+name: Laravel Pint
+
+on:
+  pull_request:
+
+jobs:
+  pint:
+    runs-on: ubuntu-latest
+
+    name: Laravel Pint
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP with pecl extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer Dependencies
+        run: composer install --quiet --no-ansi --no-interaction --no-progress
+
+      - name: Check Files with Laravel Pint
+        run: vendor/bin/pint --test

.github/workflows/run-tests.yml

@@ -1,49 +0,0 @@
-name: Run Tests
-
-on:
-  pull_request:
-
-jobs:
-  phpunit:
-    runs-on: ubuntu-20.04
-
-    name: PHPUnit test suite
-
-    services:
-      postgres:
-        image: postgres:13.4
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: jbukdev_testing
-        ports:
-          - 5432:5432
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
-      - name: Install npm dependencies
-        run: npm install
-      - name: Setup PHP with pecl extension
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phpcs
-      - name: Copy .env
-        run: php -r "file_exists('.env') || copy('.env.github', '.env');"
-      - name: Install dependencies
-        run: composer install --quiet --no-ansi --no-interaction --no-progress
-      - name: Generate key
-        run: php artisan key:generate
-      - name: Setup directory permissions
-        run: chmod -R 777 storage bootstrap/cache
-      - name: Setup test database
-        run: php artisan migrate
-      - name: Execute tests (Unit and Feature tests) via PHPUnit
-        run: vendor/bin/phpunit
-      - name: Run phpcs
-        run: phpcs

app/CommonMark/Generators/ContactMentionGenerator.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\CommonMark\Generators;
+
+use League\CommonMark\Extension\Mention\Generator\MentionGeneratorInterface;
+use League\CommonMark\Extension\Mention\Mention;
+use League\CommonMark\Node\Inline\AbstractInline;
+
+class ContactMentionGenerator implements MentionGeneratorInterface
+{
+    public function generateMention(Mention $mention): ?AbstractInline
+    {
+        return $mention;
+    }
+}

app/CommonMark/Renderers/ContactMentionRenderer.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\CommonMark\Renderers;
+
+use App\Models\Contact;
+use League\CommonMark\Node\Node;
+use League\CommonMark\Renderer\ChildNodeRendererInterface;
+use League\CommonMark\Renderer\NodeRendererInterface;
+
+class ContactMentionRenderer implements NodeRendererInterface
+{
+    public function render(Node $node, ChildNodeRendererInterface $childRenderer): string
+    {
+        $contact = Contact::where('nick', $node->getIdentifier())->first();
+
+        if ($contact === null) {
+            return '<a href="https://twitter.com/' . $node->getIdentifier() . '">@' . $node->getIdentifier() . '</a>';
+        }
+
+        return trim(view('templates.mini-hcard', ['contact' => $contact])->render());
+    }
+}

app/Exceptions/Handler.php

@@ -45,6 +45,7 @@ class Handler extends ExceptionHandler
      *
      * @param  Throwable  $throwable
      * @return void
+     *
      * @throws Exception
      * @throws Throwable
      */
@@ -90,6 +91,7 @@ class Handler extends ExceptionHandler
      * @param  Request  $request
      * @param  Throwable  $throwable
      * @return Response
+     *
      * @throws Throwable
      */
     public function render($request, Throwable $throwable)

app/Http/Controllers/FeedsController.php

@@ -4,7 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers;
 
-use App\Models\{Article, Note};
+use App\Models\Article;
+use App\Models\Note;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 

app/Http/Controllers/MicropubController.php

@@ -6,7 +6,9 @@ namespace App\Http\Controllers;
 
 use App\Http\Responses\MicropubResponses;
 use App\Models\Place;
-use App\Services\Micropub\{HCardService, HEntryService, UpdateService};
+use App\Services\Micropub\HCardService;
+use App\Services\Micropub\HEntryService;
+use App\Services\Micropub\UpdateService;
 use App\Services\TokenService;
 use Illuminate\Http\JsonResponse;
 use Lcobucci\JWT\Encoding\CannotDecodeContent;
@@ -18,8 +20,11 @@ use Monolog\Logger;
 class MicropubController extends Controller
 {
     protected TokenService $tokenService;
+
     protected HEntryService $hentryService;
+
     protected HCardService $hcardService;
+
     protected UpdateService $updateService;
 
     public function __construct(
@@ -168,6 +173,7 @@ class MicropubController extends Controller
      * Determine the client id from the access token sent with the request.
      *
      * @return string
+     *
      * @throws RequiredConstraintsViolated
      */
     private function getClientId(): string

app/Http/Controllers/MicropubMediaController.php

@@ -97,6 +97,7 @@ class MicropubMediaController extends Controller
      * Process a media item posted to the media endpoint.
      *
      * @return JsonResponse
+     *
      * @throws BindingResolutionException
      * @throws Exception
      */
@@ -231,6 +232,7 @@ class MicropubMediaController extends Controller
      *
      * @param  UploadedFile  $file
      * @return string
+     *
      * @throws Exception
      */
     private function saveFile(UploadedFile $file): string

app/Jobs/DownloadWebMention.php

@@ -40,6 +40,7 @@ class DownloadWebMention implements ShouldQueue
      * Execute the job.
      *
      * @param  Client  $guzzle
+     *
      * @throws GuzzleException
      * @throws FileNotFoundException
      */

app/Jobs/ProcessLike.php

@@ -44,6 +44,7 @@ class ProcessLike implements ShouldQueue
      * @param  Client  $client
      * @param  Authorship  $authorship
      * @return int
+     *
      * @throws GuzzleException
      */
     public function handle(Client $client, Authorship $authorship): int

app/Jobs/ProcessWebMention.php

@@ -5,13 +5,15 @@ declare(strict_types=1);
 namespace App\Jobs;
 
 use App\Exceptions\RemoteContentNotFoundException;
-use App\Models\{Note, WebMention};
+use App\Models\Note;
+use App\Models\WebMention;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\{InteractsWithQueue, SerializesModels};
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 use Jonnybarnes\WebmentionsParser\Exceptions\InvalidMentionException;
 use Jonnybarnes\WebmentionsParser\Parser;
 use Mf2;
@@ -45,6 +47,7 @@ class ProcessWebMention implements ShouldQueue
      *
      * @param  Parser  $parser
      * @param  Client  $guzzle
+     *
      * @throws RemoteContentNotFoundException
      * @throws GuzzleException
      * @throws InvalidMentionException

app/Jobs/SyndicateBookmarkToTwitter.php

@@ -37,6 +37,7 @@ class SyndicateBookmarkToTwitter implements ShouldQueue
      * Execute the job.
      *
      * @param  Client  $guzzle
+     *
      * @throws GuzzleException
      */
     public function handle(Client $guzzle)

app/Jobs/SyndicateNoteToTwitter.php

@@ -35,6 +35,7 @@ class SyndicateNoteToTwitter implements ShouldQueue
      * Execute the job.
      *
      * @param  Client  $guzzle
+     *
      * @throws GuzzleException
      */
     public function handle(Client $guzzle)

app/Models/Article.php

@@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use League\CommonMark\CommonMarkConverter;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode;

app/Models/Bookmark.php

@@ -26,6 +26,7 @@ use Illuminate\Support\Carbon;
  * @property-read string $longurl
  * @property-read Collection|Tag[] $tags
  * @property-read int|null $tags_count
+ *
  * @method static Builder|Bookmark newModelQuery()
  * @method static Builder|Bookmark newQuery()
  * @method static Builder|Bookmark query()

app/Models/Contact.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
 
 class Contact extends Model
 {
@@ -26,4 +25,20 @@ class Contact extends Model
      * @var array
      */
     protected $fillable = ['nick', 'name', 'homepage', 'twitter', 'facebook'];
+
+    protected function photo(): Attribute
+    {
+        $photo = '/assets/profile-images/default-image';
+
+        if (array_key_exists('homepage', $this->attributes) && ! empty($this->attributes['homepage'])) {
+            $host = parse_url($this->attributes['homepage'], PHP_URL_HOST);
+            if (file_exists(public_path() . '/assets/profile-images/' . $host . '/image')) {
+                $photo = '/assets/profile-images/' . $host . '/image';
+            }
+        }
+
+        return Attribute::make(
+            get: fn () => $photo,
+        );
+    }
 }

app/Models/Like.php

@@ -5,11 +5,9 @@ declare(strict_types=1);
 namespace App\Models;
 
 use App\Traits\FilterHtml;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
 use Mf2;
 
 class Like extends Model

app/Models/Media.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 class Media extends Model

app/Models/MicropubClient.php

@@ -4,12 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Carbon;
 
 class MicropubClient extends Model
 {

app/Models/Note.php

@@ -4,13 +4,20 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\CommonMark\Generators\ContactMentionGenerator;
+use App\CommonMark\Renderers\ContactMentionRenderer;
 use App\Exceptions\TwitterContentException;
-use Barryvdh\LaravelIdeHelper\Eloquent;
 use Codebird\Codebird;
 use Exception;
 use GuzzleHttp\Client;
-use Illuminate\Database\Eloquent\Relations\{BelongsTo, BelongsToMany, HasMany, MorphMany};
+use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\{Builder, Factories\HasFactory, Model, SoftDeletes};
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Cache;
 use JetBrains\PhpStorm\ArrayShape;
 use Jonnybarnes\IndieWeb\Numbers;
@@ -19,9 +26,12 @@ use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode;
 use League\CommonMark\Extension\CommonMark\Node\Block\IndentedCode;
+use League\CommonMark\Extension\Mention\Mention;
+use League\CommonMark\Extension\Mention\MentionExtension;
 use League\CommonMark\MarkdownConverter;
 use Normalizer;
-use Spatie\CommonMarkHighlighter\{FencedCodeRenderer, IndentedCodeRenderer};
+use Spatie\CommonMarkHighlighter\FencedCodeRenderer;
+use Spatie\CommonMarkHighlighter\IndentedCodeRenderer;
 
 class Note extends Model
 {
@@ -131,7 +141,7 @@ class Note extends Model
      *
      * @return array
      */
-    #[ArrayShape(['note' => "null|string"])]
+    #[ArrayShape(['note' => 'null|string'])]
     public function toSearchableArray(): array
     {
         return [
@@ -172,8 +182,7 @@ class Note extends Model
             return null;
         }
 
-        $hcards = $this->makeHCards($value);
+        $hashtags = $this->autoLinkHashtag($value);
-        $hashtags = $this->autoLinkHashtag($hcards);
 
         return $this->convertMarkdown($hashtags);
     }
@@ -373,13 +382,16 @@ class Note extends Model
      * That is we swap the contacts names for their known Twitter handles.
      *
      * @return string
+     *
      * @throws TwitterContentException
      */
     public function getTwitterContentAttribute(): string
     {
+        $this->getContacts();
+
         // check for contacts
         if ($this->contacts === null || count($this->contacts) === 0) {
-            throw new TwitterContentException('There are no contacts for this note');
+            return '';
         }
 
         // here we check the matched contact from the note corresponds to a contact
@@ -388,10 +400,10 @@ class Note extends Model
             count(array_unique(array_values($this->contacts))) === 1
             && array_unique(array_values($this->contacts))[0] === null
         ) {
-            throw new TwitterContentException('The matched contact is not in the database');
+            return '';
         }
 
-        // swap in twitter usernames
+        // swap in Twitter usernames
         $swapped = preg_replace_callback(
             self::USERNAMES_REGEX,
             function ($matches) {
@@ -406,7 +418,7 @@ class Note extends Model
 
                 return $contact->name;
             },
-            $this->getOriginal('note')
+            $this->getRawOriginal('note')
         );
 
         return $this->convertMarkdown($swapped);
@@ -527,9 +539,21 @@ class Note extends Model
      */
     private function convertMarkdown(string $note): string
     {
-        $environment = new Environment();
+        $config = [
+            'mentions' => [
+                'contacts_handle' => [
+                    'prefix' => '@',
+                    'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
+                    'generator' => new ContactMentionGenerator(),
+                ],
+            ],
+        ];
+
+        $environment = new Environment($config);
         $environment->addExtension(new CommonMarkCoreExtension());
         $environment->addExtension(new AutolinkExtension());
+        $environment->addExtension(new MentionExtension());
+        $environment->addRenderer(Mention::class, new ContactMentionRenderer());
         $environment->addRenderer(FencedCode::class, new FencedCodeRenderer());
         $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer());
         $markdownConverter = new MarkdownConverter($environment);

app/Models/Place.php

@@ -5,9 +5,10 @@ declare(strict_types=1);
 namespace App\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\{Builder, Collection, Factories\HasFactory, Model};
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 class Place extends Model

app/Models/Tag.php

@@ -4,12 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 class Tag extends Model

app/Models/User.php

@@ -4,13 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\DatabaseNotification;
-use Illuminate\Notifications\DatabaseNotificationCollection;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Carbon;
 
 class User extends Authenticatable
 {

app/Models/WebMention.php

@@ -6,12 +6,10 @@ namespace App\Models;
 
 use App\Traits\FilterHtml;
 use Codebird\Codebird;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Jonnybarnes\WebmentionsParser\Authorship;
 use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
@@ -49,6 +47,7 @@ class WebMention extends Model
      * Get the author of the webmention.
      *
      * @return array
+     *
      * @throws AuthorshipParserException
      */
     public function getAuthorAttribute(): array

app/Observers/NoteObserver.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 
 namespace App\Observers;
 
-use App\Models\{Note, Tag};
+use App\Models\Note;
-use Illuminate\Support\{Arr, Collection};
+use App\Models\Tag;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 
 class NoteObserver
 {

app/Services/BookmarkService.php

@@ -7,10 +7,12 @@ namespace App\Services;
 use App\Exceptions\InternetArchiveException;
 use App\Jobs\ProcessBookmark;
 use App\Jobs\SyndicateBookmarkToTwitter;
-use App\Models\{Bookmark, Tag};
+use App\Models\Bookmark;
+use App\Models\Tag;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
-use Illuminate\Support\{Arr, Str};
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Ramsey\Uuid\Uuid;
 use Spatie\Browsershot\Browsershot;
 use Spatie\Browsershot\Exceptions\CouldNotTakeBrowsershot;
@@ -83,6 +85,7 @@ class BookmarkService
      *
      * @param  string  $url
      * @return string  The uuid for the screenshot
+     *
      * @throws CouldNotTakeBrowsershot
      * @codeCoverageIgnore
      */
@@ -106,6 +109,7 @@ class BookmarkService
      *
      * @param  string  $url
      * @return string
+     *
      * @throws InternetArchiveException
      */
     public function getArchiveLink(string $url): string

app/Services/Micropub/HEntryService.php

@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace App\Services\Micropub;
 
-use App\Services\{BookmarkService, LikeService, NoteService};
+use App\Services\BookmarkService;
+use App\Services\LikeService;
+use App\Services\NoteService;
 use Illuminate\Support\Arr;
 
 class HEntryService

app/Services/Micropub/UpdateService.php

@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace App\Services\Micropub;
 
-use App\Models\{Media, Note};
+use App\Models\Media;
+use App\Models\Note;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\{Arr, Str};
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class UpdateService
 {

app/Services/NoteService.php

@@ -4,9 +4,13 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Jobs\{SendWebMentions, SyndicateNoteToTwitter};
+use App\Jobs\SendWebMentions;
-use App\Models\{Media, Note, Place};
+use App\Jobs\SyndicateNoteToTwitter;
-use Illuminate\Support\{Arr, Str};
+use App\Models\Media;
+use App\Models\Note;
+use App\Models\Place;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class NoteService
 {

app/Services/TokenService.php

@@ -6,7 +6,8 @@ namespace App\Services;
 
 use App\Jobs\AddClientToDatabase;
 use DateTimeImmutable;
-use Lcobucci\JWT\{Configuration, Token};
+use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Token;
 
 class TokenService
 {

composer.json

@@ -28,7 +28,6 @@
         "league/commonmark": "^2.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "mf2/mf2": "~0.3",
-        "predis/predis": "~1.0",
         "spatie/browsershot": "~3.0",
         "spatie/commonmark-highlighter": "^3.0",
         "symfony/html-sanitizer": "^6.1"
@@ -39,6 +38,7 @@
         "beyondcode/laravel-dump-server": "^1.0",
         "fakerphp/faker": "^1.9.2",
         "laravel/dusk": "^6.0",
+        "laravel/pint": "^0.2.3",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^6.1",
         "phpunit/php-code-coverage": "^9.2",

config/debugbar.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
 
     /*
      |--------------------------------------------------------------------------
@@ -26,12 +26,12 @@ return array(
      | can also be used. For PDO, run the package migrations first.
      |
      */
-    'storage' => array(
+    'storage' => [
         'enabled' => true,
         'driver' => 'file', // redis, file, pdo
         'path' => storage_path() . '/debugbar', // For file driver
         'connection' => null,   // Leave null for default connection (Redis/PDO)
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -70,7 +70,7 @@ return array(
      |
      */
 
-    'collectors' => array(
+    'collectors' => [
         'phpinfo' => true,  // Php version
         'messages' => true,  // Messages
         'time' => true,  // Time Datalogger
@@ -90,7 +90,7 @@ return array(
         'config' => false, // Display config settings
         'auth' => false, // Display Laravel authentication status
         'session' => false, // Display session data in a separate tab
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -101,33 +101,33 @@ return array(
      |
      */
 
-    'options' => array(
+    'options' => [
-        'auth' => array(
+        'auth' => [
             'show_name' => false,   // Also show the users name/email in the debugbar
-        ),
+        ],
-        'db' => array(
+        'db' => [
             'with_params' => true,   // Render SQL with the parameters substituted
             'timeline' => false,  // Add the queries to the timeline
             'backtrace' => false,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
-            'explain' => array(            // EXPERIMENTAL: Show EXPLAIN output on queries
+            'explain' => [            // EXPERIMENTAL: Show EXPLAIN output on queries
                 'enabled' => false,
-                'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
+                'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
-            ),
+            ],
             'hints' => true,    // Show hints for common mistakes
-        ),
+        ],
-        'mail' => array(
+        'mail' => [
-            'full_log' => false
+            'full_log' => false,
-        ),
+        ],
-        'views' => array(
+        'views' => [
             'data' => false,    //Note: Can slow down the application, because the data can be quite large..
-        ),
+        ],
-        'route' => array(
+        'route' => [
-            'label' => true  // show complete route on bar
+            'label' => true,  // show complete route on bar
-        ),
+        ],
-        'logs' => array(
+        'logs' => [
-            'file' => null
+            'file' => null,
-        ),
+        ],
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -142,4 +142,4 @@ return array(
 
     'inject' => true,
 
-);
+];

config/sluggable.php

@@ -17,7 +17,6 @@ return [
      *
      * Defaults to null, which uses the toString() method on your model.
      */
-
     'source' => null,
 
     /**
@@ -25,7 +24,6 @@ return [
      * no length restrictions are enforced.  Set it to a positive integer if you
      * want to make sure your slugs aren't too long.
      */
-
     'maxLength' => null,
 
     /**
@@ -43,13 +41,11 @@ return [
      *
      *    'method' => array('Str','slug'),
      */
-
     'method' => null,
 
     /**
      * Separator to use when generating slugs.  Defaults to a hyphen.
      */
-
     'separator' => '-',
 
     /**
@@ -61,7 +57,6 @@ return [
      *     my-slug-1
      *     my-slug-2
      */
-
     'unique' => true,
 
     /**
@@ -72,7 +67,6 @@ return [
      * "similar" slugs.  The closure should return the new unique
      * suffix to append to the slug.
      */
-    
     'uniqueSuffix' => null,
 
     /**
@@ -81,7 +75,6 @@ return [
      * If set to "false", then a new slug could duplicate one that exists on a trashed model.
      * If set to "true", then uniqueness is enforced across trashed and existing models.
      */
-
     'includeTrashed' => false,
 
     /**
@@ -107,7 +100,6 @@ return [
      *
      * and continue from there.
      */
-
     'reserved' => null,
 
     /**
@@ -120,7 +112,6 @@ return [
      * is probably not a good idea from an SEO point of view.
      * Only set this to true if you understand the possible consequences.
      */
-    
     'onUpdate' => false,
 
 ];

config/syndication.php

@@ -22,5 +22,5 @@ return [
                 'photo' => 'https://pbs.twimg.com/profile_images/875422855932121089/W628ZI8w_400x400.jpg',
             ],
         ],
-    ]
+    ],
 ];

config/url.php

@@ -7,5 +7,5 @@
 
 return [
     'longurl' => env('APP_LONGURL', 'jonnybarnes.uk'),
-    'shorturl' => env('APP_SHORTURL', 'jmb.lv')
+    'shorturl' => env('APP_SHORTURL', 'jmb.lv'),
 ];

database/factories/NoteFactory.php

@@ -20,6 +20,7 @@ class NoteFactory extends Factory
      * Define the model's default state.
      *
      * @return array
+     *
      * @throws Exception
      */
     public function definition()

database/migrations/2015_02_28_132629_create_articles_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateArticlesTable extends Migration
 {

database/migrations/2015_02_28_144939_create_notes_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateNotesTable extends Migration
 {

database/migrations/2015_03_02_084342_create_tags_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateTagsTable extends Migration
 {

database/migrations/2015_03_02_084956_create_note_tag_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateNoteTagTable extends Migration
 {

database/migrations/2015_03_02_105623_create_contacts_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateContactsTable extends Migration
 {

database/migrations/2015_03_02_114340_create_web_mentions_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateWebMentionsTable extends Migration
 {
@@ -12,8 +12,7 @@ class CreateWebMentionsTable extends Migration
      */
     public function up()
     {
-        Schema::create('webmentions', function (Blueprint $table)
+        Schema::create('webmentions', function (Blueprint $table) {
-        {
             $table->increments('id');
             $table->string('source');
             $table->string('target');

database/migrations/2015_07_17_111512_create_clients_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateClientsTable extends Migration
 {

database/migrations/2015_07_22_084423_create_failed_jobs_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateFailedJobsTable extends Migration
 {

database/migrations/2015_10_08_155111_create_media_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateMediaTable extends Migration
 {
@@ -25,6 +25,7 @@ class CreateMediaTable extends Migration
             $table->timestamps();
         });
     }
+
     /**
      * Reverse the migrations.
      */

database/migrations/2015_11_07_130637_create_places_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreatePlacesTable extends Migration
 {

database/migrations/2015_11_19_221933_add_place_relation_to_notes.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class AddPlaceRelationToNotes extends Migration
 {

database/migrations/2016_07_29_113150_add_jsonb_mf2_column_to_webmentions_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class AddJsonbMf2ColumnToWebmentionsTable extends Migration
 {

database/migrations/2016_09_06_152900_add_exception_column_to_failed_jobs_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class AddExceptionColumnToFailedJobsTable extends Migration
 {

database/migrations/2016_09_30_214651_cascade_delete_note_tags.php

@@ -1,8 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CascadeDeleteNoteTags extends Migration
 {

database/migrations/2016_10_26_170858_add_facebook_url_column_to_notes.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddFacebookUrlColumnToNotes extends Migration
 {

database/migrations/2016_11_23_154939_add_facebook_to_contacts.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddFacebookToContacts extends Migration
 {

database/migrations/2016_12_05_204035_add_search_to_notes.php

@@ -1,9 +1,9 @@
 <?php
 
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 
 class AddSearchToNotes extends Migration
 {

database/migrations/2016_12_28_160024_add_icon_to_places.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddIconToPlaces extends Migration
 {

database/migrations/2017_03_09_155908_create_media_endpoint_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateMediaEndpointTable extends Migration
 {

database/migrations/2017_03_28_130855_create_indie_web_users_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateIndieWebUsersTable extends Migration
 {

database/migrations/2017_04_25_203734_update_notes_table_add_swarm_url.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdateNotesTableAddSwarmUrl extends Migration
 {

database/migrations/2017_05_12_135451_update_places_table_add_foursquare_column.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdatePlacesTableAddFoursquareColumn extends Migration
 {

database/migrations/2017_06_11_193737_update_notes_table_add_instagram_url.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdateNotesTableAddInstagramUrl extends Migration
 {

database/migrations/2017_06_27_164743_update_places_table_add_external_urls.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdatePlacesTableAddExternalUrls extends Migration
 {

database/migrations/2017_08_09_181357_allow_empty_note_content.php

@@ -1,9 +1,9 @@
 <?php
 
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 
 class AllowEmptyNoteContent extends Migration
 {

database/migrations/2017_09_15_081131_update_media_endpoint_table_add_nullable_image_width_column.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdateMediaEndpointTableAddNullableImageWidthColumn extends Migration
 {

database/migrations/2017_09_16_191741_create_likes_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateLikesTable extends Migration
 {

database/migrations/2017_10_07_163425_create_bookmarks_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateBookmarksTable extends Migration
 {

database/migrations/2017_10_07_164651_create_bookmark_tag_pivot_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateBookmarkTagPivotTable extends Migration
 {

database/migrations/2017_12_19_160117_update_models_reference_in_webmentions_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class UpdateModelsReferenceInWebmentionsTable extends Migration
 {

database/migrations/2018_08_08_100000_create_telescope_entries_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateTelescopeEntriesTable extends Migration
 {

database/migrations/2019_03_20_181657_create_users_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {

database/seeders/ArticlesTableSeeder.php

@@ -3,8 +3,8 @@
 namespace Database\Seeders;
 
 use App\Models\Article;
-use Illuminate\Support\Carbon;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class ArticlesTableSeeder extends Seeder
@@ -28,7 +28,7 @@ class ArticlesTableSeeder extends Seeder
             ->update(['updated_at' => $now->toDateTimeString()]);
 
         $now = Carbon::now()->subHours(2)->subMinutes(25);
-        $articleWithCode = <<<EOF
+        $articleWithCode = <<<'EOF'
 I wrote some code.
 
 I liked writing this:

database/seeders/BookmarksTableSeeder.php

@@ -2,7 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Models\{Bookmark, Tag};
+use App\Models\Bookmark;
+use App\Models\Tag;
 use Illuminate\Database\Seeder;
 
 class BookmarksTableSeeder extends Seeder

database/seeders/LikesTableSeeder.php

@@ -4,8 +4,8 @@ namespace Database\Seeders;
 
 use App\Models\Like;
 use Faker\Generator;
-use Illuminate\Support\Carbon;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class LikesTableSeeder extends Seeder

database/seeders/NotesTableSeeder.php

@@ -2,10 +2,12 @@
 
 namespace Database\Seeders;
 
-use Illuminate\Support\Carbon;
+use App\Models\Media;
+use App\Models\Note;
+use App\Models\Place;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
-use App\Models\{Media, Note, Place};
 use SplFileInfo;
 
 class NotesTableSeeder extends Seeder
@@ -184,7 +186,7 @@ class NotesTableSeeder extends Seeder
             ->update(['updated_at' => $now->toDateTimeString()]);
 
         $now = Carbon::now()->subHours(2);
-        $noteWithCodeContent = <<<EOF
+        $noteWithCodeContent = <<<'EOF'
 A note with some code:
 ```php
 <?php
@@ -203,7 +205,7 @@ EOF;
         $noteWithLongUrl = Note::create([
             'note' => 'Best site: https://example.org/posts/some-really-long-slug-that-is-too-wide-on-mobile',
             'created_at' => $now,
-            'client_id' => 'https://beta.indigenous.abode.pub/ios/'
+            'client_id' => 'https://beta.indigenous.abode.pub/ios/',
         ]);
         DB::table('notes')
             ->where('id', $noteWithLongUrl->id)

database/seeders/WebMentionsTableSeeder.php

@@ -21,7 +21,7 @@ class WebMentionsTableSeeder extends Seeder
             'commentable_id' => '14',
             'commentable_type' => 'App\Models\Note',
             'type' => 'in-reply-to',
-            'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}'
+            'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}',
         ]);
         // WebMention Tantek
         WebMention::create([
@@ -30,7 +30,7 @@ class WebMentionsTableSeeder extends Seeder
             'commentable_id' => '13',
             'commentable_type' => 'App\Models\Note',
             'type' => 'in-reply-to',
-            'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}'
+            'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}',
         ]);
     }
 }

helpers.php

@@ -68,7 +68,7 @@ if (! function_exists('normalize_url')) {
             $url['path'] = preg_replace_callback(
                 array_map(
                     function ($str) {
-                        return "/%" . strtoupper($str) . "/x";
+                        return '/%' . strtoupper($str) . '/x';
                     },
                     $u
                 ),

package.json

@@ -9,8 +9,8 @@
         "puppeteer": "^14.1.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.12.3",
+        "@babel/core": "^7.18.6",
-        "@babel/preset-env": "^7.12.1",
+        "@babel/preset-env": "^7.18.6",
         "autoprefixer": "^10.2.4",
         "babel-loader": "^8.2.1",
         "browserlist": "^1.0.1",
@@ -19,18 +19,18 @@
         "cssnano": "^5.0.2",
         "eslint": "^8.6.0",
         "eslint-webpack-plugin": "^3.0.1",
-        "mini-css-extract-plugin": "^2.2.1",
+        "mini-css-extract-plugin": "^2.6.1",
         "postcss": "^8.1.6",
         "postcss-combine-duplicated-selectors": "^10.0.2",
         "postcss-combine-media-query": "^1.0.1",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^7.0.0",
         "pre-commit": "^1.1.3",
-        "stylelint": "^14.2.0",
+        "stylelint": "^14.9.1",
         "stylelint-config-standard": "^25.0.0",
         "stylelint-webpack-plugin": "^3.1.1",
         "webpack": "^5.3.2",
-        "webpack-cli": "^4.0.0"
+        "webpack-cli": "^4.10.0"
     },
     "scripts": {
         "compress": "scripts/compress",

pint.json

@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "concat_space": false
+    }
+}

resources/views/templates/note.blade.php

@@ -15,11 +15,11 @@
 @if($media->type == 'download')                            <p><a class="u-attachment" href="{{ $media->url }}">Download the attached media</a></p>@endif
 @endforeach
                         </div>
-@php
+                        @if ($note->twitter_content)
-try {
+                            <div class="p-bridgy-twitter-content">
-    echo '<div class="p-bridgy-twitter-content">' . $note->twitter_content . '</div>';
+                                {!! $note->twitter_content !!}
-} catch (App\Exceptions\TwitterContentException $exception) {}
+                            </div>
-@endphp
+                        @endif
                         <div class="note-metadata">
                             <div>
                                 <a class="u-url" href="/notes/{{ $note->nb60id }}"><time class="dt-published" datetime="{{ $note->iso8601 }}" title="{{ $note->iso8601 }}">{{ $note->humandiff }}</time></a>@if($note->client) via <a class="client" href="{{ $note->client->client_url }}">{{ $note->client->client_name }}</a>@endif

routes/web.php

@@ -29,7 +29,6 @@ use App\Http\Controllers\MicropubController;
 use App\Http\Controllers\MicropubMediaController;
 use App\Http\Controllers\NotesController;
 use App\Http\Controllers\PlacesController;
-use App\Http\Controllers\SearchController;
 use App\Http\Controllers\ShortURLsController;
 use App\Http\Controllers\TokenEndpointController;
 use App\Http\Controllers\WebMentionsController;

server.php

@@ -3,10 +3,8 @@
 /**
  * Laravel - A PHP Framework For Web Artisans
  *
- * @package  Laravel
  * @author   Taylor Otwell <taylor@laravel.com>
  */
-
 $uri = urldecode(
     parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );

tests/Browser/ExampleTest.php

@@ -2,9 +2,8 @@
 
 namespace Tests\Browser;
 
-use Tests\DuskTestCase;
 use Laravel\Dusk\Browser;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Tests\DuskTestCase;
 
 class ExampleTest extends DuskTestCase
 {

tests/Browser/NotesTest.php

@@ -3,7 +3,6 @@
 namespace Tests\Browser;
 
 use Tests\DuskTestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class NotesTest extends DuskTestCase
 {

tests/DuskTestCase.php

@@ -2,10 +2,10 @@
 
 namespace Tests;
 
-use Laravel\Dusk\TestCase as BaseTestCase;
 use Facebook\WebDriver\Chrome\ChromeOptions;
-use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Laravel\Dusk\TestCase as BaseTestCase;
 
 abstract class DuskTestCase extends BaseTestCase
 {
@@ -15,6 +15,7 @@ abstract class DuskTestCase extends BaseTestCase
      * Prepare for Dusk test execution.
      *
      * @beforeClass
+     *
      * @return void
      */
     public static function prepare()
@@ -34,7 +35,7 @@ abstract class DuskTestCase extends BaseTestCase
         $options = new ChromeOptions();
         $options->addArguments([
             'headless',
-            'disable-gpu'
+            'disable-gpu',
         ]);
 
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $options);

tests/Feature/ActivityStreamTest.php

@@ -53,8 +53,8 @@ class ActivityStreamTest extends TestCase
             ],
             'object' => [
                 'type' => 'Note',
-                'name' => strip_tags($note->note)
+                'name' => strip_tags($note->note),
-            ]
+            ],
         ]);
     }
 }

tests/Feature/Admin/ArticlesTest.php

@@ -43,7 +43,7 @@ class ArticlesTest extends TestCase
         $this->actingAs($user)
              ->post('/admin/blog', [
                  'title' => 'Test Title',
-                 'main' => 'Article content'
+                 'main' => 'Article content',
              ]);
         $this->assertDatabaseHas('articles', ['title' => 'Test Title']);
     }

tests/Feature/Admin/ClientsTest.php

@@ -41,11 +41,11 @@ class ClientsTest extends TestCase
         $this->actingAs($user)
              ->post('/admin/clients', [
                  'client_name' => 'Micropublish',
-                 'client_url' => 'https://micropublish.net'
+                 'client_url' => 'https://micropublish.net',
              ]);
         $this->assertDatabaseHas('clients', [
             'client_name' => 'Micropublish',
-            'client_url' => 'https://micropublish.net'
+            'client_url' => 'https://micropublish.net',
         ]);
     }
 

tests/Feature/Admin/ContactsTest.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Admin;
 
-use App\Models\User;
 use App\Models\Contact;
+use App\Models\User;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
@@ -58,7 +58,7 @@ class ContactsTest extends TestCase
         $this->assertDatabaseHas('contacts', [
             'name' => 'Fred Bloggs',
             'nick' => 'fred',
-            'homepage' => 'https://fred.blog/gs'
+            'homepage' => 'https://fred.blog/gs',
         ]);
     }
 
@@ -135,7 +135,7 @@ class ContactsTest extends TestCase
     /** @test */
     public function adminCanTriggerRetrievalOfRemoteAvatar(): void
     {
-        $html = <<<HTML
+        $html = <<<'HTML'
         <div class="h-card">
             <img class="u-photo" alt="" src="http://tantek.com/tantek.png">
         </div>
@@ -181,7 +181,7 @@ class ContactsTest extends TestCase
     /** @test */
     public function gettingRemoteAvatarFailsGracefullyWithRemoteError(): void
     {
-        $html = <<<HTML
+        $html = <<<'HTML'
         <div class="h-card">
             <img class="u-photo" src="http://tantek.com/tantek.png">
         </div>

tests/Feature/Admin/LikesTest.php

@@ -43,10 +43,10 @@ class LikesTest extends TestCase
 
         $this->actingAs($user)
              ->post('/admin/likes', [
-                 'like_url' => 'https://example.com'
+                 'like_url' => 'https://example.com',
              ]);
         $this->assertDatabaseHas('likes', [
-            'url' => 'https://example.com'
+            'url' => 'https://example.com',
         ]);
         Queue::assertPushed(ProcessLike::class);
     }

tests/Feature/BridgyPosseTest.php

@@ -25,6 +25,6 @@ class BridgyPosseTest extends TestCase
         $response = $this->get($note->longurl);
 
         $html = $response->content();
-        $this->assertStringContainsString('p-bridgy-twitter-content', $html);
+        $this->assertStringContainsString('Hi @joe__', $html);
     }
 }

tests/Feature/FeedsTest.php

@@ -70,7 +70,7 @@ class FeedsTest extends TestCase
             'children' => [[
                 'type' => 'entry',
                 'post-type' => 'article',
-            ]]
+            ]],
         ]);
     }
 
@@ -131,7 +131,7 @@ class FeedsTest extends TestCase
             'children' => [[
                 'type' => 'entry',
                 'post-type' => 'note',
-            ]]
+            ]],
         ]);
     }
 

tests/Feature/HorizonTest.php

@@ -3,8 +3,6 @@
 namespace Tests\Feature;
 
 use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
 class HorizonTest extends TestCase
@@ -13,6 +11,7 @@ class HorizonTest extends TestCase
      * Horizon has its own test suite, here we just test it has been installed successfully.
      *
      * @test
+     *
      * @return void
      */
     public function horizonIsInstalled(): void

tests/Feature/LikesTest.php

@@ -85,7 +85,7 @@ class LikesTest extends TestCase
 
         $job = new ProcessLike($like);
 
-        $content = <<<END
+        $content = <<<'END'
         <html>
             <body>
                 <div class="h-entry">
@@ -124,7 +124,7 @@ class LikesTest extends TestCase
 
         $job = new ProcessLike($like);
 
-        $content = <<<END
+        $content = <<<'END'
         <html>
             <body>
                 <div class="h-entry">
@@ -167,7 +167,7 @@ class LikesTest extends TestCase
 
         $job = new ProcessLike($like);
 
-        $content = <<<END
+        $content = <<<'END'
         <html>
             <body>
                 <div>

tests/Feature/MicropubControllerTest.php

@@ -4,13 +4,17 @@ declare(strict_types=1);
 
 namespace Tests\Feature;
 
+use App\Jobs\SendWebMentions;
+use App\Jobs\SyndicateNoteToTwitter;
+use App\Models\Media;
+use App\Models\Note;
+use App\Models\Place;
+use Carbon\Carbon;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use App\Jobs\{SendWebMentions, SyndicateNoteToTwitter};
-use App\Models\{Media, Note, Place};
-use Carbon\Carbon;
 use Illuminate\Support\Facades\Queue;
-use Tests\{TestCase, TestToken};
+use Tests\TestCase;
+use Tests\TestToken;
 
 class MicropubControllerTest extends TestCase
 {
@@ -67,6 +71,7 @@ class MicropubControllerTest extends TestCase
 
     /**
      * @test
+     *
      * @todo Add uncertainty parameter
      *
     public function micropubClientsCanRequestKnownNearbyPlacesWithUncertaintyParameter(): void
@@ -119,7 +124,7 @@ class MicropubControllerTest extends TestCase
             [
                 'h' => 'entry',
                 'content' => $note,
-                'mp-syndicate-to' => 'https://twitter.com/jonnybarnes'
+                'mp-syndicate-to' => 'https://twitter.com/jonnybarnes',
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]
         );
@@ -136,7 +141,7 @@ class MicropubControllerTest extends TestCase
             [
                 'h' => 'card',
                 'name' => 'The Barton Arms',
-                'geo' => 'geo:53.4974,-2.3768'
+                'geo' => 'geo:53.4974,-2.3768',
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]
         );
@@ -199,7 +204,7 @@ class MicropubControllerTest extends TestCase
             [
                 'h' => 'card',
                 'name' => 'The Barton Arms',
-                'geo' => 'geo:53.4974,-2.3768'
+                'geo' => 'geo:53.4974,-2.3768',
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getTokenWithIncorrectScope()]
         );
@@ -366,7 +371,7 @@ class MicropubControllerTest extends TestCase
         $response
             ->assertJson([
                 'response' => 'error',
-                'error' => 'unauthorized'
+                'error' => 'unauthorized',
             ])
             ->assertStatus(401);
     }
@@ -394,7 +399,7 @@ class MicropubControllerTest extends TestCase
         $response
             ->assertJson([
                 'response' => 'error',
-                'error' => 'insufficient_scope'
+                'error' => 'insufficient_scope',
             ])
             ->assertStatus(401);
     }
@@ -415,7 +420,7 @@ class MicropubControllerTest extends TestCase
         $response
             ->assertJson([
                 'response' => 'error',
-                'error_description' => 'unsupported_request_type'
+                'error_description' => 'unsupported_request_type',
             ])
             ->assertStatus(500);
     }
@@ -430,7 +435,7 @@ class MicropubControllerTest extends TestCase
                 'type' => ['h-card'],
                 'properties' => [
                     'name' => $faker->name,
-                    'geo' => 'geo:' . $faker->latitude . ',' . $faker->longitude
+                    'geo' => 'geo:' . $faker->latitude . ',' . $faker->longitude,
                 ],
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]
@@ -450,7 +455,7 @@ class MicropubControllerTest extends TestCase
                 'type' => ['h-card'],
                 'properties' => [
                     'name' => $faker->name,
-                    'geo' => 'geo:' . $faker->latitude . ',' . $faker->longitude . ';u=35'
+                    'geo' => 'geo:' . $faker->latitude . ',' . $faker->longitude . ';u=35',
                 ],
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]

tests/Feature/OwnYourGramTest.php

@@ -29,7 +29,7 @@ class OwnYourGramTest extends TestCase
                     'syndication' => ['https://www.instagram.com/p/BVC_nVTBFfi/'],
                     'photo' => [
                         // phpcs:ignore Generic.Files.LineLength.TooLong
-                        'https://scontent-sjc2-1.cdninstagram.com/t51.2885-15/e35/18888604_425332491185600_326487281944756224_n.jpg'
+                        'https://scontent-sjc2-1.cdninstagram.com/t51.2885-15/e35/18888604_425332491185600_326487281944756224_n.jpg',
                     ],
                 ],
             ],
@@ -37,15 +37,15 @@ class OwnYourGramTest extends TestCase
         );
 
         $response->assertStatus(201)->assertJson([
-            'response' => 'created'
+            'response' => 'created',
         ]);
         $this->assertDatabaseHas('media_endpoint', [
             // phpcs:ignore Generic.Files.LineLength.TooLong
-            'path' => 'https://scontent-sjc2-1.cdninstagram.com/t51.2885-15/e35/18888604_425332491185600_326487281944756224_n.jpg'
+            'path' => 'https://scontent-sjc2-1.cdninstagram.com/t51.2885-15/e35/18888604_425332491185600_326487281944756224_n.jpg',
         ]);
         $this->assertDatabaseHas('notes', [
             'note' => 'How beautiful are the plates and chopsticks',
-            'instagram_url' => 'https://www.instagram.com/p/BVC_nVTBFfi/'
+            'instagram_url' => 'https://www.instagram.com/p/BVC_nVTBFfi/',
         ]);
     }
 }

tests/Feature/SwarmTest.php

@@ -54,10 +54,10 @@ class SwarmTest extends TestCase
             ->assertStatus(201)
             ->assertJson(['response' => 'created']);
         $this->assertDatabaseHas('notes', [
-            'swarm_url' => 'https://www.swarmapp.com/checkin/abc'
+            'swarm_url' => 'https://www.swarmapp.com/checkin/abc',
         ]);
         $this->assertDatabaseHas('places', [
-            'external_urls' => '{"foursquare": "https://foursquare.com/v/123456"}'
+            'external_urls' => '{"foursquare": "https://foursquare.com/v/123456"}',
         ]);
 
         Queue::assertPushed(SendWebMentions::class);
@@ -101,7 +101,7 @@ class SwarmTest extends TestCase
             ->assertStatus(201)
             ->assertJson(['response' => 'created']);
         $this->assertDatabaseHas('places', [
-            'external_urls' => '{"osm": "https://www.openstreetmap.org/way/123456"}'
+            'external_urls' => '{"osm": "https://www.openstreetmap.org/way/123456"}',
         ]);
 
         Queue::assertPushed(SendWebMentions::class);
@@ -144,7 +144,7 @@ class SwarmTest extends TestCase
             ->assertStatus(201)
             ->assertJson(['response' => 'created']);
         $this->assertDatabaseHas('places', [
-            'external_urls' => '{"default": "https://www.example.org/way/123456"}'
+            'external_urls' => '{"default": "https://www.example.org/way/123456"}',
         ]);
 
         Queue::assertPushed(SendWebMentions::class);
@@ -178,10 +178,10 @@ class SwarmTest extends TestCase
             ->assertStatus(201)
             ->assertJson(['response' => 'created']);
         $this->assertDatabaseHas('places', [
-            'external_urls' => '{"foursquare": "https://foursquare.com/v/654321"}'
+            'external_urls' => '{"foursquare": "https://foursquare.com/v/654321"}',
         ]);
         $this->assertDatabaseHas('notes', [
-            'swarm_url' => 'https://www.swarmapp.com/checkin/def'
+            'swarm_url' => 'https://www.swarmapp.com/checkin/def',
         ]);
         // Check the default text content for the note was saved
         $this->get($response->__get('headers')->get('location'))->assertSee('📍');
@@ -280,10 +280,10 @@ class SwarmTest extends TestCase
             [
                 'type' => ['h-entry'],
                 'properties' => [
-                    'published' => [Carbon::now()->toDateTimeString()]
+                    'published' => [Carbon::now()->toDateTimeString()],
                 ],
                 'syndication' => [
-                    'https://www.swarmapp.com/user/199841/checkin/5c4b1ac56dcf04002c0a4f58'
+                    'https://www.swarmapp.com/user/199841/checkin/5c4b1ac56dcf04002c0a4f58',
                 ],
                 'checkin' => [
                     'type' => ['h-card'],
@@ -295,9 +295,9 @@ class SwarmTest extends TestCase
                         'street-address' => ['65 Oldham St.'],
                         'locality' => ['Manchester'],
                         'country-name' => ['United Kingdom'],
-                        'postal-code' => ['M1 1JR']
+                        'postal-code' => ['M1 1JR'],
                     ],
-                    'value' => 'https://foursquare.com/v/4ade0e46f964a520bf6f21e3'
+                    'value' => 'https://foursquare.com/v/4ade0e46f964a520bf6f21e3',
                 ],
                 'location' => [
                     'type' => ['h-adr'],
@@ -307,8 +307,8 @@ class SwarmTest extends TestCase
                         'street-address' => ['65 Oldham St.'],
                         'locality' => ['Manchester'],
                         'country-name' => ['United Kingdom'],
-                        'postal-code' => ['M1 1JR']
+                        'postal-code' => ['M1 1JR'],
-                    ]
+                    ],
                 ],
             ],
             ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]

tests/Feature/TokenEndpointTest.php

@@ -59,7 +59,7 @@ class TokenEndpointTest extends TestCase
         ]);
         $response->assertStatus(401);
         $response->assertJson([
-            'error' => 'There was an error verifying the authorisation code.'
+            'error' => 'There was an error verifying the authorisation code.',
         ]);
     }
 
@@ -81,7 +81,7 @@ class TokenEndpointTest extends TestCase
         ]);
         $response->assertStatus(400);
         $response->assertJson([
-            'error' => 'Can’t determine the authorisation endpoint.']
+            'error' => 'Can’t determine the authorisation endpoint.', ]
         );
     }
 }

tests/Feature/TokenServiceTest.php

@@ -25,14 +25,14 @@ class TokenServiceTest extends TestCase
         $data = [
             'me' => 'https://example.org',
             'client_id' => 'https://quill.p3k.io',
-            'scope' => 'post'
+            'scope' => 'post',
         ];
         $token = $tokenService->getNewToken($data);
         $valid = $tokenService->validateToken($token);
         $validData = [
             'me' => $valid->claims()->get('me'),
             'client_id' => $valid->claims()->get('client_id'),
-            'scope' => $valid->claims()->get('scope')
+            'scope' => $valid->claims()->get('scope'),
         ];
         $this->assertSame($data, $validData);
     }
@@ -45,7 +45,7 @@ class TokenServiceTest extends TestCase
         $data = [
             'me' => 'https://example.org',
             'client_id' => 'https://quill.p3k.io',
-            'scope' => 'post'
+            'scope' => 'post',
         ];
 
         $config = resolve(Configuration::class);