Merge pull request #11806 from annando/post-reason

The post-reason / protocol is now filled in most cases
This commit is contained in:
Hypolite Petovan 2022-07-31 23:28:13 -04:00 committed by GitHub
commit 85dd69324e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 61 additions and 27 deletions

View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2022.09-dev (Giant Rhubarb) -- Friendica 2022.09-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1475 -- DB_UPDATE_VERSION 1476
-- ------------------------------------------ -- ------------------------------------------
@ -1774,6 +1774,7 @@ CREATE VIEW `post-user-view` AS SELECT
`post-user`.`global` AS `global`, `post-user`.`global` AS `global`,
EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-user`.`uri-id`) AS `featured`, EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-user`.`uri-id`) AS `featured`,
`post-user`.`network` AS `network`, `post-user`.`network` AS `network`,
`post-user`.`protocol` AS `protocol`,
`post-user`.`vid` AS `vid`, `post-user`.`vid` AS `vid`,
`post-user`.`psid` AS `psid`, `post-user`.`psid` AS `psid`,
IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,

View File

@ -32,11 +32,15 @@ class Conversation
const PARCEL_DIASPORA = 2; const PARCEL_DIASPORA = 2;
const PARCEL_SALMON = 3; const PARCEL_SALMON = 3;
const PARCEL_FEED = 4; // Deprecated const PARCEL_FEED = 4; // Deprecated
const PARCEL_SPLIT_CONVERSATION = 6; const PARCEL_SPLIT_CONVERSATION = 6; // @deprecated since version 2022.09
const PARCEL_LEGACY_DFRN = 7; // @deprecated since version 2021.09 const PARCEL_LEGACY_DFRN = 7; // @deprecated since version 2021.09
const PARCEL_DIASPORA_DFRN = 8; const PARCEL_DIASPORA_DFRN = 8;
const PARCEL_LOCAL_DFRN = 9; const PARCEL_LOCAL_DFRN = 9;
const PARCEL_DIRECT = 10; const PARCEL_DIRECT = 10;
const PARCEL_IMAP = 11;
const PARCEL_RDF = 12;
const PARCEL_RSS = 13;
const PARCEL_ATOM = 14;
const PARCEL_TWITTER = 67; const PARCEL_TWITTER = 67;
const PARCEL_UNKNOWN = 255; const PARCEL_UNKNOWN = 255;

View File

@ -1391,7 +1391,7 @@ class Item
$condition = ['id' => $itemid, 'uid' => 0, $condition = ['id' => $itemid, 'uid' => 0,
'network' => array_merge(Protocol::FEDERATED ,['']), 'network' => array_merge(Protocol::FEDERATED ,['']),
'visible' => true, 'deleted' => false, 'private' => [self::PUBLIC, self::UNLISTED]]; 'visible' => true, 'deleted' => false, 'private' => [self::PUBLIC, self::UNLISTED]];
$item = Post::selectFirst(self::ITEM_FIELDLIST, $condition); $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), $condition);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
Logger::warning('Item not found', ['condition' => $condition]); Logger::warning('Item not found', ['condition' => $condition]);
return; return;
@ -1480,7 +1480,7 @@ class Item
return 0; return 0;
} }
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => $source_uid]); $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['uri-id' => $uri_id, 'uid' => $source_uid]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]); Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]);
return 0; return 0;
@ -1697,7 +1697,7 @@ class Item
return; return;
} }
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
// Preparing public shadow (removing user specific data) // Preparing public shadow (removing user specific data)
@ -1733,7 +1733,7 @@ class Item
*/ */
private static function addShadowPost(int $itemid) private static function addShadowPost(int $itemid)
{ {
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
return; return;
} }

View File

