clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further improved logging

This commit is contained in:
Michael 2022-03-12 07:48:31 +00:00
parent c1bb1cf0fc
commit 56cd98b38b
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/DFRN.php
View File

@ -1776,7 +1776,7 @@ class DFRN
{ {
if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)", if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) { Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) {
Logger::debug('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]); Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
return true; return true;
} }
@ -1792,7 +1792,7 @@ class DFRN
$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name'); $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) { if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) {
Logger::debug('Post is accepted because of the relay settings', ['uri' => $item['uri'], 'author' => $item["author-link"]]); Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
return true; return true;
} else { } else {
return false; return false;

17
src/Protocol/Diaspora.php
View File

@ -2616,31 +2616,30 @@ class Diaspora
/** /**
* Checks if an incoming message is wanted * Checks if an incoming message is wanted
* *
* @param string $url * @param array $item
* @param integer $uriid
* @param string $author * @param string $author
* @param string $body * @param string $body
* @param int $direction Indicates if the message had been fetched or pushed * @param int $direction Indicates if the message had been fetched or pushed
* *
* @return boolean Is the message wanted? * @return boolean Is the message wanted?
*/ */
private static function isSolicitedMessage(string $url, int $uriid, string $author, string $body, int $direction) private static function isSolicitedMessage(array $item, string $author, string $body, int $direction)
{ {
$contact = Contact::getByURL($author); $contact = Contact::getByURL($author);
if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)", if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
$contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) { $contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) {
Logger::debug('Author has got followers - accepted', ['url' => $url, 'author' => $author]); Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
return true; return true;
} }
if ($direction == self::FORCED_FETCH) { if ($direction == self::FORCED_FETCH) {
Logger::debug('Post is a forced fetch - accepted', ['url' => $url, 'author' => $author]); Logger::debug('Post is a forced fetch - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
return true; return true;
} }
$tags = array_column(Tag::getByURIId($uriid, [Tag::HASHTAG]), 'name'); $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
if (Relay::isSolicitedPost($tags, $body, $contact['id'], $url, Protocol::DIASPORA)) { if (Relay::isSolicitedPost($tags, $body, $contact['id'], $item['uri'], Protocol::DIASPORA)) {
Logger::debug('Post is accepted because of the relay settings', ['url' => $url, 'author' => $author]); Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
return true; return true;
} else { } else {
return false; return false;
@ -2771,7 +2770,7 @@ class Diaspora
self::storeMentions($datarray['uri-id'], $text); self::storeMentions($datarray['uri-id'], $text);
Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]); Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
if (!self::isSolicitedMessage($datarray["uri"], $datarray['uri-id'], $author, $body, $direction)) { if (!self::isSolicitedMessage($datarray, $author, $body, $direction)) {
DBA::delete('item-uri', ['uri' => $datarray['uri']]); DBA::delete('item-uri', ['uri' => $datarray['uri']]);
return false; return false;
} }