Changeset 996346

Timestamp:

09/24/2014 09:46:54 PM (12 years ago)

Author:

sebstein

Message:

• get rid of PHP warning during mass import that $activities->nextPageToken is undefined
• during mass all import, always request 100 items per page
• remove legacy duplicate check via last_activity_id
• only include parameters in G+ API call, which are actually set

File:

• g-crossposting/trunk/g-crossposting.php (modified) (5 diffs)

g-crossposting/trunk/g-crossposting.php

@@ -217 +217 @@
 function g_crossposting_api_activities_list($p_gplusid, $p_apikey, $p_maxactivities, $p_pagetoken) {
     // get list of latest p_maxactivities activities
-    $ch = curl_init("https://www.googleapis.com/plus/v1/people/{$p_gplusid}/activities/public?alt=json&maxResults={$p_maxactivities}&key={$p_apikey}&pageToken={$p_pagetoken}");
+    $query = "https://www.googleapis.com/plus/v1/people/{$p_gplusid}/activities/public?alt=json&key={$p_apikey}";
+
+    if (isset($p_maxactivities)) {
+        $query = $query."&maxResults={$p_maxactivities}";
+    }
+
+    if (isset($p_pagetoken)) {
+        $query = $query."&pageToken={$p_pagetoken}";
+    }
+
+    $ch = curl_init($query);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     $activities = curl_exec($ch);
     curl_close($ch);
+
     $activities = json_decode($activities);
 
@@ -241 +252 @@
     // load options
     $options = g_crossposting_get_settings();
-    $last_activity_id = get_option('g_crossposting_last_activity_id', null);
 
     // get activities from Google+
@@ -250 +260 @@
     }
 
-    // go through activities to see if we got some not posted yet
-    // stop as soon as we found the last posted one
-    $new_activities = array();
-    foreach ($activities->items as $activity) {
-        if ($last_activity_id == null || $activity->id != $last_activity_id) {
-            $new_activities[] = $activity;
-        } else {
-            // found an activity already imported
-            // abort, because the list is sorted by time with newest first
-            break;
-        }
-    }
-
-    if (count($new_activities) > 0) {
-        return $new_activities;
+    if (isset($activities->items) && count($activities->items) > 0) {
+        return $activities->items;
     } else {
         return null;
@@ -279 +276 @@
     $posts_updated = 0;
     foreach ($activities as $activity) {
-        // store ID of latest activity so that we know what was posted already
-        if ($latest_activity_id == null) {
-            $latest_activity_id = $activity->id;
-            update_option('g_crossposting_last_activity_id' , $latest_activity_id);
-        }
-
         // no activity ID or one of being null must be wrong
-        if (! isset($activity->id) || $activity->id == null) {
+        if (! isset($activity->id)) {
             continue;
         }
@@ -548 +539 @@
     {
         $activities = g_crossposting_api_activities_list($options['gplusid'],
-                            $options['apikey'], $options['maxactivities'], $nextPageToken);
+                                                            $options['apikey'], 100, $nextPageToken);
         if ($activities == null) {
             return null;
         }
 
-        $nextPageToken = $activities->nextPageToken;
-        foreach ($activities->items as $activity)
-        {
-            $all_activities[] = $activity;
-        }
+        if (isset($activities->nextPageToken)) {
+            $nextPageToken = $activities->nextPageToken;
+        } else {
+            $nextPageToken = null;
+        }
+
+        $all_activities = array_merge($all_activities, $activities->items);
     }
     while($nextPageToken != null);