danolo
/
rss-bridge
mirror of https://github.com/danoloan10/rss-bridge
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MastodonBridge] Add support for GoToSocial (#3098) 

* [MastodonBridge] Add support for GoToSocial

GoToSocial expects URLs in HTTP Signatures to include the query string; Mastodon
does not. To provide support for both types of ActivityPub services, define a
new parameter for signature types, defaulting to Mastodon's format.

This change also introduces auto-resolution of linked objects, which GoToSocial
uses instead of including content directly in a user's outbox.

* [MastodonBridge] Fix lint failure
This commit is contained in:
John S Long 2022-10-12 14:43:09 -05:00 committed by GitHub
parent 4d8e40e746
commit 78fa03238c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bridges/MastodonBridge.php
View File

@ -46,6 +46,16 @@ class MastodonBridge extends BridgeAbstract
'type' => 'checkbox', 'type' => 'checkbox',
'title' => 'Hide boosts. Note that RSS-Bridge will fetch the original status from other federated instances.' 'title' => 'Hide boosts. Note that RSS-Bridge will fetch the original status from other federated instances.'
], ],
'signaturetype' => [
'type' => 'list',
'name' => 'Signature Type',
'title' => 'How to sign requests when fetching from Authorized Fetch enabled instances',
'values' => [
'Without Query (Mastodon)' => 'noquery',
'With Query (GoToSocial)' => 'query',
],
'defaultValue' => 'noquery'
],
]]; ]];
public function collectData() public function collectData()
@ -109,6 +119,11 @@ class MastodonBridge extends BridgeAbstract
protected function parseObject($object, $item) protected function parseObject($object, $item)
{ {
// If object is a link to another object, fetch it
if (is_string($object)) {
$object = $this->fetchAP($object);
}
$item['content'] = $object['content']; $item['content'] = $object['content'];
$strippedContent = strip_tags(str_replace('<br>', ' ', $object['content'])); $strippedContent = strip_tags(str_replace('<br>', ' ', $object['content']));
@ -119,6 +134,12 @@ class MastodonBridge extends BridgeAbstract
$item['title'] .= $strippedContent; $item['title'] .= $strippedContent;
} }
$item['uri'] = $object['id']; $item['uri'] = $object['id'];
if (isset($object['attachment']['url'])) {
// Normalize attachment (turn single attachment into array)
$object['attachment'] = [$object['attachment']];
}
foreach ($object['attachment'] as $attachment) { foreach ($object['attachment'] as $attachment) {
// Only process REMOTE pictures (prevent xss) // Only process REMOTE pictures (prevent xss)
if ( if (
@ -183,7 +204,19 @@ class MastodonBridge extends BridgeAbstract
$d = new DateTime(); $d = new DateTime();
$d->setTimezone(new DateTimeZone('GMT')); $d->setTimezone(new DateTimeZone('GMT'));
$date = $d->format('D, d M Y H:i:s e'); $date = $d->format('D, d M Y H:i:s e');
preg_match('/https?:\/\/([a-z0-9-\.]{0,})(\/[^?#]+)/', $url, $matches);
// GoToSocial expects the query string to be included when
// building the url to sign
// @see https://github.com/superseriousbusiness/gotosocial/issues/107#issuecomment-1188289857
$regex = [
// Include query string when parsing URL
'query' => '/https?:\/\/([a-z0-9-\.]{0,})(\/[^#]+)/',
// Exclude query string when parsing URL
'noquery' => '/https?:\/\/([a-z0-9-\.]{0,})(\/[^#?]+)/',
];
preg_match($regex[$this->getInput('signaturetype')], $url, $matches);
$headers = [ $headers = [
'Accept: application/activity+json', 'Accept: application/activity+json',
'Host: ' . $matches[1], 'Host: ' . $matches[1],