Changeset 10413

Timestamp:

04/25/08 12:21:35 (7 months ago)

Author:

mattn

Message:

* token対応

Files:

• lang/javascript/userscripts/reblogcommand.user.js (modified) (5 diffs)

lang/javascript/userscripts/reblogcommand.user.js

@@ -16 +16 @@
 // Reblog
 // ----------------------------------------------------------------------------
+
+function isTumblrDashboardURL(url){
+        return url.match("^http://www\.tumblr\.com/dashboard.*$");
+}
 
 function isTumblrUserURL(url){
@@ -32 +36 @@
 }
 
-function getURLByID(id){
+function getURLByID(id, token){
+        if (token) return "http://www.tumblr.com/reblog/" + id + "/" + token + "?redirect_to=/dashboard";
         return "http://www.tumblr.com/reblog/" + id;
 }
 
-function getSource(url){
-        with(D()){
-                return xhttp.get(url)
-        }
+// copy from tombloo
+function unescapeHTML(s){
+        return s.replace(
+                /&/g, '&').replace(
+                /"/g, '"').replace(
+                /&lt;/g, '<').replace(
+                /&gt;/g, '>');
+}
+
+// copy from tombloo
+function getReblogToken(url){
+        url = unescapeHTML(url);
+        if(url.match(/&pid=(.*)&rk=(.*)/) || url.match('/reblog/(.*?)/([^\\?]*)'))
+                return {
+                        id    : RegExp.$1,
+                        token : RegExp.$2,
+                }
 }
 
@@ -80 +98 @@
 }
 
-function postData(url, aData){
-        with(D()){
-                return xhttp.post(url, aData)
-        }
-}
-
 function reblog(aURL){
         var id  = getIDByPermalink(aURL);
@@ -96 +108 @@
                 }
         }
-        var url = getURLByID(id);
         window.Minibuffer.status('ReblogCommand'+id, 'Reblog ...');
-        getSource(url).
+        d = D();
+        var url = aURL;
+        d.xhttp.get(url).
         next(function(res){
-                return postData(url, createPostData( parseParams( convertToHTMLDocument(res.responseText))));
+                var token = getReblogToken(res.responseText.match('iframe src="(.*?)"')[1]);
+                url = getURLByID(token.id, token.token)
+                return d.xhttp.get(url);
+        }).
+        next(function(res){
+                return d.xhttp.post(url, createPostData( parseParams( convertToHTMLDocument(res.responseText))));
         }).
         next(function(){ window.Minibuffer.status('ReblogCommand'+id, 'Reblog ... done.', 100); d.call()}).
         error(function(){
-                if(confirm('reblog manually ? \n' + url)) reblogManually(aURL);
+                if(confirm('reblog manually ? \n' + url)) reblogManually(url);
                 d.call();
         });
@@ -162 +180 @@
           var urls = [];
           if(!stdin.length){
-                  // command line is just 'reblog'
-                  urls = [window.location.href];
+                  if(isTumblrDashboardURL(window.location.href.toString())){
+                        link = window.Minibuffer.execute('current-link');
+                        if (link) urls = [link.toString()];
+                  }else{
+                        // command line is just 'reblog'
+                        urls = [window.location.href];
+                  }
           }else if(stdin.every(function(a){return typeof a == 'string'})){
                   // command line is 'location | reblog'