diff -uprN -x CVS facebook_status-DRUPAL-6--3/submodules/fbss_activity/fbss_activity.module facebook_status/submodules/fbss_activity/fbss_activity.module
--- facebook_status-DRUPAL-6--3/submodules/fbss_activity/fbss_activity.module	2010-11-30 07:20:45.000000000 +0000
+++ facebook_status/submodules/fbss_activity/fbss_activity.module	2011-02-07 01:02:12.000000000 +0000
@@ -21,6 +21,17 @@ function fbss_activity_facebook_status_d
 }
 
 /**
+ * Major hack. This shouldn't be needed.
+ * Without this, the FBSS triggers aren't exposed to activity.
+ */
+function fbss_activity_hook_info() {
+  $info = facebook_status_hook_info();
+  $info['fbss_activity'] = $info['facebook_status'];
+  unset($info['facebook_status']);
+  return $info;
+}
+
+/**
  * Implementation of hook_activity_info().
  */
 function fbss_activity_activity_info() {
@@ -29,9 +40,18 @@ function fbss_activity_activity_info() {
   $info->name = 'facebook_status';
   $info->object_type = 'facebook_status';
   $info->eid_field = 'sid';
-  $info->objects = array('Owner' => 'facebook_status', 'Poster' => 'poster');
-  $info->hooks = array('facebook_status' => array('fbss_deleted', 'fbss_edited', 'fbss_submitted', 'fbss_submitted_other'));
-  $info->realms = array('facebook_status_poster' => 'Facebook-style Statuses Poster', 'facebook_status_owner' => 'Facebook-style Statuses Owner');
+  $info->objects = array('Recipient' => 'facebook_status', 'Sender' => 'sender');
+  $hooks = array('fbss_deleted', 'fbss_edited', 'fbss_submitted', 'fbss_submitted_other');
+  foreach (facebook_status_all_contexts() as $type => $details) {
+    if ($type == 'user') {
+      array_push($hooks, 'fbss_submitted_user_self', 'fbss_submitted_user_other');
+    }
+    else {
+      array_push($hooks, 'fbss_submitted_'. $type);
+    }
+  }
+  $info->hooks = array('facebook_status' => $hooks);
+  $info->realms = array('facebook_status_sender' => 'Facebook-style Statuses Sender', 'facebook_status_recipient' => 'Facebook-style Statuses Recipient');
   return $info;
 }
 
@@ -41,9 +61,9 @@ function fbss_activity_activity_info() {
 function fbss_activity_activity_grants($activity) {
   $realms = array();
   if ($activity->type == 'facebook_status') {
-    $realms['facebook_status_owner'] = array($activity->uid);
-    $result = db_fetch_object(db_query("SELECT pid FROM {facebook_status} WHERE sid = %d", $activity->eid));
-    $realms['facebook_status_poster'] = array($result->pid);
+    $realms['facebook_status_sender'] = array($activity->uid);
+    $result = db_fetch_object(db_query("SELECT recipient FROM {facebook_status} WHERE sid = %d", $activity->eid));
+    $realms['facebook_status_recipient'] = array($result->recipient);
   }
   return $realms;
 }
@@ -53,8 +73,8 @@ function fbss_activity_activity_grants($
  */
 function fbss_activity_activity_access_grants($account) {
   return array(
-    'facebook_status_owner' => array($account->uid),
-    'facebook_status_poster' => array($account->uid),
+    'facebook_status_recipient' => array($account->uid),
+    'facebook_status_sender' => array($account->uid),
   );
 }