X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=429c5051ffb4a9006e52d86f3f3b04785817a04f;hb=b969df89b2646b5bbe371808225a3b62dd96ad70;hp=3def7d3a8c94735b5f3af3e1fc56d6bb1eebcf90;hpb=789561c7a2e53f374ec0c90eceb928ed66af68c7;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 3def7d3a8c..429c5051ff 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -11,6 +11,7 @@ namespace Friendica\Protocol;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -18,11 +19,11 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Protocol\OStatus;
@@ -40,7 +41,6 @@ require_once 'boot.php';
 require_once 'include/dba.php';
 require_once "include/enotify.php";
 require_once "include/items.php";
-require_once "include/event.php";
 require_once "include/text.php";
 
 /**
@@ -2078,8 +2078,8 @@ class DFRN
 				return false;
 			}
 
-			$fields = ['title' => $item["title"], 'body' => $item["body"],
-					'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+			$fields = ['title' => defaults($item, 'title', ''), 'body' => defaults($item, 'body', ''),
+					'tag' => defaults($item, 'tag', ''), 'changed' => DateTimeFormat::utcNow(),
 					'edited' => DateTimeFormat::utc($item["edited"])];
 
 			$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
@@ -2453,7 +2453,7 @@ class DFRN
 			$purifier = new HTMLPurifier($config);
 			$item['body'] = $purifier->purify($item['body']);
 
-			$item['body'] = @Friendica\Content\Text\HTML::toBBCode($item['body']);
+			$item['body'] = @HTML::toBBCode($item['body']);
 		}
 
 		/// @todo We should check for a repeated post and if we know the repeated author.
@@ -2613,7 +2613,7 @@ class DFRN
 			// Is it an event?
 			if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
 				logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
-				$ev = bbtoevent($item["body"]);
+				$ev = Event::fromBBCode($item["body"]);
 				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
 					logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
 					$ev["cid"]     = $importer["id"];
@@ -2632,7 +2632,7 @@ class DFRN
 						$ev["id"] = $r[0]["id"];
 					}
 
-					$event_id = event_store($ev);
+					$event_id = Event::store($ev);
 					logger("Event ".$event_id." was stored", LOGGER_DEBUG);
 					return;
 				}