Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / classes / Group_member.php

diff --git a/classes/Group_member.php b/classes/Group_member.php
index a553af3475a4fc7aa59b7b3d29b289bb760692d4..14f417758da21890fecf21a944cdc77891c3beb8 100644 (file)
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -3,7 +3,7 @@
  * Table Definition for group_member
  */
 
-class Group_member extends Memcached_DataObject
+class Group_member extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -16,15 +16,36 @@ class Group_member extends Memcached_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_member',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function pkeyGet($kv)
+    public static function schemaDef()
     {
-        return Memcached_DataObject::pkeyGet('Group_member', $kv);
+        return array(
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+                'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('group_id', 'profile_id'),
+            'unique keys' => array(
+                'group_member_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'group_member_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'group_member_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                // @fixme probably we want a (profile_id, created) index here?
+                'group_member_profile_id_idx' => array('profile_id'),
+                'group_member_created_idx' => array('created'),
+                'group_member_profile_id_created_idx' => array('profile_id', 'created'),
+                'group_member_group_id_created_idx' => array('group_id', 'created'),
+            ),
+        );
     }
 
     /**
@@ -80,7 +101,7 @@ class Group_member extends Memcached_DataObject
 
     function getMember()
     {
-        $member = Profile::staticGet('id', $this->profile_id);
+        $member = Profile::getKV('id', $this->profile_id);
 
         if (empty($member)) {
             // TRANS: Exception thrown providing an invalid profile ID.
@@ -93,7 +114,7 @@ class Group_member extends Memcached_DataObject
 
     function getGroup()
     {
-        $group  = User_group::staticGet('id', $this->group_id);
+        $group  = User_group::getKV('id', $this->group_id);
 
         if (empty($group)) {
             // TRANS: Exception thrown providing an invalid group ID.
@@ -132,13 +153,22 @@ class Group_member extends Memcached_DataObject
     function asActivity()
     {
         $member = $this->getMember();
+
+        if (!$member) {
+            throw new Exception("No such member: " . $this->profile_id);
+        }
+
         $group  = $this->getGroup();
 
+        if (!$group) {
+            throw new Exception("No such group: " . $this->group_id);
+        }
+
         $act = new Activity();
 
         $act->id = $this->getURI();
 
-        $act->actor     = ActivityObject::fromProfile($member);
+        $act->actor     = $member->asActivityObject();
         $act->verb      = ActivityVerb::JOIN;
         $act->objects[] = ActivityObject::fromGroup($group);
 
@@ -176,14 +206,14 @@ class Group_member extends Memcached_DataObject
         if (!empty($this->uri)) {
             return $this->uri;
         } else {
-            return self::newURI($this->member_id, $this->group_id, $this->created);
+            return self::newURI($this->profile_id, $this->group_id, $this->created);
         }
     }
 
-    static function newURI($member_id, $group_id, $created)
+    static function newURI($profile_id, $group_id, $created)
     {
         return TagURI::mint('join:%d:%d:%s',
-                            $member_id,
+                            $profile_id,
                             $group_id,
                             common_date_iso8601($created));
     }