diff --git a/.env.example b/.env.example index a1c38110..eb423aaa 100644 --- a/.env.example +++ b/.env.example @@ -78,8 +78,6 @@ SESSION_SAME_SITE=strict LOG_SLACK_WEBHOOK_URL= -BRRR_WEBHOOK_URL= - FLARE_KEY= IGNITION_OPEN_AI_KEY= diff --git a/app/Jobs/NotifyBrrrOfWebMention.php b/app/Jobs/NotifyBrrrOfWebMention.php deleted file mode 100644 index 3273b7d6..00000000 --- a/app/Jobs/NotifyBrrrOfWebMention.php +++ /dev/null @@ -1,56 +0,0 @@ - $this->title(), - 'message' => "From {$this->webMention->source}", - 'open_url' => $this->webMention->target, - ]); - } - - /** - * Build a notification title based on the webmention type. - */ - private function title(): string - { - return match ($this->webMention->type) { - 'in-reply-to' => 'New reply', - 'like-of' => 'New like', - 'repost-of' => 'New repost', - default => 'New webmention', - }; - } -} diff --git a/app/Jobs/ProcessWebMention.php b/app/Jobs/ProcessWebMention.php index 4ac6f5fd..6cb276f8 100644 --- a/app/Jobs/ProcessWebMention.php +++ b/app/Jobs/ProcessWebMention.php @@ -96,7 +96,6 @@ class ProcessWebMention implements ShouldQueue $webmention->type = $type; $webmention->mf2 = json_encode($microformats); $webmention->save(); - dispatch(new NotifyBrrrOfWebMention($webmention)); } /** diff --git a/config/services.php b/config/services.php index 7a5cdfa5..b784e544 100644 --- a/config/services.php +++ b/config/services.php @@ -39,8 +39,4 @@ return [ 'token' => env('CLOUDCONVERT_API_TOKEN'), ], - 'brrr' => [ - 'webhook_url' => env('BRRR_WEBHOOK_URL'), - ], - ]; diff --git a/tests/Unit/Jobs/NotifyBrrrOfWebMentionJobTest.php b/tests/Unit/Jobs/NotifyBrrrOfWebMentionJobTest.php deleted file mode 100644 index f28bc4eb..00000000 --- a/tests/Unit/Jobs/NotifyBrrrOfWebMentionJobTest.php +++ /dev/null @@ -1,71 +0,0 @@ - 'https://api.brrr.now/v1/br_usr_test']); - Http::fake(); - - $webMention = WebMention::factory()->make([ - 'source' => 'https://example.org/reply/1', - 'target' => 'https://jonnybarnes.uk/notes/1', - 'type' => 'in-reply-to', - ]); - - $job = new NotifyBrrrOfWebMention($webMention); - $job->handle(); - - Http::assertSent(function (Request $request) { - return $request->url() === 'https://api.brrr.now/v1/br_usr_test' - && $request['title'] === 'New reply' - && $request['message'] === 'From https://example.org/reply/1' - && $request['open_url'] === 'https://jonnybarnes.uk/notes/1'; - }); - } - - #[Test] - public function it_titles_notifications_by_webmention_type(): void - { - config(['services.brrr.webhook_url' => 'https://api.brrr.now/v1/br_usr_test']); - Http::fake(); - - foreach ([ - 'in-reply-to' => 'New reply', - 'like-of' => 'New like', - 'repost-of' => 'New repost', - 'something-else' => 'New webmention', - ] as $type => $expectedTitle) { - $webMention = WebMention::factory()->make(['type' => $type]); - - (new NotifyBrrrOfWebMention($webMention))->handle(); - - Http::assertSent(fn (Request $request) => $request['title'] === $expectedTitle); - } - } - - #[Test] - public function it_does_nothing_when_no_webhook_url_is_configured(): void - { - config(['services.brrr.webhook_url' => null]); - Http::fake(); - - $webMention = WebMention::factory()->make(); - - (new NotifyBrrrOfWebMention($webMention))->handle(); - - Http::assertNothingSent(); - } -} diff --git a/tests/Unit/Jobs/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php index f7c9329e..001d8f3d 100644 --- a/tests/Unit/Jobs/ProcessWebMentionJobTest.php +++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Tests\Unit\Jobs; use App\Exceptions\RemoteContentNotFoundException; -use App\Jobs\NotifyBrrrOfWebMention; use App\Jobs\ProcessWebMention; use App\Jobs\SaveProfileImage; use App\Models\Note; @@ -72,7 +71,6 @@ class ProcessWebMentionJobTest extends TestCase $job->handle($parser); Queue::assertPushed(SaveProfileImage::class); - Queue::assertPushed(NotifyBrrrOfWebMention::class); $this->assertDatabaseHas('webmentions', [ 'source' => $source, 'type' => 'like-of', @@ -106,7 +104,6 @@ class ProcessWebMentionJobTest extends TestCase $job->handle($parser); Queue::assertPushed(SaveProfileImage::class); - Queue::assertNotPushed(NotifyBrrrOfWebMention::class); $this->assertDatabaseHas('webmentions', [ 'source' => $source, 'type' => 'in-reply-to', @@ -209,7 +206,6 @@ class ProcessWebMentionJobTest extends TestCase $job = new ProcessWebMention($note, $source); $job->handle($parser); - Queue::assertPushed(NotifyBrrrOfWebMention::class); $this->assertGreaterThan(255, strlen($source)); $this->assertDatabaseHas('webmentions', [ 'source' => $source,