Merge pull request #28 from nyanpasudo/master

Removed dependancy on HTMLAgilityPack

Author: CrustyJew

RedditSharp/Flairs/FlairTemplate.cs

@@ -1,8 +1,29 @@
-namespace RedditSharp
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace RedditSharp
 {
+    public enum FlairPosition
+    {
+        right,
+        left
+    }
     public class UserFlairTemplate // TODO: Consider using this class to set templates as well
     {
+        [JsonProperty("flair_text")]
         public string Text { get; set; }
+
+        [JsonProperty("flair_css_class")]
         public string CssClass { get; set; }
+
+        [JsonProperty("flair_template_id")]
+        public string TemplateId { get; set; }
+
+        [JsonProperty("flair_text_editable")]
+        public bool IsEditable { get; set; }
+
+        [JsonProperty("flair_position")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public FlairPosition FlairPosition { get; set; }
     }
-}
+}

RedditSharp/RedditSharp.csproj

@@ -35,9 +35,6 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\HtmlAgilityPack.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -52,6 +49,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BotWebAgent.cs" />
+    <Compile Include="Flairs\FlairTemplate.cs" />
     <Compile Include="Moderator Actions\ModActionType.cs" />
     <Compile Include="Things\BannedUser.cs" />
     <Compile Include="Things\Contributor.cs" />
@@ -70,7 +68,6 @@
     <Compile Include="Things\Comment.cs" />
     <Compile Include="Things\CreatedThing.cs" />
     <Compile Include="Extensions\Extensions.cs" />
-    <Compile Include="Flairs\FlairTemplate.cs" />
     <Compile Include="Interfaces\IWebAgent.cs" />
     <Compile Include="Data\LinkData.cs" />
     <Compile Include="Listing.cs" />

RedditSharp/Things/Subreddit.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Security.Authentication;
 using System.Threading.Tasks;
-using HtmlAgilityPack;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RedditSharp.Extensions.DateTimeExtensions;
@@ -262,9 +261,9 @@ public SubredditSettings Settings
             }
         }
         /// <summary>
-        /// Hacky way to obtain flair templates
+        /// Get a list of the available user flair templates for the subreddit
         /// </summary>
-        public UserFlairTemplate[] UserFlairTemplates // Hacky, there isn't a proper endpoint for this
+        public UserFlairTemplate[] UserFlairTemplates
         {
             get
             {
@@ -279,19 +278,13 @@ public SubredditSettings Settings
                 stream.Close();
                 var response = request.GetResponse();
                 var data = WebAgent.GetResponseString(response.GetResponseStream());
-                var document = new HtmlDocument();
-                document.LoadHtml(data);
-                if (document.DocumentNode.Descendants("div").First().Attributes["error"] != null)
-                    throw new InvalidOperationException("This subreddit does not allow users to select flair.");
-                var templateNodes = document.DocumentNode.Descendants("li");
+                var json = JObject.Parse(data);
+                var choices = json["choices"];
                 var list = new List<UserFlairTemplate>();
-                foreach (var node in templateNodes)
+                foreach (var choice in choices)
                 {
-                    list.Add(new UserFlairTemplate
-                    {
-                        CssClass = node.Descendants("span").First().Attributes["class"].Value.Split(' ')[1],
-                        Text = node.Descendants("span").First().InnerText
-                    });
+                    UserFlairTemplate template = JsonConvert.DeserializeObject<UserFlairTemplate>(choice.ToString());
+                    list.Add(template);
                 }
                 return list.ToArray();
             }