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

"post-reason" ends double usage of "post-type"

Browse Source
This commit is contained in:
Michael
2021-04-07 06:02:06 +00:00
parent 9a3a7793f0
commit 688e056ad1
13 changed files with 159 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Protocol/DFRN.php
View File

@@ -2195,6 +2195,12 @@ class DFRN
$item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
if (!empty($item["title"])) {
$item["post-type"] = Item::PT_ARTICLE;
} else {
$item["post-type"] = Item::PT_NOTE;
}
$item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
$item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
@@ -2426,8 +2432,8 @@ class DFRN
if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
// Will be overwritten for sharing accounts in Item::insert
if (empty($item['post-type']) && ($entrytype == DFRN::REPLY)) {
$item['post-type'] = Item::PT_COMMENT;
if (empty($item['post-reason']) && ($entrytype == DFRN::REPLY)) {
$item['post-reason'] = Item::PR_COMMENT;
}
$posted_id = Item::insert($item);
@@ -2588,7 +2594,7 @@ class DFRN
$header["direction"] = $direction;
if ($direction === Conversation::RELAY) {
$header['post-type'] = Item::PT_RELAY;
$header['post-reason'] = Item::PR_RELAY;
}
// Update the contact table if the data has changed