X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=1153f2147d7c5efcb11f2f71b141fda086640253;hb=c083ae047c4259dcfa1c61a3795679bbf1b08d8c;hp=0b6f4ecaaaad33d0289752603d9aacf61dc15fd5;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git

diff --git a/mod/subthread.php b/mod/subthread.php
index 0b6f4ecaaa..1153f2147d 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
@@ -25,7 +25,7 @@ function subthread_content(App $a) {
 	$condition = ["`parent` = ? OR `parent-uri` = ? AND `parent` = `id`", $item_id, $item_id];
 	$item = Item::selectFirst([], $condition);
 
-	if (empty($item_id) || !DBM::is_result($item)) {
+	if (empty($item_id) || !DBA::isResult($item)) {
 		logger('subthread: no item ' . $item_id);
 		return;
 	}
@@ -40,15 +40,12 @@ function subthread_content(App $a) {
 
 	if (!$item['wall']) {
 		// The top level post may have been written by somebody on another system
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($item['contact-id']),
-			intval($item['uid'])
-		);
-		if (!DBM::is_result($r)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
+		if (!DBA::isResult($contact)) {
 			return;
 		}
-		if (!$r[0]['self']) {
-			$remote_owner = $r[0];
+		if (!$contact['self']) {
+			$remote_owner = $contact;
 		}
 	}
 
@@ -60,7 +57,7 @@ function subthread_content(App $a) {
 		intval($owner_uid)
 	);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$owner = $r[0];
 	}
 
@@ -79,18 +76,11 @@ function subthread_content(App $a) {
 	if (local_user() && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($_SESSION['visitor_id']),
-			intval($owner_uid)
-		);
-
-		if (DBM::is_result($r)) {
-			$contact = $r[0];
+		$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id'], 'uid' => $owner_uid]);
+		if (!DBA::isResult($contact)) {
+			return;
 		}
 	}
-	if (!$contact) {
-		return;
-	}
 
 	$uri = Item::newURI($owner_uid);
 
@@ -118,14 +108,13 @@ EOT;
 
 	$arr = [];
 
-	$arr['guid'] = get_guid(32);
+	$arr['guid'] = System::createGUID(32);
 	$arr['uri'] = $uri;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
-	$arr['type'] = 'activity';
 	$arr['wall'] = $item['wall'];
 	$arr['origin'] = 1;
-	$arr['gravity'] = GRAVITY_LIKE;
+	$arr['gravity'] = GRAVITY_ACTIVITY;
 	$arr['parent'] = $item['id'];
 	$arr['parent-uri'] = $item['uri'];
 	$arr['thr-parent'] = $item['uri'];