From 8841519c0dfae069aff6bee6325fa868e4b9b641 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 3 Oct 2018 15:41:51 +0000
Subject: [PATCH] Renamed functions

---
 mod/dfrn_confirm.php                     |  4 ++--
 src/Model/Contact.php                    |  8 ++++----
 src/Protocol/ActivityPub/Processor.php   |  4 ++--
 src/Protocol/ActivityPub/Receiver.php    |  2 +-
 src/Protocol/ActivityPub/Transmitter.php | 12 ++++++------
 src/Worker/APDelivery.php                |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 9bd9339ed7..d3fa45d361 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -337,7 +337,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			);
 		} else {
 			if ($network == Protocol::ACTIVITYPUB) {
-				ActivityPub\Transmitter::transmitContactAccept($contact['url'], $contact['hub-verify'], $uid);
+				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
 				$pending = true;
 			} else {
 				$pending = false;
@@ -394,7 +394,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
 
 		if ($network == Protocol::ACTIVITYPUB && $duplex) {
-			ActivityPub\Transmitter::transmitActivity('Follow', $contact['url'], $uid);
+			ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
 		}
 
 		// Let's send our user to the contact editor in case they want to
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c7513567ac..3ffd5b2af5 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -557,10 +557,10 @@ class Contact extends BaseObject
 		} elseif ($contact['network'] == Protocol::DIASPORA) {
 			Diaspora::sendUnshare($user, $contact);
 		} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
-			ActivityPub\Transmitter::transmitContactUndo($contact['url'], $user['uid']);
+			ActivityPub\Transmitter::sendContactUndo($contact['url'], $user['uid']);
 
 			if ($dissolve) {
-				ActivityPub\Transmitter::transmitContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
+				ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
 			}
 		}
 	}
@@ -1769,7 +1769,7 @@ class Contact extends BaseObject
 				$ret = Diaspora::sendShare($a->user, $contact);
 				logger('share returns: ' . $ret);
 			} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
-				$ret = ActivityPub\Transmitter::transmitActivity('Follow', $contact['url'], $uid);
+				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
 				logger('Follow returns: ' . $ret);
 			}
 		}
@@ -1846,7 +1846,7 @@ class Contact extends BaseObject
 			}
 
 			if ($contact['network'] == Protocol::ACTIVITYPUB) {
-				ActivityPub\Transmitter::transmitContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
+				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
 			}
 
 			// send email notification to owner?
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 69343d6661..8162605613 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file src/Protocol/ActivityPub.php
+ * @file src/Protocol/ActivityPub/Processor.php
  */
 namespace Friendica\Protocol\ActivityPub;
 
@@ -93,7 +93,7 @@ class Processor
 		foreach ($attachments as $attach) {
 			$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
 			if ($filetype == 'image') {
-				$item['body'] .= "\n[img]".$attach['url'].'[/img]';
+				$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
 			} else {
 				if (!empty($item["attach"])) {
 					$item["attach"] .= ',';
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 6b2e02a2c0..b84dc6cee9 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file src/Protocol/ActivityPub.php
+ * @file src/Protocol/ActivityPub/Receiver.php
  */
 namespace Friendica\Protocol\ActivityPub;
 
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index ee4fe20b9a..c3bc2eeb74 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -687,7 +687,7 @@ class Transmitter
 	 * @param integer $uid User ID
 	 * @param string $inbox Target inbox
 	 */
-	public static function transmitProfileDeletion($uid, $inbox)
+	public static function sendProfileDeletion($uid, $inbox)
 	{
 		$owner = User::getOwnerDataById($uid);
 		$profile = APContact::getByURL($owner['url']);
@@ -713,7 +713,7 @@ class Transmitter
 	 * @param integer $uid User ID
 	 * @param string $inbox Target inbox
 	 */
-	public static function transmitProfileUpdate($uid, $inbox)
+	public static function sendProfileUpdate($uid, $inbox)
 	{
 		$owner = User::getOwnerDataById($uid);
 		$profile = APContact::getByURL($owner['url']);
@@ -740,7 +740,7 @@ class Transmitter
 	 * @param string $target Target profile
 	 * @param integer $uid User ID
 	 */
-	public static function transmitActivity($activity, $target, $uid)
+	public static function sendActivity($activity, $target, $uid)
 	{
 		$profile = APContact::getByURL($target);
 
@@ -766,7 +766,7 @@ class Transmitter
 	 * @param $id
 	 * @param integer $uid User ID
 	 */
-	public static function transmitContactAccept($target, $id, $uid)
+	public static function sendContactAccept($target, $id, $uid)
 	{
 		$profile = APContact::getByURL($target);
 
@@ -793,7 +793,7 @@ class Transmitter
 	 * @param $id
 	 * @param integer $uid User ID
 	 */
-	public static function transmitContactReject($target, $id, $uid)
+	public static function sendContactReject($target, $id, $uid)
 	{
 		$profile = APContact::getByURL($target);
 
@@ -819,7 +819,7 @@ class Transmitter
 	 * @param string $target Target profile
 	 * @param integer $uid User ID
 	 */
-	public static function transmitContactUndo($target, $uid)
+	public static function sendContactUndo($target, $uid)
 	{
 		$profile = APContact::getByURL($target);
 
diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 21d4c78589..3c2eba8d8f 100644
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -19,9 +19,9 @@ class APDelivery extends BaseObject
 		} elseif ($cmd == Delivery::SUGGESTION) {
 		} elseif ($cmd == Delivery::RELOCATION) {
 		} elseif ($cmd == Delivery::REMOVAL) {
-			ActivityPub\Transmitter::transmitProfileDeletion($uid, $inbox);
+			ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
 		} elseif ($cmd == Delivery::PROFILEUPDATE) {
-			ActivityPub\Transmitter::transmitProfileUpdate($uid, $inbox);
+			ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
 		} else {
 			$data = ActivityPub\Transmitter::createActivityFromItem($item_id);
 			if (!empty($data)) {