From fc4a7ed2a816451915a22cb5aba6b83676cae414 Mon Sep 17 00:00:00 2001
From: moguno <sns@0kn.sakura.ne.jp>
Date: Fri, 6 Jun 2014 20:49:18 +0900
Subject: [PATCH] =?UTF-8?q?=E6=99=82=E8=A8=88=E3=81=8C=E3=81=9A=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AB=E8=AA=8D?=
 =?UTF-8?q?=E8=A8=BC=E3=81=AE=E3=82=B7=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=81=8C=E4=B8=8D=E6=AD=A3=E3=81=AB=E3=81=AA=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/plugin/change_account/change_account.rb | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/plugin/change_account/change_account.rb b/core/plugin/change_account/change_account.rb
index 633d31e..0db6911 100644
--- a/core/plugin/change_account/change_account.rb
+++ b/core/plugin/change_account/change_account.rb
@@ -88,11 +88,10 @@ Plugin.create :change_account do
 
   def request_token(reset = false)
     if !@request_token || reset
-      @request_token = parallel {
-        twitter = MikuTwitter.new
-        twitter.consumer_key = Environment::TWITTER_CONSUMER_KEY
-        twitter.consumer_secret = Environment::TWITTER_CONSUMER_SECRET
-        twitter.request_oauth_token } end 
+      twitter = MikuTwitter.new
+      twitter.consumer_key = Environment::TWITTER_CONSUMER_KEY
+      twitter.consumer_secret = Environment::TWITTER_CONSUMER_SECRET
+      @request_token = twitter.request_oauth_token end 
 
     @request_token end
 
@@ -161,8 +160,16 @@ Plugin.create :change_account do
       }
       false
     }
-    sequence.
-      say(_("登録方法は、\n1. %{authorize_url} にアクセスする\n2. mikutterに登録したいTwitterアカウントでログイン\n3. 適当に進んでいって取得できる7桁のコードをこのウィンドウの一番上に入力\nだよ。") % {authorize_url: request_token(true).authorize_url}, nil)
+
+    begin
+      sequence.
+        say(_("登録方法は、\n1. %{authorize_url} にアクセスする\n2. mikutterに登録したいTwitterアカウントでログイン\n3. 適当に進んでいって取得できる7桁のコードをこのウィンドウの一番上に入力\nだよ。") % {authorize_url: request_token(true).authorize_url}, nil)
+    rescue => error
+      shell.remove(eventbox)
+
+      sequence.say(_("何かがおかしいよ。\n(%{error})") % {error: error.to_s}).next{
+        jump_seq :register_account }
+    end
   end
 
   defsequence :achievement do
@@ -194,7 +201,6 @@ Plugin.create :change_account do
       ach.take!
     else
       achievement = ach
-      request_token if Service.to_a.empty?
       if seq
         sequence.
           say(_("前回の続きから説明するね")).
-- 
1.9.1