Commit: 55cac00071ecc30dc502e1a2f1c4642b2b10c8bc - open-tween (git)

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

Commit MetaInfo

• Révision: 55cac00071ecc30dc502e1a2f1c4642b2b10c8bc (tree)
• l'heure: 2014-11-23 11:21:55
• Auteur: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Message de Log

ミュート機能がRecentタブで正しく動作していなかった不具合を修正

• https://twitter.com/5px/status/534489488953593856
  
• https://twitter.com/5px/status/534491099490824192
  

Change Summary

• modified: OpenTween.Tests/TabInformationTest.cs
• modified: OpenTween/Resources/ChangeLog.txt
• modified: OpenTween/StatusDictionary.cs

Modification

--- a/OpenTween.Tests/TabInformationTest.cs
+++ b/OpenTween.Tests/TabInformationTest.cs
@@ -78,5 +78,89 @@ namespace OpenTween
             var baseTabName = "NewTab";
             Assert.Throws<TabException>(() => this.tabinfo.MakeTabName(baseTabName, 5));
         }
+
+        [Fact]
+        public void IsMuted_Test()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            var post = new PostClass
+            {
+                UserId = 12345L,
+                Text = "hogehoge",
+            };
+            Assert.True(this.tabinfo.IsMuted(post));
+        }
+
+        [Fact]
+        public void IsMuted_NotMutingTest()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            var post = new PostClass
+            {
+                UserId = 11111L,
+                Text = "hogehoge",
+            };
+            Assert.False(this.tabinfo.IsMuted(post));
+        }
+
+        [Fact]
+        public void IsMuted_RetweetTest()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            var post = new PostClass
+            {
+                UserId = 11111L,
+                RetweetedByUserId = 12345L,
+                Text = "hogehoge",
+            };
+            Assert.True(this.tabinfo.IsMuted(post));
+        }
+
+        [Fact]
+        public void IsMuted_RetweetNotMutingTest()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            var post = new PostClass
+            {
+                UserId = 11111L,
+                RetweetedByUserId = 22222L,
+                Text = "hogehoge",
+            };
+            Assert.False(this.tabinfo.IsMuted(post));
+        }
+
+        [Fact]
+        public void IsMuted_ReplyTest()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            // ミュート対象のユーザーであってもリプライの場合は対象外とする
+            var post = new PostClass
+            {
+                UserId = 12345L,
+                Text = "@foo hogehoge",
+                IsReply = true,
+            };
+            Assert.False(this.tabinfo.IsMuted(post));
+        }
+
+        [Fact]
+        public void IsMuted_NotInHomeTimelineTest()
+        {
+            this.tabinfo.MuteUserIds = new List<long> { 12345L };
+
+            // Recent以外のタブ（検索など）の場合は対象外とする
+            var post = new PostClass
+            {
+                UserId = 12345L,
+                Text = "hogehoge",
+                RelTabName = "Search",
+            };
+            Assert.False(this.tabinfo.IsMuted(post));
+        }
     }
 }

--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -19,6 +19,7 @@
  * FIX: 「選択文字列で検索」-「Google」で、一部の記号を含む検索文字列が途切れる不具合を修正
  * FIX: 数万件のツイートを表示している状態でのCtrl+Aによる全選択が極端に遅くなる問題を修正
  * FIX: UserStreamsから時々不正なJSONが送られてくる問題への対処
+ * FIX: ミュート機能がRecentタブで正しく動作していなかった不具合を修正
 
 ==== Ver 1.2.3(2014/09/03)
  * NEW: UserSteams の (un)mute イベント追加に対応

--- a/OpenTween/StatusDictionary.cs
+++ b/OpenTween/StatusDictionary.cs
@@ -1230,11 +1230,11 @@ namespace OpenTween
             }
         }
 
-        private bool IsMuted(PostClass post)
+        public bool IsMuted(PostClass post)
         {
             // Recent以外のツイートと、リプライはミュート対象外
             // 参照: https://support.twitter.com/articles/20171399-muting-users-on-twitter
-            if (string.IsNullOrEmpty(post.RelTabName) || post.IsReply)
+            if (!string.IsNullOrEmpty(post.RelTabName) || post.IsReply)
                 return false;
 
             if (this.MuteUserIds.Contains(post.UserId))