tobias/friendica
1
0
Fork 0
Code Pull requests Activity

The old fields don't exist anymore

Browse source
This commit is contained in:
Michael 2020-04-15 05:51:06 +00:00
parent 54a4b4df3b
commit fe48b078e4
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Protocol/Diaspora.php
View file

@ -3941,30 +3941,24 @@ class Diaspora
Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG); Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
// Old way - is used by the internal Friendica functions $msg = json_decode($item['signed_text'], true);
/// @todo Change all signatur storing functions to the new format
if ($item['signed_text'] && $item['signature'] && $item['signer']) {
$message = self::messageFromSignature($item);
} else {// New way
$msg = json_decode($item['signed_text'], true);
$message = []; $message = [];
if (is_array($msg)) { if (is_array($msg)) {
foreach ($msg as $field => $data) { foreach ($msg as $field => $data) {
if (!$item["deleted"]) { if (!$item["deleted"]) {
if ($field == "diaspora_handle") { if ($field == "diaspora_handle") {
$field = "author"; $field = "author";
} }
if ($field == "target_type") { if ($field == "target_type") {
$field = "parent_type"; $field = "parent_type";
}
} }
$message[$field] = $data;
} }
} else {
Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG); $message[$field] = $data;
} }
} else {
Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
} }
$message["parent_author_signature"] = self::signature($owner, $message); $message["parent_author_signature"] = self::signature($owner, $message);