Centralized gsid generation

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index fbcaf8d4b5888c02d0fc08ae9807033ca45b0346..9ca23f1dcb71f41c5a1e9c6c346c24e809ab7564 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -951,7 +951,7 @@ class DFRN
                                $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
                        }
 
-                       $htmlbody = BBCode::convert($htmlbody, false, 7);
+                       $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS);
                }
 
                $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
@@ -2384,7 +2384,11 @@ class DFRN
                // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
                $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
                if ($dsprsig != "") {
-                       $item["dsprsig"] = $dsprsig;
+                       $signature = json_decode(base64_decode($dsprsig));
+                       // We don't store the old style signatures anymore that also contained the "signature" and "signer"
+                       if (!empty($signature->signed_text) && empty($signature->signature) && empty($signature->signer)) {
+                               $item["diaspora_signed_text"] = $signature->signed_text;
+                       }
                }
 
                $item["verb"] = XML::getFirstNodeValue($xpath, "activity:verb/text()", $entry);
@@ -2424,7 +2428,8 @@ class DFRN
                                if (($term != "") && ($scheme != "")) {
                                        $parts = explode(":", $scheme);
                                        if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
-                                               $termurl = implode(":", $parts);
+                                               $termurl = array_pop($parts);
+                                               $termurl = array_pop($parts) . $termurl;
                                                Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
                                        }
                                }
@@ -2584,7 +2589,7 @@ class DFRN
                        // Turn this into a wall post.
                        $notify = Item::isRemoteSelf($importer, $item);
 
-                       $posted_id = Item::insert($item, false, $notify);
+                       $posted_id = Item::insert($item, $notify);
 
                        if ($notify) {
                                $posted_id = $notify;