From: Mikael Nordfeldth Date: Sat, 10 Oct 2015 20:09:51 +0000 (+0200) Subject: Some code aligning for consistency X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=174586bd512b757034e1b00dc9413309f59e9d72;p=quix0rs-gnu-social.git Some code aligning for consistency --- 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); } } diff --git a/classes/Subscription.php b/classes/Subscription.php index 314a597f55..f77472ae70 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -159,8 +159,8 @@ class Subscription extends Managed_DataObject $sub->jabber = 1; $sub->sms = 1; $sub->created = common_sql_now(); - $sub->uri = self::newURI($sub->subscriber, - $sub->subscribed, + $sub->uri = self::newUri($subscriber, + $other, $sub->created); $result = $sub->insert(); @@ -267,18 +267,20 @@ class Subscription extends Managed_DataObject return $sub; } - function asActivity() + public function getSubscriber() { - $subscriber = Profile::getKV('id', $this->subscriber); - $subscribed = Profile::getKV('id', $this->subscribed); + return Profile::getByID($this->subscriber); + } - if (!$subscriber instanceof Profile) { - throw new NoProfileException($this->subscriber); - } + public function getSubscribed() + { + return Profile::getByID($this->subscribed); + } - if (!$subscribed instanceof Profile) { - throw new NoProfileException($this->subscribed); - } + function asActivity() + { + $subscriber = $this->getSubscriber(); + $subscribed = $this->getSubscribed(); $act = new Activity(); @@ -286,7 +288,7 @@ class Subscription extends Managed_DataObject // XXX: rationalize this with the URL - $act->id = $this->getURI(); + $act->id = $this->getUri(); $act->time = strtotime($this->created); // TRANS: Activity title when subscribing to another person. @@ -431,20 +433,8 @@ class Subscription extends Managed_DataObject return parent::update($dataObject); } - function getURI() - { - if (!empty($this->uri)) { - return $this->uri; - } else { - return self::newURI($this->subscriber, $this->subscribed, $this->created); - } - } - - static function newURI($subscriber_id, $subscribed_id, $created) + public function getUri() { - return TagURI::mint('follow:%d:%d:%s', - $subscriber_id, - $subscribed_id, - common_date_iso8601($created)); + return $this->uri ?: self::newUri($this->getSubscriber(), $this->getSubscribed(), $this->created); } }