mirror of
https://github.com/RSS-Bridge/rss-bridge.git
synced 2024-11-26 19:36:52 +03:00
fix: exclude mastodon boosts when told to do so (#3007)
This commit is contained in:
parent
36f64a3258
commit
a2c7865226
1 changed files with 52 additions and 50 deletions
|
@ -45,62 +45,22 @@ class MastodonBridge extends BridgeAbstract
|
||||||
'required' => false,
|
'required' => false,
|
||||||
'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.'
|
||||||
]
|
],
|
||||||
]];
|
]];
|
||||||
|
|
||||||
public function getName()
|
|
||||||
{
|
|
||||||
if ($this->getInput('canusername')) {
|
|
||||||
return $this->getInput('canusername');
|
|
||||||
}
|
|
||||||
return parent::getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
private function getInstance()
|
|
||||||
{
|
|
||||||
preg_match('/^@[a-zA-Z0-9_]+@(.+)/', $this->getInput('canusername'), $matches);
|
|
||||||
return $matches[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
private function getUsername()
|
|
||||||
{
|
|
||||||
preg_match('/^@([a-zA-Z_0-9_]+)@.+/', $this->getInput('canusername'), $matches);
|
|
||||||
return $matches[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getURI()
|
|
||||||
{
|
|
||||||
if ($this->getInput('canusername')) {
|
|
||||||
// We parse webfinger to make sure the URL is correct. This is mostly because
|
|
||||||
// MissKey uses user ID instead of the username in the endpoint, domain delegations,
|
|
||||||
// and also to be compatible with future ActivityPub implementations.
|
|
||||||
$resource = 'acct:' . $this->getUsername() . '@' . $this->getInstance();
|
|
||||||
$webfingerUrl = 'https://' . $this->getInstance() . '/.well-known/webfinger?resource=' . $resource;
|
|
||||||
$webfingerHeader = [
|
|
||||||
'Content-Type: application/jrd+json'
|
|
||||||
];
|
|
||||||
$webfinger = json_decode(getContents($webfingerUrl, $webfingerHeader), true);
|
|
||||||
foreach ($webfinger['links'] as $link) {
|
|
||||||
if ($link['type'] === 'application/activity+json') {
|
|
||||||
return $link['href'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent::getURI();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function collectData()
|
public function collectData()
|
||||||
{
|
{
|
||||||
$url = $this->getURI() . '/outbox?page=true';
|
$url = $this->getURI() . '/outbox?page=true';
|
||||||
$content = $this->fetchAP($url);
|
$content = $this->fetchAP($url);
|
||||||
if ($content['id'] === $url) {
|
if ($content['id'] !== $url) {
|
||||||
foreach ($content['orderedItems'] as $status) {
|
|
||||||
$this->items[] = $this->parseItem($status);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throw new \Exception('Unexpected response from server.');
|
throw new \Exception('Unexpected response from server.');
|
||||||
}
|
}
|
||||||
|
foreach ($content['orderedItems'] as $status) {
|
||||||
|
$item = $this->parseItem($status);
|
||||||
|
if ($item) {
|
||||||
|
$this->items[] = $item;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function parseItem($content)
|
protected function parseItem($content)
|
||||||
|
@ -128,7 +88,7 @@ class MastodonBridge extends BridgeAbstract
|
||||||
$item['author'] = $rtUser;
|
$item['author'] = $rtUser;
|
||||||
$item['title'] = 'Shared a status by ' . $rtUser . ': ';
|
$item['title'] = 'Shared a status by ' . $rtUser . ': ';
|
||||||
$item = $this->parseObject($rtContent, $item);
|
$item = $this->parseObject($rtContent, $item);
|
||||||
} catch (UnexpectedResponseException $th) {
|
} catch (HttpException $e) {
|
||||||
$item['title'] = 'Shared an unreachable status: ' . $content['object'];
|
$item['title'] = 'Shared an unreachable status: ' . $content['object'];
|
||||||
$item['content'] = $content['object'];
|
$item['content'] = $content['object'];
|
||||||
$item['uri'] = $content['object'];
|
$item['uri'] = $content['object'];
|
||||||
|
@ -176,6 +136,48 @@ class MastodonBridge extends BridgeAbstract
|
||||||
return $item;
|
return $item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getName()
|
||||||
|
{
|
||||||
|
if ($this->getInput('canusername')) {
|
||||||
|
return $this->getInput('canusername');
|
||||||
|
}
|
||||||
|
return parent::getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getInstance()
|
||||||
|
{
|
||||||
|
preg_match('/^@[a-zA-Z0-9_]+@(.+)/', $this->getInput('canusername'), $matches);
|
||||||
|
return $matches[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getUsername()
|
||||||
|
{
|
||||||
|
preg_match('/^@([a-zA-Z_0-9_]+)@.+/', $this->getInput('canusername'), $matches);
|
||||||
|
return $matches[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getURI()
|
||||||
|
{
|
||||||
|
if ($this->getInput('canusername')) {
|
||||||
|
// We parse webfinger to make sure the URL is correct. This is mostly because
|
||||||
|
// MissKey uses user ID instead of the username in the endpoint, domain delegations,
|
||||||
|
// and also to be compatible with future ActivityPub implementations.
|
||||||
|
$resource = 'acct:' . $this->getUsername() . '@' . $this->getInstance();
|
||||||
|
$webfingerUrl = 'https://' . $this->getInstance() . '/.well-known/webfinger?resource=' . $resource;
|
||||||
|
$webfingerHeader = [
|
||||||
|
'Content-Type: application/jrd+json'
|
||||||
|
];
|
||||||
|
$webfinger = json_decode(getContents($webfingerUrl, $webfingerHeader), true);
|
||||||
|
foreach ($webfinger['links'] as $link) {
|
||||||
|
if ($link['type'] === 'application/activity+json') {
|
||||||
|
return $link['href'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::getURI();
|
||||||
|
}
|
||||||
|
|
||||||
protected function fetchAP($url)
|
protected function fetchAP($url)
|
||||||
{
|
{
|
||||||
$d = new DateTime();
|
$d = new DateTime();
|
||||||
|
|
Loading…
Reference in a new issue