提交: 83c88bf019c9664e8c1661b64695eac4b8d44f51 - opentween (git)

開発に使用するリポジトリ

Commit MetaInfo

• 修訂: 83c88bf019c9664e8c1661b64695eac4b8d44f51 (tree)
• 時間: 2013-07-12 22:41:33
• 作者: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Log Message

起動時の片思いユーザー取得を無効に設定すると no_retweet_ids の取得が行われない問題の修正 (thx @ui_nyan!)

Change Summary

• modified: OpenTween/MyCommon.cs
• modified: OpenTween/Resources/ChangeLog.txt
• modified: OpenTween/Tween.cs
• modified: OpenTween/Twitter.cs

差異

--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -153,6 +153,7 @@ namespace OpenTween
             UserTimeline,            //UserTimeline
             BlockIds,                //Blocking/ids
             Configuration,           //Twitter Configuration読み込み
+            NoRetweetIds,            //RT非表示ユーザー取得
             //////
             ErrorState,              //エラー表示のみで後処理終了(認証エラー時など)
         }

--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -1,6 +1,7 @@
 更新履歴
 
 ==== Ver 1.1.3-beta1(2013/xx/xx)
+ * FIX: 「片思いユーザーリストを取得する」を無効にするとRT非表示設定が反映されない問題の修正 (thx @ui_nyan!)
 
 ==== Ver 1.1.2(2013/07/06)
  * NEW: 画像アップロード対応サービスについっぷるフォトを追加

--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1452,6 +1452,7 @@ namespace OpenTween
             {
                 Interlocked.Exchange(ref refreshFollowers, 0);
                 doGetFollowersMenu();
+                GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
                 GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, 0, "");
                 if (InvokeRequired && !IsDisposed) this.Invoke(new MethodInvoker(this.TrimPostChain));
             }
@@ -2608,10 +2609,9 @@ namespace OpenTween
                 case MyCommon.WORKERTYPE.Follower:
                     bw.ReportProgress(50, Properties.Resources.UpdateFollowersMenuItem1_ClickText1);
                     ret = tw.GetFollowersApi();
-                    if (string.IsNullOrEmpty(ret))
-                    {
-                        ret = tw.GetNoRetweetIdsApi();
-                    }
+                    break;
+                case MyCommon.WORKERTYPE.NoRetweetIds:
+                    ret = tw.GetNoRetweetIdsApi();
                     break;
                 case MyCommon.WORKERTYPE.Configuration:
                     ret = tw.ConfigurationApi();
@@ -2847,6 +2847,9 @@ namespace OpenTween
                     case MyCommon.WORKERTYPE.Follower:
                         smsg = Properties.Resources.UpdateFollowersMenuItem1_ClickText3;
                         break;
+                    case MyCommon.WORKERTYPE.NoRetweetIds:
+                        smsg = "NoRetweetIds refreshed";
+                        break;
                     case MyCommon.WORKERTYPE.Configuration:
                         //進捗メッセージ残す
                         break;
@@ -2940,6 +2943,7 @@ namespace OpenTween
                 rslt.type == MyCommon.WORKERTYPE.DirectMessegeSnt ||
                 rslt.type == MyCommon.WORKERTYPE.Favorites ||
                 rslt.type == MyCommon.WORKERTYPE.Follower ||
+                rslt.type == MyCommon.WORKERTYPE.NoRetweetIds ||
                 rslt.type == MyCommon.WORKERTYPE.FavAdd ||
                 rslt.type == MyCommon.WORKERTYPE.FavRemove ||
                 rslt.type == MyCommon.WORKERTYPE.Related ||
@@ -3104,6 +3108,8 @@ namespace OpenTween
                     this.PurgeListViewItemCache();
                     if (_curList != null) _curList.Refresh();
                     break;
+                case MyCommon.WORKERTYPE.NoRetweetIds:
+                    break;
                 case MyCommon.WORKERTYPE.Configuration:
                     //_waitFollower = false
                     if (SettingDialog.TwitterConfiguration.PhotoSizeLimit != 0)
@@ -10770,6 +10776,7 @@ namespace OpenTween
             if (this.IsNetworkAvailable())
             {
                 GetTimeline(MyCommon.WORKERTYPE.BlockIds, 0, 0, "");
+                GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
                 if (SettingDialog.StartupFollowers)
                 {
                     GetTimeline(MyCommon.WORKERTYPE.Follower, 0, 0, "");
@@ -10831,6 +10838,10 @@ namespace OpenTween
                     GetTimeline(MyCommon.WORKERTYPE.Follower, 0, 0, "");
 
                 // 取得失敗の場合は再試行する
+                if (!tw.GetNoRetweetSuccess)
+                    GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
+
+                // 取得失敗の場合は再試行する
                 if (SettingDialog.TwitterConfiguration.PhotoSizeLimit == 0)
                     GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, 0, "");
 

--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -3329,7 +3329,6 @@ namespace OpenTween
                 {
                     noRTId.Clear();
                     noRTId.AddRange(tmpIds);
-                    _GetNoRetweetResult = false;
                     return ret;
                 }
             } while (cursor > 0);