--- activitystream.module (saved version)
+++ (current document)
@@ -358,19 +358,30 @@
   if ($count == NULL) {
     $count = variable_get('default_nodes_main', 10);
   }
-  // All this buddy list stuff doesn't really work yet
-  if (module_exists('buddylist') && $show_buddies) {
-    $buddies = db_query('SELECT bl.buddy as bid FROM {buddylist} bl WHERE bl.uid = %d', $user->uid);
-    // Since a number of items might be from the same buddy, load the users now and stuff them
-    // into an array for later. This avoids loading the same user multiple times.
-    while ($buddy = db_fetch_object($buddies)) {
-      $objbuddy = activitystream_user_load($buddy->bid);
-    }
-    if (count($arrusers) == 0) {
-      // No buddies
-      return;
+  $arrUsers = array();
+  // Load buddies from User Relationships
+  if (module_exists('user_relationships_api') && $show_buddies) {
+    $params = array("requester_id" => $user->uid, 'rtid' => 1);
+    $options = array('sort' => 'rtid', 'order' => 'rid DESC', 'limit' => '10', 'include_user_info' => TRUE);
+    $buddies = user_relationships_load($params, $options);
+    foreach ($buddies as $buddy) {
+      //Buddy's uid onto the array.
+      $arrUsers[] = $buddy->requestee_id;
     }
+  }
 
+  // Load buddies from FriendList
+  if (module_exists('friendlist_api') && $show_buddies) {
+    $FriendList = friendlist_api_db_statuses_array($user->uid, null, null, null, null, TRUE);
+    $arrUsers = array_merge($arrUsers, $FriendList);
+  }
+
+  
+  if ($show_buddies) {
+    if (count($arrUsers) == 0) {
+      // No buddies. That's quite sad.
+      return;
+    }  
     $query = 'SELECT n.title, n.nid, s.module, s.link, s.data, n.created FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid in ('.join(',',array_keys($arrUsers)).') ORDER BY n.created DESC';
     $countquery = 'SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid in ('.join(',',array_keys($arrUsers)).')';
   } elseif ($user) {