New function for generating item URIs

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index ade1ca31017dfe1db990e16f1d570d5e667fd6d3..5dfac50c50ab5f9608b813cf2efb35a9b5522e59 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -16,6 +16,7 @@ use Friendica\Core\PConfig;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Model\Item;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -176,7 +177,7 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_REQUEST['extid'] = NETWORK_GPLUS;
 
        if (isset($id)) {
-               $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+               $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_GPLUS.':'.$id);
        }
 
        // $_REQUEST['verb']

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index bdb2b6076234c2ab808179dcb1b2b687eb08eec1..48278d5c2976cb94411649b83296602f89ba2b87 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -15,6 +15,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
 function ifttt_install()
 {
@@ -182,7 +183,7 @@ function ifttt_message($uid, $item)
        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);
+               $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_FACEBOOK . ':' . $hash);
        }
 
        if ($item['type'] == 'link') {

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 2da35abc952420b76628fa300a020d7390d63a95..cf659225d9753cfc6553cda2ccf3821038adff84 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -945,7 +945,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
        $likedata['gravity'] = 3;
        $likedata['uid'] = $uid;
        $likedata['wall'] = 0;
-       $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
+       $likedata['uri'] = Item::newURI($uid);
        $likedata['parent-uri'] = $orig_post["uri"];
        $likedata['contact-id'] = $contactid;
        $likedata['app'] = $post->generator->displayName;

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 8cc5caa89d3cee37e998f20a6963233177fd57b4..a297baeb173a98e6eb32de63637d09672e5f3253 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -853,7 +853,7 @@ function statusnet_fetchtimeline(App $a, $uid)
                                $_REQUEST["extid"] = NETWORK_STATUSNET;
 
                                if (isset($post->id)) {
-                                       $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET . ":" . $post->id);
+                                       $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_STATUSNET . ":" . $post->id);
                                }
 
                                //$_REQUEST["date"] = $post->created_at;

diff --git a/twitter/twitter.php b/twitter/twitter.php
index a38fd72bb06d9dc3d1bd35979b826d2ed518c526..e69ebb8e961833f36ffec01d192f20b03fbafe79 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -807,7 +807,7 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
        $datarray["api_source"] = true;
        $datarray["profile_uid"] = $uid;
        $datarray["extid"] = NETWORK_TWITTER;
-       $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER . ":" . $post->id);
+       $datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ":" . $post->id);
        $datarray['object'] = json_encode($post);
        $datarray["title"] = "";