#419 QuotedTweets are now considered when using a FilteredStream. The…

… MatchedTweetReceivedEventArgs now contains new matching properties for the QuotedTweets.
linvi · Dec 15, 2016 · 0da97bc · 0da97bc
1 parent 217f3ba
commit 0da97bc
Show file tree

Hide file tree

Showing 8 changed files with 479 additions and 245 deletions.
diff --git a/Tweetinvi.Core/Core/Extensions/DictionaryExtensions.cs b/Tweetinvi.Core/Core/Extensions/DictionaryExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Tweetinvi.Core.Extensions
 {
@@ -32,5 +33,13 @@ public static class DictionaryExtensions
                 dictionary.Add(key, value);
             }
         }
+
+        public static IDictionary<T1, T2> MergeWith<T1, T2>(this Dictionary<T1, T2> source, Dictionary<T1, T2> other)
+        {
+            var dictionaries = new[] { source, other };
+            return dictionaries.SelectMany(dict => dict)
+                   .ToLookup(pair => pair.Key, pair => pair.Value)
+                   .ToDictionary(group => group.Key, group => group.First());
+        }
     }
 }
diff --git a/Tweetinvi.Core/Public/Events/TweetEventArgs.cs b/Tweetinvi.Core/Public/Events/TweetEventArgs.cs
@@ -47,6 +47,12 @@ public MatchedTweetReceivedEventArgs(ITweet tweet, string json) : base(tweet, js
         public ILocation[] MatchingLocations { get; set; }
         public long[] MatchingFollowers { get; set; }
         public MatchOn MatchOn { get; set; }
+
+
+        public string[] QuotedTweetMatchingTracks { get; set; }
+        public ILocation[] QuotedTweetMatchingLocations { get; set; }
+        public long[] QuotedTweetMatchingFollowers { get; set; }
+        public MatchOn QuotedTweetMatchOn { get; set; }
     }
 
     public class TweetDeletedEventArgs : EventArgs

diff --git a/Tweetinvi.Streams/FilterStreamTweetMatcher.cs b/Tweetinvi.Streams/FilterStreamTweetMatcher.cs
diff --git a/Tweetinvi.Streams/FilterStreamTweetMatcherFactory.cs b/Tweetinvi.Streams/FilterStreamTweetMatcherFactory.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Tweetinvi.Core.Streaming;
+using Tweetinvi.Models;
+
+namespace Tweetinvi.Streams
+{
+    public interface IFilterStreamTweetMatcherFactory
+    {
+        IFilterStreamTweetMatcher Create(
+            IStreamTrackManager<ITweet> streamTrackManager,
+            Dictionary<ILocation, Action<ITweet>> locations,
+            Dictionary<long?, Action<ITweet>> followingUserIds);
+    }
+
+    public class FilterStreamTweetMatcherFactory : IFilterStreamTweetMatcherFactory
+    {
+        public IFilterStreamTweetMatcher Create(
+            IStreamTrackManager<ITweet> streamTrackManager, 
+            Dictionary<ILocation, Action<ITweet>> locations,
+            Dictionary<long?, Action<ITweet>> followingUserIds)
+        {
+            return new FilterStreamTweetMatcher(streamTrackManager, locations, followingUserIds);
+        }
+    }
+}
diff --git a/Tweetinvi.Streams/FilteredStream.cs b/Tweetinvi.Streams/FilteredStream.cs
diff --git a/Tweetinvi.Streams/StreaminviModule.cs b/Tweetinvi.Streams/StreaminviModule.cs
@@ -24,6 +24,9 @@ public void Initialize()
             _container.RegisterType<ITrackedStream, TrackedStream>();
             _container.RegisterType<IFilteredStream, FilteredStream>();
 
+            _container.RegisterType<IFilterStreamTweetMatcher, FilterStreamTweetMatcher>();
+            _container.RegisterType<IFilterStreamTweetMatcherFactory, FilterStreamTweetMatcherFactory>(RegistrationLifetime.InstancePerApplication);
+
             _container.RegisterType<IWarningMessage, WarningMessage>();
             _container.RegisterType<IWarningMessageTooManyFollowers, WarningMessageTooManyFollowers>();
             _container.RegisterType<IWarningMessageFallingBehind, WarningMessageFallingBehind>();

diff --git a/Tweetinvi.Streams/Tweetinvi.Streams.csproj b/Tweetinvi.Streams/Tweetinvi.Streams.csproj
@@ -55,6 +55,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FilteredStream.cs" />
+    <Compile Include="FilterStreamTweetMatcher.cs" />
+    <Compile Include="FilterStreamTweetMatcherFactory.cs" />
     <Compile Include="Helpers\QueryGeneratorHelper.cs" />
     <Compile Include="Helpers\StreamResultGenerator.cs" />
     <Compile Include="Helpers\StreamTrackManager.cs" />

diff --git a/Tweetinvi.sln.DotSettings b/Tweetinvi.sln.DotSettings
@@ -3,4 +3,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTO/@EntryIndexedValue">DTO</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=URL/@EntryIndexedValue">URL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>