Add events for representing objects as activity:object

Add 6 new events to make it easier to override the type of an activity object.

2 files changed, 106 insertions, 73 deletions

diff --git a/EVENTS.txt b/EVENTS.txt
index 603507795..65265cdf0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -999,3 +999,27 @@ StartAdminPanelNav: Before displaying the first item in the list of admin panels
 
 EndAdminPanelNav: After displaying the last item in the list of admin panels
 - $nav The AdminPanelNav widget
+
+StartActivityObjectFromNotice: When converting a notice to an activity:object
+- $notice: The notice being converted
+- &$object: The resulting object. Fill this and return false to override defaults.
+
+EndActivityObjectFromNotice: After converting a notice to an activity:object
+- $notice: The notice being converted
+- &$object: The resulting object. Can be edited
+
+StartActivityObjectFromProfile: When converting a profile to an activity:object
+- $profile: The profile being converted
+- &$object: The (empty) object. Fill it up and return false to override defaults.
+
+EndActivityObjectFromProfile: After converting a profile to an activity:object
+- $profile: The profile being converted
+- &$object: The finished object. Can be tweaked
+
+StartActivityObjectFromGroup: When converting a group to an activity:object
+- $group: The group being converted
+- &$object: The (empty) object. Fill and return false to override.
+
+EndActivityObjectFromGroup:  After converting a group to an activity:object
+- $group:  The group being converted
+- &$object: The finished object. Tweak as needed.
diff --git a/lib/activityobject.php b/lib/activityobject.php
index e89c8db4e..536e02133 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -381,13 +381,18 @@ class ActivityObject
     static function fromNotice(Notice $notice)
     {
         $object = new ActivityObject();
+		
+		if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
-        $object->type    = ActivityObject::NOTE;
+			$object->type    = ActivityObject::NOTE;
 
-        $object->id      = $notice->uri;
-        $object->title   = $notice->content;
-        $object->content = $notice->rendered;
-        $object->link    = $notice->bestUrl();
+			$object->id      = $notice->uri;
+			$object->title   = $notice->content;
+			$object->content = $notice->rendered;
+			$object->link    = $notice->bestUrl();
+
+			Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
+		}
 
         return $object;
     }
@@ -396,57 +401,62 @@ class ActivityObject
     {
         $object = new ActivityObject();
 
-        $object->type   = ActivityObject::PERSON;
-        $object->id     = $profile->getUri();
-        $object->title  = $profile->getBestName();
-        $object->link   = $profile->profileurl;
-
-        $orig = $profile->getOriginalAvatar();
-
-        if (!empty($orig)) {
-            $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
-        }
-
-        $sizes = array(
-            AVATAR_PROFILE_SIZE,
-            AVATAR_STREAM_SIZE,
-            AVATAR_MINI_SIZE
-        );
-
-        foreach ($sizes as $size) {
-            $alink  = null;
-            $avatar = $profile->getAvatar($size);
-
-            if (!empty($avatar)) {
-                $alink = AvatarLink::fromAvatar($avatar);
-            } else {
-                $alink = new AvatarLink();
-                $alink->type   = 'image/png';
-                $alink->height = $size;
-                $alink->width  = $size;
-                $alink->url    = Avatar::defaultImage($size);
-
-                if ($size == AVATAR_PROFILE_SIZE) {
-                    // Hack for Twitter import: we don't have a 96x96 image,
-                    // but we do have a 73x73 image. For now, fake it with that.
-                    $avatar = $profile->getAvatar(73);
-                    if ($avatar) {
-                        $alink = AvatarLink::fromAvatar($avatar);
-                        $alink->height= $size;
-                        $alink->width = $size;
-                    }
-                }
-            }
-
-            $object->avatarLinks[] = $alink;
-        }
-
-        if (isset($profile->lat) && isset($profile->lon)) {
-            $object->geopoint = (float)$profile->lat
-                . ' ' . (float)$profile->lon;
-        }
-
-        $object->poco = PoCo::fromProfile($profile);
+		if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) {
+
+			$object->type   = ActivityObject::PERSON;
+			$object->id     = $profile->getUri();
+			$object->title  = $profile->getBestName();
+			$object->link   = $profile->profileurl;
+
+			$orig = $profile->getOriginalAvatar();
+
+			if (!empty($orig)) {
+				$object->avatarLinks[] = AvatarLink::fromAvatar($orig);
+			}
+
+			$sizes = array(
+						   AVATAR_PROFILE_SIZE,
+						   AVATAR_STREAM_SIZE,
+						   AVATAR_MINI_SIZE
+						   );
+
+			foreach ($sizes as $size) {
+				$alink  = null;
+				$avatar = $profile->getAvatar($size);
+
+				if (!empty($avatar)) {
+					$alink = AvatarLink::fromAvatar($avatar);
+				} else {
+					$alink = new AvatarLink();
+					$alink->type   = 'image/png';
+					$alink->height = $size;
+					$alink->width  = $size;
+					$alink->url    = Avatar::defaultImage($size);
+
+					if ($size == AVATAR_PROFILE_SIZE) {
+						// Hack for Twitter import: we don't have a 96x96 image,
+						// but we do have a 73x73 image. For now, fake it with that.
+						$avatar = $profile->getAvatar(73);
+						if ($avatar) {
+							$alink = AvatarLink::fromAvatar($avatar);
+							$alink->height= $size;
+							$alink->width = $size;
+						}
+					}
+				}
+
+				$object->avatarLinks[] = $alink;
+			}
+
+			if (isset($profile->lat) && isset($profile->lon)) {
+				$object->geopoint = (float)$profile->lat
+					. ' ' . (float)$profile->lon;
+			}
+
+			$object->poco = PoCo::fromProfile($profile);
+
+			Event::handle('EndActivityObjectFromProfile', array($profile, &$object));
+		}
 
         return $object;
     }
@@ -455,27 +465,26 @@ class ActivityObject
     {
         $object = new ActivityObject();
 
-        $object->type   = ActivityObject::GROUP;
-        $object->id     = $group->getUri();
-        $object->title  = $group->getBestName();
-        $object->link   = $group->getUri();
+		if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) {
 
-        $object->avatarLinks[] = AvatarLink::fromFilename(
-            $group->homepage_logo,
-            AVATAR_PROFILE_SIZE
-        );
+			$object->type   = ActivityObject::GROUP;
+			$object->id     = $group->getUri();
+			$object->title  = $group->getBestName();
+			$object->link   = $group->getUri();
 
-        $object->avatarLinks[] = AvatarLink::fromFilename(
-            $group->stream_logo,
-            AVATAR_STREAM_SIZE
-        );
+			$object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo,
+															  AVATAR_PROFILE_SIZE);
 
-        $object->avatarLinks[] = AvatarLink::fromFilename(
-            $group->mini_logo,
-            AVATAR_MINI_SIZE
-        );
+			$object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo,
+															  AVATAR_STREAM_SIZE);
+
+			$object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo,
+															  AVATAR_MINI_SIZE);
+
+			$object->poco = PoCo::fromGroup($group);
 
-        $object->poco = PoCo::fromGroup($group);
+			Event::handle('EndActivityObjectFromGroup', array($group, &$object));
+		}
 
         return $object;
     }