From 5ac73a847d8470546016ec1cb498e0008e0d709b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 29 Oct 2020 08:48:08 +0000
Subject: [PATCH] Functions renamed

---
 src/Model/Item.php        | 2 +-
 src/Model/Post/Media.php  | 8 ++++----
 src/Protocol/Diaspora.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 514163e96f..a282762135 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1818,7 +1818,7 @@ class Item
 		}
 
 		// Remove all media attachments from the body and store them in the post-media table
-		$item['raw-body'] = Post\Media::addAttachmentsFromBody($item['uri-id'], $item['raw-body']);
+		$item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
 		$item['raw-body'] = self::setHashtags($item['raw-body']);
 
 		// Check for hashtags in the body and repair or add hashtag links
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index de50f13598..74af04c8ae 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -34,9 +34,9 @@ use Friendica\Util\Images;
  */
 class Media
 {
-    const UNKNOWN = 0;
-    const IMAGE   = 1;
-    const VIDEO   = 2;
+	const UNKNOWN = 0;
+	const IMAGE   = 1;
+	const VIDEO   = 2;
 	const AUDIO   = 3;
 	const TORRENT = 16;
 
@@ -104,7 +104,7 @@ class Media
 	 * @param string $body
 	 * @return string Body without media links
 	 */
-	public static function addAttachmentsFromBody(int $uriid, string $body)
+	public static function insertFromBody(int $uriid, string $body)
 	{
 		// Simplify image codes
 		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index d2bbb7a4d0..c9a02a4fce 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2817,7 +2817,7 @@ class Diaspora
 	 * @param object $photo
 	 * @return void
 	 */
-	private static function storePhoto(int $uriid, $photo)
+	private static function storePhotoAsMedia(int $uriid, $photo)
 	{
 		$data = [];
 		$data['uri-id'] = $uriid;
@@ -2878,7 +2878,7 @@ class Diaspora
 		// Attach embedded pictures to the body
 		if ($data->photo) {
 			foreach ($data->photo as $photo) {
-				self::storePhoto($datarray['uri-id'], $photo);
+				self::storePhotoAsMedia($datarray['uri-id'], $photo);
 				$body = "[img]".XML::unescape($photo->remote_photo_path).
 					XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
 			}