Merge branch 'master' of github.com:vimpr/vimperator-plugins

1 files changed, 36 insertions, 11 deletions

diff --git a/twittperator.js b/twittperator.js
index ccf0556..6f7efca 100644
--- a/twittperator.js
+++ b/twittperator.js
@@ -28,7 +28,7 @@ let PLUGIN_INFO =
   <name>Twittperator</name>
   <description>Twitter Client using OAuth and Streaming API</description>
   <description lang="ja">OAuth/StreamingAPI対応Twitterクライアント</description>
-  <version>1.10.1</version>
+  <version>1.11.0</version>
   <minVersion>2.3</minVersion>
   <maxVersion>3.0</maxVersion>
   <author mail="teramako@gmail.com" homepage="http://d.hatena.ne.jp/teramako/">teramako</author>
@@ -1592,6 +1592,18 @@ let PLUGIN_INFO =
     }, // }}}
   }; // }}}
   let Twittperator = { // {{{
+    confirm: function(msg, onYes, onNo, onCancel) {
+      if (!onNo)
+        onNo = function () Twittperator.echo('canceled.');
+
+      commandline.input(
+        msg + " (input 'yes/no'): ",
+        function(s) (s === "yes" ? onYes : onNo)(),
+        {
+          onCancel: onCancel || onNo
+        }
+      );
+    },
     echo: function(msg) { // {{{
       liberator.echo("[Twittperator] " + msg);
     }, // }}}
@@ -1803,17 +1815,11 @@ let PLUGIN_INFO =
       }
     }, // }}}
     withProtectedUserConfirmation: function(check, actionName, action) { // {{{
-      function canceled()
-        Twittperator.echo("Canceled.");
-
       let protectedUserName = Twittperator.isProtected(check);
       if (protectedUserName) {
-        commandline.input(
-          protectedUserName + " is protected user! Do you really want to " + actionName + '? Input "yes" if you want. => ',
-          function(s) (s === "yes" ? action : canceled)(),
-          {
-            onCancel: canceled
-          }
+        Twittperator.confirm(
+          protectedUserName + " is protected user! Do you really want to " + actionName + '?',
+          action
         );
       } else {
         action();
@@ -1892,7 +1898,7 @@ let PLUGIN_INFO =
             "^" +
             this.command.map(function(c)
               let (r = util.escapeRegex(c))
-                (/^\W$/(c) ? r : r + " ")
+                (/^\W$/(c) ? r : r + "( |$)")
             ).join("|")
           );
         },
@@ -2038,6 +2044,25 @@ let PLUGIN_INFO =
         timelineCompleter: true,
         completer: Completers.id(function (it) it.in_reply_to_status_id)
       }),
+      SubCommand({
+        command: ["resetoauth"],
+        description: "Reset OAuth Information",
+        action: function(arg) {
+          Twittperator.confirm(
+            'Do you want to reset OAuth information?',
+            function () {
+              Store.remove("consumerKey");
+              Store.remove("consumerSecret");
+              Store.remove("token");
+              Store.remove("tokenSecret");
+              Store.save();
+              Twittperator.echo("OAuth information were reset.");
+            }
+          );
+        },
+        timelineCompleter: false,
+        completer: Completers.id(function (it) it.in_reply_to_status_id)
+      }),
     ]; // }}}
 
     function findSubCommand(s) { // {{{