X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FRelay.php;h=7414c29315e5981c479804708fa5065a7158c0fd;hb=e82ef8890b60da42e47b8a4439309f7311e05141;hp=c982e0bc291aad2dc2e57bd93049d1787c81bd69;hpb=0384bf3e7694ccafe84978de6acebaa3a110c32e;p=friendica.git diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index c982e0bc29..7414c29315 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -1,6 +1,6 @@ get('system', 'relay_subscribe', false); - if ($subscribe) { - $scope = $config->get('system', 'relay_scope', SR_SCOPE_ALL); - } else { - $scope = SR_SCOPE_NONE; - } + $scope = $config->get('system', 'relay_scope'); - if ($scope == SR_SCOPE_NONE) { + if ($scope == self::SCOPE_NONE) { Logger::info('Server does not accept relay posts - rejected', ['network' => $network, 'url' => $url]); return false; } @@ -79,10 +80,10 @@ class Relay $userTags = []; $denyTags = []; - if ($scope == SR_SCOPE_TAGS) { + if ($scope == self::SCOPE_TAGS) { $server_tags = $config->get('system', 'relay_server_tags'); $tagitems = explode(',', mb_strtolower($server_tags)); - foreach ($tagitems AS $tag) { + foreach ($tagitems as $tag) { $systemTags[] = trim($tag, '# '); } @@ -95,7 +96,7 @@ class Relay $deny_tags = $config->get('system', 'relay_deny_tags'); $tagitems = explode(',', mb_strtolower($deny_tags)); - foreach ($tagitems AS $tag) { + foreach ($tagitems as $tag) { $tag = trim($tag, '# '); $denyTags[] = $tag; } @@ -124,7 +125,7 @@ class Relay } } - if ($scope == SR_SCOPE_ALL) { + if ($scope == self::SCOPE_ALL) { Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url]); return true; } @@ -138,6 +139,7 @@ class Relay * * @param array $gserver Global server record * @param array $fields Optional network specific fields + * @return void * @throws \Exception */ public static function updateContact(array $gserver, array $fields = []) @@ -167,11 +169,11 @@ class Relay return; } - if (DBA::isResult($old)) { + if (DBA::isResult($old)) { $fields['updated'] = DateTimeFormat::utcNow(); Logger::info('Update relay contact', ['server' => $gserver['url'], 'id' => $old['id'], 'fields' => $fields]); - DBA::update('contact', $fields, ['id' => $old['id']], $old); + Contact::update($fields, ['id' => $old['id']], $old); } else { $default = ['created' => DateTimeFormat::utcNow(), 'name' => 'relay', 'nick' => 'relay', 'url' => $gserver['url'], @@ -197,6 +199,7 @@ class Relay * The relay contact is a technical contact entry that exists once per server. * * @param array $contact of the relay contact + * @return void */ public static function markForArchival(array $contact) { @@ -223,76 +226,64 @@ class Relay } /** - * Return a list of relay servers - * - * The list contains not only the official relays but also servers that we serve directly + * Return a list of servers that we serve via the direct relay * * @param integer $item_id id of the item that is sent * @param array $contacts Previously fetched contacts - * @param array $networks Networks of the relay servers - * + * @param array $networks Networks of the relay servers * @return array of relay servers * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getList(int $item_id, array $contacts, array $networks) + public static function getDirectRelayList(int $item_id): array { $serverlist = []; - // Fetching relay servers - $serverdata = DI::config()->get("system", "relay_server"); + if (!DI::config()->get('system', 'relay_directly', false)) { + return []; + } - if (!empty($serverdata)) { - $servers = explode(",", $serverdata); - foreach ($servers as $server) { - $gserver = DBA::selectFirst('gserver', ['id', 'url', 'network'], ['nurl' => Strings::normaliseLink($server)]); - if (DBA::isResult($gserver)) { - $serverlist[$gserver['id']] = $gserver; - } - } + // We distribute our stuff based on the parent to ensure that the thread will be complete + $parent = Post::selectFirst(['uri-id'], ['id' => $item_id]); + if (!DBA::isResult($parent)) { + return []; } - if (DI::config()->get("system", "relay_directly", false)) { - // We distribute our stuff based on the parent to ensure that the thread will be complete - $parent = Item::selectFirst(['uri-id'], ['id' => $item_id]); - if (!DBA::isResult($parent)) { - return; + // Servers that want to get all content + $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'all']); + while ($server = DBA::fetch($servers)) { + $serverlist[$server['id']] = $server; + } + DBA::close($servers); + + // All tags of the current post + $tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]); + $taglist = []; + while ($tag = DBA::fetch($tags)) { + $taglist[] = $tag['name']; + } + DBA::close($tags); + + // All servers who wants content with this tag + $tagserverlist = []; + if (!empty($taglist)) { + $tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]); + while ($server = DBA::fetch($tagserver)) { + $tagserverlist[] = $server['gserver-id']; } + DBA::close($tagserver); + } - // Servers that want to get all content - $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'all']); + // All adresses with the given id + if (!empty($tagserverlist)) { + $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]); while ($server = DBA::fetch($servers)) { $serverlist[$server['id']] = $server; } DBA::close($servers); - - // All tags of the current post - $tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]); - $taglist = []; - while ($tag = DBA::fetch($tags)) { - $taglist[] = $tag['name']; - } - DBA::close($tags); - - // All servers who wants content with this tag - $tagserverlist = []; - if (!empty($taglist)) { - $tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]); - while ($server = DBA::fetch($tagserver)) { - $tagserverlist[] = $server['gserver-id']; - } - DBA::close($tagserver); - } - - // All adresses with the given id - if (!empty($tagserverlist)) { - $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]); - while ($server = DBA::fetch($servers)) { - $serverlist[$server['id']] = $server; - } - DBA::close($servers); - } } + $contacts = []; + // Now we are collecting all relay contacts foreach ($serverlist as $gserver) { // We don't send messages to ourselves @@ -303,21 +294,30 @@ class Relay if (empty($contact)) { continue; } - - if (in_array($contact['network'], $networks) && !in_array($contact['batch'], array_column($contacts, 'batch'))) { - $contacts[] = $contact; - } } return $contacts; } + /** + * Return a list of relay servers + * + * @param array $fields Field list + * @return array List of relay servers + * @throws Exception + */ + public static function getList(array $fields = []): array + { + return DBA::selectToArray('apcontact', $fields, + ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 0, Contact::FRIEND]); + } + /** * Return a contact for a given server address or creates a dummy entry * * @param array $gserver Global server record * @param array $fields Fieldlist - * @return array with the contact + * @return array|bool Array with the contact or false on error * @throws \Exception */ private static function getContact(array $gserver, array $fields = ['batch', 'id', 'url', 'name', 'network', 'protocol', 'archive', 'blocked']) @@ -342,4 +342,17 @@ class Relay // It should never happen that we arrive here return []; } + + /** + * Resubscribe to all relay servers + * + * @return void + */ + public static function reSubscribe() + { + foreach (self::getList() as $server) { + $success = ActivityPub\Transmitter::sendRelayFollow($server['url']); + Logger::debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]); + } + } }