Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 05:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into user-defined-channels

Browse source
This commit is contained in:
Michael 2023-10-04 09:40:32 +00:00
commit b8208974a4
79 changed files with 42459 additions and 29745 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Mastodon/InstanceV2.php
View file

@ -85,6 +85,7 @@ class InstanceV2 extends BaseApi
$domain = $this->baseUrl->getHost();
$title = $this->config->get('config', 'sitename');
$version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')';
$source_url = 'https://git.friendi.ca/friendica/friendica';
$description = $this->config->get('config', 'info');
$usage = $this->buildUsageInfo();
$thumbnail = new InstanceEntity\Thumbnail($this->baseUrl . $this->contactHeader->getMastodonBannerPath());
@ -98,6 +99,7 @@ class InstanceV2 extends BaseApi
$domain,
$title,
$version,
$source_url,
$description,
$usage,
$thumbnail,

2
src/Module/Contact/Hovercard.php
View file

@ -111,7 +111,9 @@ class Hovercard extends BaseModule
'tags' => $contact['keywords'],
'bd' => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
'account_type' => Contact::getAccountType($contact['contact-type']),
'contact_type' => $contact['contact-type'],
'actions' => $actions,
'self' => $contact['self'],
],
]);

2
src/Module/Photo.php
View file

@ -77,7 +77,7 @@ class Photo extends BaseApi
throw new NotModifiedException();
}
Profile::addVisitorCookieForHTTPSigner();
Profile::addVisitorCookieForHTTPSigner($this->server);
$customsize = 0;
$square_resize = true;