strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switchable contact probing

Browse source
This commit is contained in:
Michael 2020-04-20 09:47:26 +00:00
parent 21103a5735
commit 27ea747e99
2 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/Model/Tag.php
View file

@ -61,10 +61,11 @@ class Tag
* *
* @param integer $uriid * @param integer $uriid
* @param integer $type * @param integer $type
* @param string $name * @param string $name
* @param string $url * @param string $url
* @param boolean $probing
*/ */
public static function store(int $uriid, int $type, string $name, string $url = '') public static function store(int $uriid, int $type, string $name, string $url = '', $probing = true)
{ {
$name = trim($name, "\x00..\x20\xFF#!@"); $name = trim($name, "\x00..\x20\xFF#!@");
if (empty($name)) { if (empty($name)) {
@ -80,16 +81,32 @@ class Tag
return; return;
} }
Logger::info('Get ID for contact', ['url' => $url]); if (!$probing) {
$condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false];
$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
if (DBA::isResult($contact)) {
$cid = $contact['id'];
Logger::info('Got id for contact url', ['cid' => $cid, 'url' => $url]);
}
$condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false]; if (empty($cid)) {
$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]); $ssl_url = str_replace('http://', 'https://', $url);
if (DBA::isResult($contact)) { $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, 0];
$cid = $contact['id']; $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
if (DBA::isResult($contact)) {
$cid = $contact['id'];
Logger::info('Got id for contact alias', ['cid' => $cid, 'url' => $url]);
}
}
} else { } else {
$cid = Contact::getIdForURL($url, 0, true);
Logger::info('Got id by probing', ['cid' => $cid, 'url' => $url]);
}
if (empty($cid)) {
// The contact wasn't found in the system (most likely some dead account) // The contact wasn't found in the system (most likely some dead account)
// We ensure that we only store a single entry by overwriting the previous name // We ensure that we only store a single entry by overwriting the previous name
Logger::info('Update tag', ['url' => $url, 'name' => $name]); Logger::info('Contact not found, updating tag', ['url' => $url, 'name' => $name]);
DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]); DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
} }
} }
@ -100,7 +117,7 @@ class Tag
if (($type != Tag::HASHTAG) && !empty($url) && ($url != $name)) { if (($type != Tag::HASHTAG) && !empty($url) && ($url != $name)) {
$fields['url'] = strtolower($url); $fields['url'] = strtolower($url);
} }
$tag = DBA::selectFirst('tag', ['id'], $fields); $tag = DBA::selectFirst('tag', ['id'], $fields);
if (!DBA::isResult($tag)) { if (!DBA::isResult($tag)) {
DBA::insert('tag', $fields, true); DBA::insert('tag', $fields, true);
@ -108,7 +125,7 @@ class Tag
} else { } else {
$tagid = $tag['id']; $tagid = $tag['id'];
} }
if (empty($tagid)) { if (empty($tagid)) {
Logger::error('No tag id created', $fields); Logger::error('No tag id created', $fields);
return; return;
@ -128,7 +145,7 @@ class Tag
DBA::insert('post-tag', $fields, true); DBA::insert('post-tag', $fields, true);
Logger::info('Stored tag/mention', ['uri-id' => $uriid, 'tag-id' => $tagid, 'contact-id' => $cid, 'callstack' => System::callstack(8)]); Logger::info('Stored tag/mention', ['uri-id' => $uriid, 'tag-id' => $tagid, 'contact-id' => $cid, 'name' => $name, 'type' => $type, 'callstack' => System::callstack(8)]);
} }
/** /**
@ -138,25 +155,27 @@ class Tag
* @param string $hash * @param string $hash
* @param string $name * @param string $name
* @param string $url * @param string $url
* @param boolean $probing
*/ */
public static function storeByHash(int $uriid, string $hash, string $name, string $url = '') public static function storeByHash(int $uriid, string $hash, string $name, string $url = '', $probing = true)
{ {
$type = self::getTypeForHash($hash); $type = self::getTypeForHash($hash);
if ($type == self::UNKNOWN) { if ($type == self::UNKNOWN) {
return; return;
} }
self::store($uriid, $type, $name, $url); self::store($uriid, $type, $name, $url, $probing);
} }
/** /**
* Store tags and mentions from the body * Store tags and mentions from the body
* *
* @param integer $uriid URI-Id * @param integer $uriid URI-Id
* @param string $body Body of the post * @param string $body Body of the post
* @param string $tags Accepted tags * @param string $tags Accepted tags
* @param boolean $probing Perform a probing for contacts, adding them if needed
*/ */
public static function storeFromBody(int $uriid, string $body, string $tags = null) public static function storeFromBody(int $uriid, string $body, string $tags = null, $probing = true)
{ {
if (is_null($tags)) { if (is_null($tags)) {
$tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION]; $tags = self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
@ -171,7 +190,7 @@ class Tag
Logger::info('Found tags', ['uri-id' => $uriid, 'hash' => $tags, 'result' => $result]); Logger::info('Found tags', ['uri-id' => $uriid, 'hash' => $tags, 'result' => $result]);
foreach ($result as $tag) { foreach ($result as $tag) {
self::storeByHash($uriid, $tag[1], $tag[3], $tag[2]); self::storeByHash($uriid, $tag[1], $tag[3], $tag[2], $probing);
} }
} }

15
src/Protocol/ActivityPub/Processor.php
View file

@ -407,7 +407,7 @@ class Processor
$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']); $item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']);
Tag::storeFromBody($item['uri-id'], $item['body'], '@!'); self::storeFromBody($item);
self::storeTags($item['uri-id'], $activity['tags']); self::storeTags($item['uri-id'], $activity['tags']);
$item['location'] = $activity['location']; $item['location'] = $activity['location'];
@ -421,6 +421,14 @@ class Processor
return $item; return $item;
} }
private static function storeFromBody($item)
{
// Make sure to delete all existing tags (can happen when called via the update functionality)
DBA::delete('post-tag', ['uri-id' => $uriid]);
Tag::storeFromBody($item['uri-id'], $item['body'], '@!');
}
/** /**
* Generate a GUID out of an URL * Generate a GUID out of an URL
* *
@ -588,9 +596,6 @@ class Processor
*/ */
private static function storeTags(int $uriid, array $tags = null) private static function storeTags(int $uriid, array $tags = null)
{ {
// Make sure to delete all existing tags (can happen when called via the update functionality)
DBA::delete('post-tag', ['uri-id' => $uriid]);
foreach ($tags as $tag) { foreach ($tags as $tag) {
if (empty($tag['name']) || empty($tag['type']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) { if (empty($tag['name']) || empty($tag['type']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) {
continue; continue;
@ -622,7 +627,7 @@ class Processor
if (empty($tag['name'])) { if (empty($tag['name'])) {
continue; continue;
} }
Tag::store($uriid, $type, $tag['name'], $tag['href']); Tag::store($uriid, $type, $tag['name'], $tag['href']);
} }
} }