X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FGroup_member.php;h=3abb7681e8e5517d67a00693b90ce85f8fe45203;hb=refs%2Fheads%2Fupstream-changes%2Fgoogle-analytics-removal;hp=392440222b066d6c153c2a9704acb88f4ade03a1;hpb=afbb3ec37a32314d55e2163da4a2958bf3a6eba9;p=quix0rs-gnu-social.git

diff --git a/classes/Group_member.php b/classes/Group_member.php
index 392440222b..3abb7681e8 100644
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -65,7 +65,9 @@ class Group_member extends Managed_DataObject
         $member->group_id   = $group_id;
         $member->profile_id = $profile_id;
         $member->created    = common_sql_now();
-        $member->uri        = self::newURI($profile_id, $group_id, $member->created);
+        $member->uri        = self::newUri(Profile::getByID($profile_id),
+                                           User_group::getByID($group_id),
+                                           $member->created);
 
         $result = $member->insert();
 
@@ -166,7 +168,7 @@ class Group_member extends Managed_DataObject
 
         $act = new Activity();
 
-        $act->id = $this->getURI();
+        $act->id = $this->getUri();
 
         $act->actor     = $member->asActivityObject();
         $act->verb      = ActivityVerb::JOIN;
@@ -201,20 +203,8 @@ class Group_member extends Managed_DataObject
         mail_notify_group_join($this->getGroup(), $this->getMember());
     }
 
-    function getURI()
+    function getUri()
     {
-        if (!empty($this->uri)) {
-            return $this->uri;
-        } else {
-            return self::newURI($this->profile_id, $this->group_id, $this->created);
-        }
-    }
-
-    static function newURI($profile_id, $group_id, $created)
-    {
-        return TagURI::mint('join:%d:%d:%s',
-                            $profile_id,
-                            $group_id,
-                            common_date_iso8601($created));
+        return $this->uri ?: self::newUri($this->getMember(), $this->getGroup()->getProfile(), $this->created);
     }
 }