From b59c0e54a81eede00700b2feed1b8a2e6559494e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 15 Nov 2016 06:36:52 +0000
Subject: [PATCH] The URI of mirrored posts are now looking more standard

---
 fromgplus/fromgplus.php | 6 ++++--
 ifttt/ifttt.php         | 5 ++++-
 statusnet/statusnet.php | 5 +++--
 twitter/twitter.php     | 5 +++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 4c96892c6..f4a61ec2d 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,6 +11,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 require_once('mod/share.php');
 require_once('mod/parse_url.php');
+require_once('include/text.php');
 
 function fromgplus_install() {
 	register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@@ -164,8 +165,9 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
 	$_REQUEST['source'] = $source;
 	$_REQUEST['extid'] = NETWORK_GPLUS;
 
-	if (isset($id))
-		$_REQUEST['message_id'] = NETWORK_GPLUS.":".$id;
+	if (isset($id)) {
+		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+	}
 
 	// $_REQUEST['verb']
 	// $_REQUEST['parent']
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 382365095..35f3ccc6c 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -155,8 +155,11 @@ function ifttt_message($uid, $item) {
 	//$_REQUEST["date"] = $item["date"];
 	//$_REQUEST["uri"] = $item["url"];
 
-	if (strstr($item["url"], "facebook.com"))
+	if (strstr($item["url"], "facebook.com")) {
+		$hash = hash("ripemd128", item["url"]);
 		$_REQUEST["extid"] = NETWORK_FACEBOOK;
+		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_FACEBOOK.":".$hash);
+	}
 
 	if ($item["type"] == "link") {
 		$data = query_page_info($item["link"]);
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index febe4032f..bc9bc125f 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -872,8 +872,9 @@ function statusnet_fetchtimeline($a, $uid) {
 			$_REQUEST["source"] = $post->source;
 			$_REQUEST["extid"] = NETWORK_STATUSNET;
 
-			if (isset($post->id))
-				$_REQUEST['message_id'] = NETWORK_STATUSNET.":".$post->id;
+			if (isset($post->id)) {
+				$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
+			}
 
 			//$_REQUEST["date"] = $post->created_at;
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index e7429696d..1cc8fd649 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -791,8 +791,9 @@ function twitter_fetchtimeline($a, $uid) {
 			$_REQUEST["source"] = $post->source;
 			$_REQUEST["extid"] = NETWORK_TWITTER;
 
-			if (isset($post->id))
-				$_REQUEST['message_id'] = NETWORK_TWITTER.":".$post->id;
+			if (isset($post->id)) {
+				$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
+			}
 
 			//$_REQUEST["date"] = $post->created_at;