From 691c88bce8fa37d1d371988857645b6cdd9994d9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 8 Mar 2010 22:53:43 +0000
Subject: Only allow RSSCloud subs to canonical RSS2 profile feeds

---
 plugins/RSSCloud/RSSCloudRequestNotify.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php
index d76c08d37..030529534 100644
--- a/plugins/RSSCloud/RSSCloudRequestNotify.php
+++ b/plugins/RSSCloud/RSSCloudRequestNotify.php
@@ -270,13 +270,14 @@ class RSSCloudRequestNotifyAction extends Action
 
     function userFromFeed($feed)
     {
-        // We only do profile feeds
+        // We only do canonical RSS2 profile feeds (specified by ID), e.g.:
+        // http://www.example.com/api/statuses/user_timeline/2.rss
 
         $path  = common_path('api/statuses/user_timeline/');
-        $valid = '%^' . $path . '(?<nickname>.*)\.rss$%';
+        $valid = '%^' . $path . '(?<id>.*)\.rss$%';
 
         if (preg_match($valid, $feed, $matches)) {
-            $user = User::staticGet('nickname', $matches['nickname']);
+            $user = User::staticGet('id', $matches['id']);
             if (!empty($user)) {
                 return $user;
             }
-- 
cgit v1.2.3-54-g00ecf


From 7214db14fe37798623acab2e6f5755d05bacbc8f Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 9 Mar 2010 01:24:21 -0500
Subject: wrong param order to strpos()

---
 plugins/OStatus/classes/HubSub.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index 3120a70f9..c420b3eef 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -192,7 +192,7 @@ class HubSub extends Memcached_DataObject
 
         // Any existing query string parameters must be preserved
         $url = $this->callback;
-        if (strpos('?', $url) !== false) {
+        if (strpos($url, '?') !== false) {
             $url .= '&';
         } else {
             $url .= '?';
-- 
cgit v1.2.3-54-g00ecf


From 7afad469c200d9d57af75fc667f05041bec137b6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 9 Mar 2010 11:06:08 +0000
Subject: Use canonical URL for notification in RSSCloud plugin

---
 plugins/RSSCloud/RSSCloudNotifier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/RSSCloud/RSSCloudNotifier.php b/plugins/RSSCloud/RSSCloudNotifier.php
index d454691c8..9e7b53680 100644
--- a/plugins/RSSCloud/RSSCloudNotifier.php
+++ b/plugins/RSSCloud/RSSCloudNotifier.php
@@ -152,7 +152,7 @@ class RSSCloudNotifier
     function notify($profile)
     {
         $feed = common_path('api/statuses/user_timeline/') .
-          $profile->nickname . '.rss';
+          $profile->id . '.rss';
 
         $cloudSub = new RSSCloudSubscription();
 
-- 
cgit v1.2.3-54-g00ecf