UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-18 23:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5296 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-09-13 00:08:10 -06:00 committed by GitHub
commit 34b4167aa0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Util/ActivityPub/DiscoverActor.php
View file

@ -7,6 +7,7 @@ use Zttp\Zttp;
class DiscoverActor
{
protected $url;
protected $response;
public function __construct($url)
@ -17,9 +18,9 @@ class DiscoverActor
public function fetch()
{
$res = Zttp::withHeaders([
'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => 'PixelfedBot - https://pixelfed.org',
])->get($this->url);
'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => 'PixelfedBot - https://pixelfed.org',
])->get($this->url);
$this->response = $res->body();
return $this;
@ -40,7 +41,7 @@ class DiscoverActor
$this->fetch();
$res = $this->getResponse();
if (empty($res) || !in_array('type', $res) || $res['type'] !== 'Person') {
if (empty($res) || ! in_array('type', $res) || $res['type'] !== 'Person') {
throw new \Exception('Invalid Actor Object');
}

4
resources/views/layouts/app.blade.php
View file

@ -11,7 +11,7 @@
<title>{{ $title ?? config_cache('app.name') }}</title>
<link rel="manifest" href="{{url('/manifest.json')}}">
<meta property="og:logo" content="{{ url('/img/pixelfed-icon-color.png')}}" />
<meta property="og:site_name" content="Pixelfed">
<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name') }}">
<meta property="og:type" content="{{ $ogType ?? 'article' }}">
@ -72,7 +72,7 @@
<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
<link rel="manifest" href="/manifest.json">
<meta property="og:logo" content="{{ url('/img/pixelfed-icon-color.png')}}" />
<meta property="og:site_name" content="Pixelfed">
<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name', 'pixelfed') }}">
<meta property="og:type" content="{{ $ogType ?? 'article' }}">