UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-22 04:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StatusTagsPipeline, fix object tags and slug normalization

Browse source
This commit is contained in:
Daniel Supernault 2023-09-25 04:23:04 -06:00
parent 1f0a45b7f4
commit d295e6059b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 142 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Jobs/StatusPipeline/StatusTagsPipeline.php
View file

@ -45,6 +45,11 @@ class StatusTagsPipeline implements ShouldQueue
{
$res = $this->activity;
$status = $this->status;
if(isset($res['tag']['type'], $res['tag']['name'])) {
$res['tag'] = [$res['tag']];
}
$tags = collect($res['tag']);
// Emoji
@ -73,19 +78,19 @@ class StatusTagsPipeline implements ShouldQueue
if(config('database.default') === 'pgsql') {
$hashtag = Hashtag::where('name', 'ilike', $name)
->orWhere('slug', 'ilike', str_slug($name))
->orWhere('slug', 'ilike', str_slug($name, '-', false))
->first();
if(!$hashtag) {
$hashtag = new Hashtag;
$hashtag->name = $name;
$hashtag->slug = str_slug($name);
$hashtag->slug = str_slug($name, '-', false);
$hashtag->save();
}
} else {
$hashtag = Hashtag::firstOrCreate([
'slug' => str_slug($name)
], [
'slug' => str_slug($name, '-', false),
],[
'name' => $name
]);
}

133
tests/Unit/ActivityPubTagObjectTest.php Normal file
View file

@ -0,0 +1,133 @@
<?php
namespace Tests\Unit;
use PHPUnit\Framework\TestCase;
class ActivityPubTagObjectTest extends TestCase
{
/**
* A basic unit test example.
*/
public function test_gotosocial(): void
{
$res = [
"tag" => [
"href" => "https://gotosocial.example.org/users/GotosocialUser",
"name" => "@GotosocialUser@gotosocial.example.org",
"type" => "Mention"
]
];
if(isset($res['tag']['type'], $res['tag']['name'])) {
$res['tag'] = [$res['tag']];
}
$tags = collect($res['tag'])
->filter(function($tag) {
return $tag &&
$tag['type'] == 'Mention' &&
isset($tag['href']) &&
substr($tag['href'], 0, 8) === 'https://';
});
$this->assertTrue($tags->count() === 1);
}
public function test_pixelfed_hashtags(): void
{
$res = [
"tag" => [
[
"type" => "Mention",
"href" => "https://pixelfed.social/dansup",
"name" => "@dansup@pixelfed.social"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/dogsofpixelfed",
"name" => "#dogsOfPixelFed"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/doggo",
"name" => "#doggo"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/dog",
"name" => "#dog"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/drake",
"name" => "#drake"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/blacklab",
"name" => "#blacklab"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/iconic",
"name" => "#Iconic"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/majestic",
"name" => "#majestic"
]
]
];
if(isset($res['tag']['type'], $res['tag']['name'])) {
$res['tag'] = [$res['tag']];
}
$tags = collect($res['tag'])
->filter(function($tag) {
return $tag &&
$tag['type'] == 'Hashtag' &&
isset($tag['href']) &&
substr($tag['href'], 0, 8) === 'https://';
});
$this->assertTrue($tags->count() === 7);
}
public function test_pixelfed_mentions(): void
{
$res = [
"tag" => [
[
"type" => "Mention",
"href" => "https://pixelfed.social/dansup",
"name" => "@dansup@pixelfed.social"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/dogsofpixelfed",
"name" => "#dogsOfPixelFed"
],
[
"type" => "Hashtag",
"href" => "https://pixelfed.social/discover/tags/doggo",
"name" => "#doggo"
],
]
];
if(isset($res['tag']['type'], $res['tag']['name'])) {
$res['tag'] = [$res['tag']];
}
$tags = collect($res['tag'])
->filter(function($tag) {
return $tag &&
$tag['type'] == 'Mention' &&
isset($tag['href']) &&
substr($tag['href'], 0, 8) === 'https://';
});
$this->assertTrue($tags->count() === 1);
}
}