Merge remote-tracking branch 'refs/remotes/CrustyJew/master'

# Conflicts:
#	RedditSharp/RedditSharp.csproj
#	RedditSharp/Things/Thing.cs

Author: czf

README.md

@@ -1,3 +1,5 @@
+[![redditsharp MyGet Build Status](https://www.myget.org/BuildSource/Badge/redditsharp?identifier=038d3763-6401-4c84-b579-f5134e1c8efd)](https://www.myget.org/) [![NuGet version](https://badge.fury.io/nu/redditsharp.svg)](https://badge.fury.io/nu/redditsharp)
+
 **This is a hard fork and IS maintained**. 
 
 Due to the project being abandoned and the previous owner's refusal to transfer the repository to someone else to maintain it, I've created this fork to continue on support for the project.
@@ -8,8 +10,10 @@ A partial implementation of the [Reddit](http://reddit.com) API. Includes suppor
 LINQ-style paging of results.
 
 ```csharp
-var reddit = new Reddit();
-var user = reddit.LogIn("username", "password");
+var webAgent = new BotWebAgent("BotUsername", "BotPass", "ClientID", "ClientSecret", "RedirectUri");
+//This will check if the access token is about to expire before each request and automatically request a new one for you
+//"false" means that it will NOT load the logged in user profile so reddit.User will be null
+var reddit = new Reddit(webAgent, false);
 var subreddit = reddit.GetSubreddit("/r/example");
 subreddit.Subscribe();
 foreach (var post in subreddit.New.Take(25))
@@ -28,7 +32,7 @@ foreach (var post in subreddit.New.Take(25))
 
 ```csharp
 var all = reddit.RSlashAll;
-foreach (var post in all) // BAD
+foreach (var post in all.New) // BAD
 {
     // ...
 }
@@ -38,12 +42,40 @@ This will cause you to page through everything that has ever been posted on Redd
 
 ```csharp
 var all = reddit.RSlashAll;
-foreach (var post in all.Take(25))
+foreach (var post in all.New.Take(25))
 {
     // ...
 }
 ```
 
+
+**Using ListingStreams**
+
+Use ListingStreams to infinitely yeild new Things posted to reddit
+
+Example:
+
+```csharp
+// get all new comments as they are posted.
+foreach (var comment in subreddit.CommentStream)
+{
+    Console.WriteLine(DateTime.Now + "   New Comment posted to /r/example: " + comment.ShortLink);
+}
+```
+
+you can call .GetListingStream() on any Listing<Thing>
+
+```csharp
+// get new modmail
+var newModmail = user.ModMail.GetListingStream();
+foreach (var message in newModmail)
+{
+    if (message.FirstMessageName == "")
+        message.Reply("Thanks for the message - we will get back to you soon.");
+}
+
+```
+
 ## Development
 
 RedditSharp is developed with the following workflow:

Rebracer.xml

@@ -1,10 +1,22 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedditSharp", "RedditSharp\RedditSharp.csproj", "{A368CB75-75F0-4489-904D-B5CEBB0FE624}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRedditSharp", "TestRedditSharp\TestRedditSharp.csproj", "{0101B252-0CCE-4572-8882-D5851FE41E4F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "UnitTesting\UnitTesting.csproj", "{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A368CB75-75F0-4489-904D-B5CEBB0FE624} = {A368CB75-75F0-4489-904D-B5CEBB0FE624}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{46584E90-4894-4EB7-A0B9-FDAF29B4AF8B}"
+	ProjectSection(SolutionItems) = preProject
+		Rebracer.xml = Rebracer.xml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,17 +27,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Any CPU.Build.0 = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|x86.ActiveCfg = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|x86.Build.0 = Debug|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Any CPU.ActiveCfg = Release|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Mixed Platforms.Build.0 = Release|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|x86.ActiveCfg = Release|x86
-		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|x86.Build.0 = Release|x86
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -38,11 +39,34 @@ Global
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Release|x86.ActiveCfg = Release|Any CPU
 		{A368CB75-75F0-4489-904D-B5CEBB0FE624}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = TestRedditSharp\TestRedditSharp.csproj
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Any CPU.Build.0 = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|x86.ActiveCfg = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Debug|x86.Build.0 = Debug|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Any CPU.ActiveCfg = Release|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|x86.ActiveCfg = Release|x86
+		{0101B252-0CCE-4572-8882-D5851FE41E4F}.Release|x86.Build.0 = Release|x86
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4640FC9-F8A5-4B11-A9FE-8FEB626B2080}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = TestRedditSharp\TestRedditSharp.csproj
+	EndGlobalSection
 EndGlobal

RedditSharp.sln

@@ -1,15 +1,15 @@
+using Newtonsoft.Json.Linq;
+using RedditSharp.Things;
 using System;
 using System.Net;
 using System.Security.Authentication;
 using System.Text;
-using Newtonsoft.Json.Linq;
-using RedditSharp.Things;
 
 namespace RedditSharp
 {
     public class AuthProvider
     {
-        private const string AccessUrl = "https://ssl.reddit.com/api/v1/access_token";
+        public const string AccessUrl = "https://ssl.reddit.com/api/v1/access_token";
         private const string OauthGetMeUrl = "https://oauth.reddit.com/api/v1/me";
         private const string RevokeUrl = "https://www.reddit.com/api/v1/revoke_token";
 
@@ -82,7 +82,7 @@ public AuthProvider(string clientId, string clientSecret, string redirectUri,IWe
         /// <returns></returns>
         public string GetAuthUrl(string state, Scope scope, bool permanent = false)
         {
-            return String.Format("https://ssl.reddit.com/api/v1/authorize?client_id={0}&response_type=code&state={1}&redirect_uri={2}&duration={3}&scope={4}", _clientId, state, _redirectUri, permanent ? "permanent" : "temporary", scope.ToString().Replace(" ",""));
+            return string.Format("https://ssl.reddit.com/api/v1/authorize?client_id={0}&response_type=code&state={1}&redirect_uri={2}&duration={3}&scope={4}", _clientId, state, _redirectUri, permanent ? "permanent" : "temporary", scope.ToString().Replace(" ",""));
         }
 
         /// <summary>
@@ -198,7 +198,7 @@ public void RevokeToken(string token, bool isRefresh)
         public AuthenticatedUser GetUser(string accessToken)
         {
             var request = _webAgent.CreateGet(OauthGetMeUrl);
-            request.Headers["Authorization"] = String.Format("bearer {0}", accessToken);
+            request.Headers["Authorization"] = string.Format("bearer {0}", accessToken);
             var response = (HttpWebResponse)request.GetResponse();
             var result = _webAgent.GetResponseString(response.GetResponseStream());
             var thingjson = "{\"kind\": \"t2\", \"data\": " + result + "}";

RedditSharp/AuthProvider.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RedditSharp
+{
+    public class BotWebAgent : WebAgent
+    {
+        //private so it doesn't leak app secret to other code
+        private AuthProvider TokenProvider;
+        private string Username;
+        private string Password;
+
+        public DateTime TokenValidTo { get; set; }
+
+        public BotWebAgent(string username, string password, string clientID, string clientSecret, string redirectURI)
+        {
+            Username = username;
+            Password = password;
+            EnableRateLimit = true;
+            RateLimit = RateLimitMode.Burst;
+            RootDomain = "oauth.reddit.com";
+            TokenProvider = new AuthProvider(clientID, clientSecret, redirectURI, this);
+            GetNewToken();
+        }
+
+        public override HttpWebRequest CreateRequest(string url, string method)
+        {
+            //add 5 minutes for clock skew to ensure requests succeed 
+            if (url != AuthProvider.AccessUrl && DateTime.UtcNow.AddMinutes(5) > TokenValidTo)
+            {
+                GetNewToken();
+            }
+            return base.CreateRequest(url, method);
+        }
+
+        protected override HttpWebRequest CreateRequest(Uri uri, string method)
+        {
+            //add 5 minutes for clock skew to ensure requests succeed
+            if (uri.ToString() != AuthProvider.AccessUrl && DateTime.UtcNow.AddMinutes(5) > TokenValidTo)
+            {
+                GetNewToken();
+            }
+            return base.CreateRequest(uri, method);
+        }
+
+        private void GetNewToken()
+        {
+            AccessToken = TokenProvider.GetOAuthToken(Username, Password);
+            TokenValidTo = DateTime.UtcNow.AddHours(1);
+        }
+    }
+
+}