open-tween
Fork

Commit

Revision	83c88bf019c9664e8c1661b64695eac4b8d44f51 (tree)
Time	2013-07-12 22:41:33
Author	Kimura Youichi <kim.upsilon@bucy...>
Commiter	Kimura Youichi

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

--- a/OpenTween/MyCommon.cs

+++ b/OpenTween/MyCommon.cs

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

--- a/OpenTween/Resources/ChangeLog.txt

+++ b/OpenTween/Resources/ChangeLog.txt

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

--- a/OpenTween/Tween.cs

+++ b/OpenTween/Tween.cs

		@@ -1452,6 +1452,7 @@ namespace OpenTween
1452	1452	{
1453	1453	Interlocked.Exchange(ref refreshFollowers, 0);
1454	1454	doGetFollowersMenu();
	1455	+ GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
1455	1456	GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, 0, "");
1456	1457	if (InvokeRequired && !IsDisposed) this.Invoke(new MethodInvoker(this.TrimPostChain));
1457	1458	}

		@@ -2608,10 +2609,9 @@ namespace OpenTween
2608	2609	case MyCommon.WORKERTYPE.Follower:
2609	2610	bw.ReportProgress(50, Properties.Resources.UpdateFollowersMenuItem1_ClickText1);
2610	2611	ret = tw.GetFollowersApi();
2611		- if (string.IsNullOrEmpty(ret))
2612		- {
2613		- ret = tw.GetNoRetweetIdsApi();
2614		- }
	2612	+ break;
	2613	+ case MyCommon.WORKERTYPE.NoRetweetIds:
	2614	+ ret = tw.GetNoRetweetIdsApi();
2615	2615	break;
2616	2616	case MyCommon.WORKERTYPE.Configuration:
2617	2617	ret = tw.ConfigurationApi();

		@@ -2847,6 +2847,9 @@ namespace OpenTween
2847	2847	case MyCommon.WORKERTYPE.Follower:
2848	2848	smsg = Properties.Resources.UpdateFollowersMenuItem1_ClickText3;
2849	2849	break;
	2850	+ case MyCommon.WORKERTYPE.NoRetweetIds:
	2851	+ smsg = "NoRetweetIds refreshed";
	2852	+ break;
2850	2853	case MyCommon.WORKERTYPE.Configuration:
2851	2854	//進捗メッセージ残す
2852	2855	break;

		@@ -2940,6 +2943,7 @@ namespace OpenTween
2940	2943	rslt.type == MyCommon.WORKERTYPE.DirectMessegeSnt \|\|
2941	2944	rslt.type == MyCommon.WORKERTYPE.Favorites \|\|
2942	2945	rslt.type == MyCommon.WORKERTYPE.Follower \|\|
	2946	+ rslt.type == MyCommon.WORKERTYPE.NoRetweetIds \|\|
2943	2947	rslt.type == MyCommon.WORKERTYPE.FavAdd \|\|
2944	2948	rslt.type == MyCommon.WORKERTYPE.FavRemove \|\|
2945	2949	rslt.type == MyCommon.WORKERTYPE.Related \|\|

		@@ -3104,6 +3108,8 @@ namespace OpenTween
3104	3108	this.PurgeListViewItemCache();
3105	3109	if (_curList != null) _curList.Refresh();
3106	3110	break;
	3111	+ case MyCommon.WORKERTYPE.NoRetweetIds:
	3112	+ break;
3107	3113	case MyCommon.WORKERTYPE.Configuration:
3108	3114	//_waitFollower = false
3109	3115	if (SettingDialog.TwitterConfiguration.PhotoSizeLimit != 0)

		@@ -10770,6 +10776,7 @@ namespace OpenTween
10770	10776	if (this.IsNetworkAvailable())
10771	10777	{
10772	10778	GetTimeline(MyCommon.WORKERTYPE.BlockIds, 0, 0, "");
	10779	+ GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
10773	10780	if (SettingDialog.StartupFollowers)
10774	10781	{
10775	10782	GetTimeline(MyCommon.WORKERTYPE.Follower, 0, 0, "");

		@@ -10831,6 +10838,10 @@ namespace OpenTween
10831	10838	GetTimeline(MyCommon.WORKERTYPE.Follower, 0, 0, "");
10832	10839
10833	10840	// 取得失敗の場合は再試行する
	10841	+ if (!tw.GetNoRetweetSuccess)
	10842	+ GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, 0, "");
	10843	+
	10844	+ // 取得失敗の場合は再試行する
10834	10845	if (SettingDialog.TwitterConfiguration.PhotoSizeLimit == 0)
10835	10846	GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, 0, "");
10836	10847

--- a/OpenTween/Twitter.cs

+++ b/OpenTween/Twitter.cs