@ -1830,8 +1830,6 @@ class DFRN
$item = $header; $item = $header;
$item['protocol'] = $protocol;
$item['source'] = $xml; $item['source'] = $xml;
// Get the uri // Get the uri
@ -2260,10 +2258,12 @@ class DFRN
$header = []; $header = [];
$header['uid'] = $importer['importer_uid']; $header['uid'] = $importer['importer_uid'];
$header['network'] = Protocol::DFRN; $header['network'] = Protocol::DFRN;
$header['protocol'] = $protocol;
$header['wall'] = 0; $header['wall'] = 0;
$header['origin'] = 0; $header['origin'] = 0;
$header['contact-id'] = $importer['id']; $header['contact-id'] = $importer['id'];
$header['direction'] = $direction;
$header = Diaspora::setDirection($header, $direction);
if ($direction === Conversation::RELAY) { if ($direction === Conversation::RELAY) {
$header['post-reason'] = Item::PR_RELAY; $header['post-reason'] = Item::PR_RELAY;

View File

@ -1535,13 +1535,7 @@ class Diaspora
$datarray['owner-id'] = Contact::getIdForURL($contact['url'], 0); $datarray['owner-id'] = Contact::getIdForURL($contact['url'], 0);
// Will be overwritten for sharing accounts in Item::insert // Will be overwritten for sharing accounts in Item::insert
if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) { $datarray = self::setDirection($datarray, $direction);
$datarray['post-reason'] = Item::PR_FETCHED;
} elseif ($datarray['uid'] == 0) {
$datarray['post-reason'] = Item::PR_GLOBAL;
} else {
$datarray['post-reason'] = Item::PR_COMMENT;
}
$datarray['guid'] = $guid; $datarray['guid'] = $guid;
$datarray['uri'] = self::getUriFromGuid($author, $guid); $datarray['uri'] = self::getUriFromGuid($author, $guid);
@ -1557,7 +1551,8 @@ class Diaspora
$datarray['protocol'] = Conversation::PARCEL_DIASPORA; $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml; $datarray['source'] = $xml;
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray = self::setDirection($datarray, $direction);
$datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at; $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
@ -1786,12 +1781,13 @@ class Diaspora
$datarray = []; $datarray = [];
$datarray['protocol'] = Conversation::PARCEL_DIASPORA; $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $author_contact['cid']; $datarray['contact-id'] = $author_contact['cid'];
$datarray['network'] = $author_contact['network']; $datarray['network'] = $author_contact['network'];
$datarray = self::setDirection($datarray, $direction);
$datarray['owner-link'] = $datarray['author-link'] = $person['url']; $datarray['owner-link'] = $datarray['author-link'] = $person['url'];
$datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0); $datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
@ -1965,12 +1961,13 @@ class Diaspora
$datarray = []; $datarray = [];
$datarray['protocol'] = Conversation::PARCEL_DIASPORA; $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $author_contact['cid']; $datarray['contact-id'] = $author_contact['cid'];
$datarray['network'] = $author_contact['network']; $datarray['network'] = $author_contact['network'];
$datarray = self::setDirection($datarray, $direction);
$datarray['owner-link'] = $datarray['author-link'] = $person['url']; $datarray['owner-link'] = $datarray['author-link'] = $person['url'];
$datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0); $datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
@ -2382,6 +2379,7 @@ class Diaspora
$datarray['protocol'] = $item['protocol']; $datarray['protocol'] = $item['protocol'];
$datarray['source'] = $item['source']; $datarray['source'] = $item['source'];
$datarray['direction'] = $item['direction']; $datarray['direction'] = $item['direction'];
$datarray['post-reason'] = $item['post-reason'];
$datarray['plink'] = self::plink($author, $datarray['guid']); $datarray['plink'] = self::plink($author, $datarray['guid']);
$datarray['private'] = $item['private']; $datarray['private'] = $item['private'];
@ -2468,7 +2466,8 @@ class Diaspora
$datarray['protocol'] = Conversation::PARCEL_DIASPORA; $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml; $datarray['source'] = $xml;
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray = self::setDirection($datarray, $direction);
/// @todo Copy tag data from original post /// @todo Copy tag data from original post
@ -2690,6 +2689,29 @@ class Diaspora
Post\Media::insert($data); Post\Media::insert($data);
} }
/**
* Set direction and post reason
*
* @param array $datarray
* @param integer $direction
*
* @return array
*/
public static function setDirection(array $datarray, int $direction): array
{
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
$datarray['post-reason'] = Item::PR_FETCHED;
} elseif ($datarray['uid'] == 0) {
$datarray['post-reason'] = Item::PR_GLOBAL;
} else {
$datarray['post-reason'] = Item::PR_PUSHED;
}
return $datarray;
}
/** /**
* Receives status messages * Receives status messages
* *
@ -2780,13 +2802,8 @@ class Diaspora
$datarray['protocol'] = Conversation::PARCEL_DIASPORA; $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml; $datarray['source'] = $xml;
$datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) { $datarray = self::setDirection($datarray, $direction);
$datarray['post-reason'] = Item::PR_FETCHED;
} elseif ($datarray['uid'] == 0) {
$datarray['post-reason'] = Item::PR_GLOBAL;
}
$datarray['body'] = self::replacePeopleGuid($body, $contact['url']); $datarray['body'] = self::replacePeopleGuid($body, $contact['url']);
$datarray['raw-body'] = self::replacePeopleGuid($raw_body, $contact['url']); $datarray['raw-body'] = self::replacePeopleGuid($raw_body, $contact['url']);

View File

@ -33,6 +33,7 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
@ -98,9 +99,11 @@ class Feed
$author = []; $author = [];
$entries = null; $entries = null;
$protocol = Conversation::PARCEL_UNKNOWN;
// Is it RDF? // Is it RDF?
if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) { if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
$protocol = Conversation::PARCEL_RDF;
$author['author-link'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()'); $author['author-link'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
$author['author-name'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()'); $author['author-name'] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
@ -112,6 +115,7 @@ class Feed
// Is it Atom? // Is it Atom?
if ($xpath->query('/atom:feed')->length > 0) { if ($xpath->query('/atom:feed')->length > 0) {
$protocol = Conversation::PARCEL_ATOM;
$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']"); $alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
if (is_object($alternate)) { if (is_object($alternate)) {
foreach ($alternate as $attribute) { foreach ($alternate as $attribute) {
@ -195,6 +199,7 @@ class Feed
// Is it RSS? // Is it RSS?
if ($xpath->query('/rss/channel')->length > 0) { if ($xpath->query('/rss/channel')->length > 0) {
$protocol = Conversation::PARCEL_RSS;
$author['author-link'] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()'); $author['author-link'] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
$author['author-name'] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()'); $author['author-name'] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
@ -250,6 +255,8 @@ class Feed
$header = []; $header = [];
$header['uid'] = $importer['uid'] ?? 0; $header['uid'] = $importer['uid'] ?? 0;
$header['network'] = Protocol::FEED; $header['network'] = Protocol::FEED;
$datarray['protocol'] = $protocol;
$datarray['direction'] = Conversation::PULL;
$header['wall'] = 0; $header['wall'] = 0;
$header['origin'] = 0; $header['origin'] = 0;
$header['gravity'] = GRAVITY_PARENT; $header['gravity'] = GRAVITY_PARENT;

View File

@ -27,6 +27,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\User; use Friendica\Model\User;
@ -247,6 +248,9 @@ class OnePoll
$datarray['verb'] = Activity::POST; $datarray['verb'] = Activity::POST;
$datarray['object-type'] = Activity\ObjectType::NOTE; $datarray['object-type'] = Activity\ObjectType::NOTE;
$datarray['network'] = Protocol::MAIL; $datarray['network'] = Protocol::MAIL;
$datarray['protocol'] = Conversation::PARCEL_IMAP;
$datarray['direction'] = Conversation::PULL;
// $meta = Email::messageMeta($mbox, $msg_uid); // $meta = Email::messageMeta($mbox, $msg_uid);
$datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>')); $datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));

View File

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1475); define('DB_UPDATE_VERSION', 1476);
} }
return [ return [

View File

@ -96,6 +96,7 @@
"global" => ["post-user", "global"], "global" => ["post-user", "global"],
"featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-user`.`uri-id`)", "featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-user`.`uri-id`)",
"network" => ["post-user", "network"], "network" => ["post-user", "network"],
"protocol" => ["post-user", "protocol"],
"vid" => ["post-user", "vid"], "vid" => ["post-user", "vid"],
"psid" => ["post-user", "psid"], "psid" => ["post-user", "psid"],
"verb" => "IF (`post-user`.`vid` IS NULL, '', `verb`.`name`)", "verb" => "IF (`post-user`.`vid` IS NULL, '', `verb`.`name`)",