Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cc2ff2b2a2 |
|||
|
73b9668088 |
|||
|
e8f2535cd1 |
|||
|
5481956d78 |
8 changed files with 94 additions and 5 deletions
|
|
@ -25,7 +25,7 @@ class Bookmark extends Model
|
|||
return $this->belongsToMany('App\Models\Tag');
|
||||
}
|
||||
|
||||
protected function localUri(): Attribute
|
||||
protected function uri(): Attribute
|
||||
{
|
||||
return Attribute::get(
|
||||
get: fn () => config('app.url').'/bookmarks/'.$this->id,
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@ class Like extends Model
|
|||
use FilterHtml;
|
||||
use HasFactory;
|
||||
|
||||
protected function uri(): Attribute
|
||||
{
|
||||
return Attribute::get(
|
||||
get: fn () => config('app.url').'/likes/'.$this->id,
|
||||
);
|
||||
}
|
||||
|
||||
protected function url(): Attribute
|
||||
{
|
||||
return Attribute::set(
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class EntryHandler implements MicropubHandlerInterface
|
|||
|
||||
$dataArray = $data->toArray();
|
||||
$location = match (true) {
|
||||
isset($dataArray['like-of']) => resolve(LikeService::class)->create($dataArray)->url,
|
||||
isset($dataArray['like-of']) => resolve(LikeService::class)->create($dataArray)->uri,
|
||||
isset($dataArray['bookmark-of']) => resolve(BookmarkService::class)->create($dataArray)->uri,
|
||||
isset($dataArray['name']) => resolve(ArticleService::class)->create($dataArray)->uri,
|
||||
default => resolve(NoteService::class)->create($dataArray)->uri,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('notes', function (Blueprint $table) {
|
||||
$table->dropColumn('shorturl');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('notes', function (Blueprint $table) {
|
||||
$table->string('shorturl', 20)->nullable();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
</blockquote>
|
||||
@endisset
|
||||
<div>
|
||||
<a href="/likes/{{ $like->id }}"><time class="dt-published" datetime="{{ $like->updated_at->toISO8601String() }}" title="{{ $like->updated_at->toISO8601String() }}">{{ $like->updated_at->diffForHumans() }}</time></a>
|
||||
<a href="{{ $like->uri }}"><time class="dt-published" datetime="{{ $like->updated_at->toISO8601String() }}" title="{{ $like->updated_at->toISO8601String() }}">{{ $like->updated_at->diffForHumans() }}</time></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -92,10 +92,10 @@ class BookmarksTest extends TestCase
|
|||
}
|
||||
|
||||
#[Test]
|
||||
public function bookmark_local_uri_attribute_returns_correct_url(): void
|
||||
public function bookmark_uri_attribute_returns_correct_url(): void
|
||||
{
|
||||
$bookmark = Bookmark::factory()->create();
|
||||
$this->assertEquals(config('app.url').'/bookmarks/'.$bookmark->id, $bookmark->local_uri);
|
||||
$this->assertEquals(config('app.url').'/bookmarks/'.$bookmark->id, $bookmark->uri);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ use App\Jobs\SendWebMentions;
|
|||
use App\Jobs\SyndicateNoteToBluesky;
|
||||
use App\Jobs\SyndicateNoteToMastodon;
|
||||
use App\Models\Article;
|
||||
use App\Models\Bookmark;
|
||||
use App\Models\Like;
|
||||
use App\Models\Media;
|
||||
use App\Models\Note;
|
||||
use App\Models\Place;
|
||||
|
|
@ -883,6 +885,50 @@ class MicropubControllerTest extends TestCase
|
|||
$this->assertStringStartsWith(config('app.url').'/blog/', $response->headers->get('Location'));
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function micropub_client_api_request_for_a_like_returns_our_permalink_in_the_location_header(): void
|
||||
{
|
||||
Queue::fake();
|
||||
|
||||
$response = $this->postJson(
|
||||
'/api/post',
|
||||
[
|
||||
'type' => ['h-entry'],
|
||||
'properties' => [
|
||||
'like-of' => ['https://example.org/liked-post'],
|
||||
],
|
||||
],
|
||||
['HTTP_Authorization' => 'Bearer '.$this->getToken()]
|
||||
);
|
||||
|
||||
$like = Like::where('url', 'https://example.org/liked-post')->sole();
|
||||
$response
|
||||
->assertStatus(201)
|
||||
->assertHeader('Location', config('app.url').'/likes/'.$like->id);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function micropub_client_api_request_for_a_bookmark_returns_our_permalink_in_the_location_header(): void
|
||||
{
|
||||
Queue::fake();
|
||||
|
||||
$response = $this->postJson(
|
||||
'/api/post',
|
||||
[
|
||||
'type' => ['h-entry'],
|
||||
'properties' => [
|
||||
'bookmark-of' => ['https://example.org/bookmarked-page'],
|
||||
],
|
||||
],
|
||||
['HTTP_Authorization' => 'Bearer '.$this->getToken()]
|
||||
);
|
||||
|
||||
$bookmark = Bookmark::where('url', 'https://example.org/bookmarked-page')->sole();
|
||||
$response
|
||||
->assertStatus(201)
|
||||
->assertHeader('Location', config('app.url').'/bookmarks/'.$bookmark->id);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function micropub_client_api_request_creates_an_unpublished_article_when_post_status_is_draft(): void
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@ class LikesTest extends TestCase
|
|||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
#[Test]
|
||||
public function like_uri_attribute_returns_our_permalink(): void
|
||||
{
|
||||
$like = Like::factory()->create();
|
||||
|
||||
$this->assertEquals(config('app.url').'/likes/'.$like->id, $like->uri);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function we_can_set_the_author_url(): void
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue