Fix AKSW#27 of unsorted activity streams.

Since working offline atm please test this commit.
splattater · Jun 3, 2013 · 375cf14 · white-gecko · Jun 4, 2013 · 375cf14
1 parent 13b8b43
commit 375cf14
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/classes/Xodx/ActivityController.php b/classes/Xodx/ActivityController.php
@@ -521,18 +521,19 @@ public function getActivities ($resourceUri)
                 $activity['context'] = $act['context'];
             }
 
-            $objectResult = $model->sparqlQuery(
-                'PREFIX atom: <http://www.w3.org/2005/Atom/> ' .
-                'PREFIX aair: <http://xmlns.notu.be/aair#> ' .
-                'PREFIX sioc: <http://rdfs.org/sioc/ns#> ' .
-                'PREFIX foaf: <http://xmlns.com/foaf/0.1/> ' .
-                'SELECT ?type ?content ?date ' .
-                'WHERE { ' .
-                '   <' . $objectUri . '> a ?type ; ' .
-                '        sioc:created_at ?date . ' .
-                '   OPTIONAL {<' . $objectUri . '> sioc:content ?content .} ' .
-                '} '
-                );
+            $objectQuery = 'PREFIX atom: <http://www.w3.org/2005/Atom/> ' . PHP_EOL;
+            $objectQuery.= 'PREFIX aair: <http://xmlns.notu.be/aair#> ' . PHP_EOL;
+            $objectQuery.= 'PREFIX sioc: <http://rdfs.org/sioc/ns#> ' . PHP_EOL;
+            $objectQuery.= 'PREFIX foaf: <http://xmlns.com/foaf/0.1/> ' . PHP_EOL;
+            $objectQuery.= 'SELECT ?type ?content ?date ' . PHP_EOL;
+            $objectQuery.= 'WHERE { ' . PHP_EOL;
+            $objectQuery.= '   <' . $objectUri . '> a ?type ; ' . PHP_EOL;
+            $objectQuery.= '        sioc:created_at ?date . ' . PHP_EOL;
+            $objectQuery.= '   OPTIONAL {<' . $objectUri . '> sioc:content ?content .} ' . PHP_EOL;
+            $objectQuery.= '} ' . PHP_EOL;
+            $objectQuery.= 'ORDER BY DESC(?date)' . PHP_EOL;
+
+            $objectResult = $model->sparqlQuery($objectQuery);
 
             if (count($objectResult) > 0) {
                 $activity['objectType']    = $objectResult[0]['type'];

diff --git a/classes/Xodx/UserController.php b/classes/Xodx/UserController.php
@@ -355,6 +355,12 @@ public function getActivityStream (Xodx_User $user = null)
             $act = $activityController->getActivities($resourceUri);
             $activities = array_merge($activities, $act);
         }
+        $tmp = Array();
+        foreach($activities as &$act) {
+            $tmp[] = &$act["pubDate"];
+        }
+        array_multisort($tmp, $activities);
+
         return $activities;
     }
 
@@ -436,7 +442,9 @@ public function homeAction ($template)
                 $template->profileshowName = $profile[0]['name'];
                 $template->profileshowNick = $profile[0]['nick'];
                 $template->profileshowActivities = $activities;
-                $template->profileshowKnows = $knows;
+                if (count($profile) > 0) {
+                    $template->profileshowKnows = $knows;
+                };
                 $template->profileshowNews = $news;
                 $template->addContent('templates/usershow.phtml');
             }