From cc0670791ef07826055b461e10e64d65ec9e6547 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Feb 2010 19:58:18 -0500
Subject: use new hcard method for webfinger

---
 plugins/OStatus/lib/webfinger.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/webfinger.php b/plugins/OStatus/lib/webfinger.php
index 8a5037629..8d7040310 100644
--- a/plugins/OStatus/lib/webfinger.php
+++ b/plugins/OStatus/lib/webfinger.php
@@ -37,6 +37,7 @@ class Webfinger
 {
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
+    const HCARD       = 'http://microformats.org/profile/hcard';
 
     /**
      * Perform a webfinger lookup given an account.
-- 
cgit v1.2.3-54-g00ecf


From a43598c31ecee2ca77d8c686382c29ee5a0d42b1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Feb 2010 21:07:24 -0500
Subject: cache Web responses in Webfinger library

---
 plugins/OStatus/lib/webfinger.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/webfinger.php b/plugins/OStatus/lib/webfinger.php
index 8d7040310..4b777c9a0 100644
--- a/plugins/OStatus/lib/webfinger.php
+++ b/plugins/OStatus/lib/webfinger.php
@@ -81,11 +81,14 @@ class Webfinger
     function getServiceLinks($domain)
     {
         $url = 'http://'. $domain .'/.well-known/host-meta';
+
         $content = $this->fetchURL($url);
+
         if (empty($content)) {
             common_log(LOG_DEBUG, 'Error fetching host-meta');
             return false;
         }
+
         $result = XRD::parse($content);
 
         // Ensure that the host == domain (spec may include signing later)
@@ -119,6 +122,11 @@ class Webfinger
     function fetchURL($url)
     {
         try {
+            $c = Cache::instance();
+            $content = $c->get('webfinger:url:'.$url);
+            if ($content !== false) {
+                return $content;
+            }
             $client = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
@@ -129,7 +137,11 @@ class Webfinger
             return false;
         }
 
-        return $response->getBody();
+        $body = $response->getBody();
+
+        $c->set('webfinger:url:'.$url, $body);
+
+        return $body;
     }
 
     function applyTemplate($template, $id)
-- 
cgit v1.2.3-54-g00ecf