Added base string to identify the interface name of each interface class.

babelshift · babelshift · commit bc3c9fb7dae6 · 2015-11-21T15:28:24.000-05:00
Added interface/method for DOTA2 fantasy stuff.
diff --git a/SteamWebAPI2.Models/DOTA2PlayerOfficialInfoResult.cs b/SteamWebAPI2.Models/DOTA2PlayerOfficialInfoResult.cs
@@ -0,0 +1,17 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamWebAPI2.Models
+{
+    public class DOTA2PlayerOfficialInfoResult
+    {
+        public string Name { get; set; }
+        public string TeamName { get; set; }
+        public string TeamTag { get; set; }
+        public string Sponsor { get; set; }
+        public int FantasyRole { get; set; }
+    }
+}
diff --git a/SteamWebAPI2.Models/DOTA2PlayerOfficialInfoResultContainer.cs b/SteamWebAPI2.Models/DOTA2PlayerOfficialInfoResultContainer.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamWebAPI2.Models
+{
+    public class DOTA2PlayerOfficialInfoResultContainer
+    {
+        public DOTA2PlayerOfficialInfoResult Result { get; set; }
+    }
+}
diff --git a/SteamWebAPI2.Models/SteamWebAPI2.Models.csproj b/SteamWebAPI2.Models/SteamWebAPI2.Models.csproj
@@ -56,6 +56,8 @@
     <Compile Include="CSGOServerStatusResult.cs" />
     <Compile Include="CSGOServerStatusResultContainer.cs" />
     <Compile Include="CSGOServices.cs" />
+    <Compile Include="DOTA2PlayerOfficialInfoResult.cs" />
+    <Compile Include="DOTA2PlayerOfficialInfoResultContainer.cs" />
     <Compile Include="FeedData.cs" />
     <Compile Include="Friend.cs" />
     <Compile Include="GameSchema.cs" />
diff --git a/SteamWebAPI2/CSGOServers.cs b/SteamWebAPI2/CSGOServers.cs
@@ -9,11 +9,12 @@ namespace SteamWebAPI2
 {
     internal class CSGOServers : SteamWebRequest
     {
-        public CSGOServers(SteamWebRequestParameter developerKey) : base(developerKey) { }
+        public CSGOServers(SteamWebRequestParameter developerKey)
+            : base(developerKey, "ICSGOServers_730") { }
 
         public async Task<CSGOServerStatusResult> GetGameServerStatusAsync()
         {
-            var gameServerStatus = await GetJsonAsync<CSGOServerStatusResultContainer>("ICSGOServers_730", "GetGameServersStatus", 1);
+            var gameServerStatus = await GetJsonAsync<CSGOServerStatusResultContainer>(interfaceName, "GetGameServersStatus", 1);
             return gameServerStatus.Result;
         }
     }
diff --git a/SteamWebAPI2/DOTA2Fantasy.cs b/SteamWebAPI2/DOTA2Fantasy.cs
@@ -0,0 +1,25 @@
+﻿using SteamWebAPI2.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamWebAPI2
+{
+    internal class DOTA2Fantasy : SteamWebRequest
+    {
+        
+        public DOTA2Fantasy(SteamWebRequestParameter developerKey)
+            : base(developerKey, "IDOTA2Fantasy_570") { }
+
+        public async Task<DOTA2PlayerOfficialInfoResult> GetPlayerOfficialInfo(long steamId)
+        {
+            List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
+            parameters.Add(new SteamWebRequestParameter("accountid", steamId.ToString()));
+
+            var gameServerStatus = await GetJsonAsync<DOTA2PlayerOfficialInfoResultContainer>(interfaceName, "GetPlayerOfficialInfo", 1, parameters);
+            return gameServerStatus.Result;
+        }
+    }
+}
diff --git a/SteamWebAPI2/SteamUser.cs b/SteamWebAPI2/SteamUser.cs
@@ -9,13 +9,14 @@ namespace SteamWebAPI2
 {
     internal class SteamUser : SteamWebRequest
     {
-        public SteamUser(SteamWebRequestParameter developerKey) : base(developerKey) { }
+        public SteamUser(SteamWebRequestParameter developerKey)
+            : base(developerKey, "ISteamUser") { }
 
         public async Task<PlayerSummary> GetPlayerSummaryAsync(string steamId)
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
             parameters.Add(new SteamWebRequestParameter("steamids", steamId));
-            var playerSummary = await GetJsonAsync<PlayerSummaryResponseContainer>("ISteamUser", "GetPlayerSummaries", 2, parameters);
+            var playerSummary = await GetJsonAsync<PlayerSummaryResponseContainer>(interfaceName, "GetPlayerSummaries", 2, parameters);
 
             if (playerSummary.Response.Players.Count > 0)
             {
diff --git a/SteamWebAPI2/SteamWebAPI2.csproj b/SteamWebAPI2/SteamWebAPI2.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CSGOServers.cs" />
+    <Compile Include="DOTA2Fantasy.cs" />
     <Compile Include="ErrorMessages.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
diff --git a/SteamWebAPI2/SteamWebAPIUtil.cs b/SteamWebAPI2/SteamWebAPIUtil.cs
@@ -10,17 +10,18 @@ namespace SteamWebAPI2
 {
     internal class SteamWebAPIUtil : SteamWebRequest
     {
-        public SteamWebAPIUtil(SteamWebRequestParameter developerKey) : base(developerKey) { }
+        public SteamWebAPIUtil(SteamWebRequestParameter developerKey) 
+            : base(developerKey, "ISteamWebAPIUtil") { }
 
         public async Task<SteamServerInfo> GetServerInfoAsync()
         {
-            var steamServerInfo = await GetJsonAsync<SteamServerInfo>("ISteamWebAPIUtil", "GetServerInfo", 1);
+            var steamServerInfo = await GetJsonAsync<SteamServerInfo>(interfaceName, "GetServerInfo", 1);
             return steamServerInfo;
         }
 
         public async Task<IReadOnlyCollection<SteamInterface>> GetSupportedAPIListAsync()
         {
-            var steamApiListContainer = await GetJsonAsync<SteamApiListContainer>("ISteamWebAPIUtil", "GetSupportedAPIList", 1);
+            var steamApiListContainer = await GetJsonAsync<SteamApiListContainer>(interfaceName, "GetSupportedAPIList", 1);
             return new ReadOnlyCollection<SteamInterface>(steamApiListContainer.ApiList.Interfaces);
         }
     }
diff --git a/SteamWebAPI2/SteamWebRequest.cs b/SteamWebAPI2/SteamWebRequest.cs
@@ -13,9 +13,10 @@ namespace SteamWebAPI2
 {
     internal abstract class SteamWebRequest
     {
+        protected readonly string interfaceName;
         private SteamWebRequestParameter developerKey;
 
-        public SteamWebRequest(SteamWebRequestParameter developerKey)
+        public SteamWebRequest(SteamWebRequestParameter developerKey, string interfaceName)
         {
             // we assert here because SteamWebRequest is never constructed by the application, instead it is constructed by SteamWebSession (controlled by this library)
             Debug.Assert(developerKey != null);
@@ -29,6 +30,10 @@ public SteamWebRequest(SteamWebRequestParameter developerKey)
             }
 
             this.developerKey = developerKey;
+
+            Debug.Assert(!String.IsNullOrEmpty(interfaceName));
+
+            this.interfaceName = interfaceName;
         }
 
         protected async Task<T> GetJsonAsync<T>(string interfaceName, string methodName, int methodVersion)
diff --git a/SteamWebAPI2/SteamWebRequestParameter.cs b/SteamWebAPI2/SteamWebRequestParameter.cs
@@ -1,19 +1,15 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SteamWebAPI2
 {
-    public class SteamWebRequestParameter
+    internal class SteamWebRequestParameter
     {
         public string Name { get; private set; }
         public string Value { get; private set; }
 
         public SteamWebRequestParameter(string name, string value)
         {
-            if(String.IsNullOrEmpty(name))
+            if (String.IsNullOrEmpty(name))
             {
                 throw new ArgumentNullException("name");
             }
@@ -22,4 +18,4 @@ public SteamWebRequestParameter(string name, string value)
             this.Value = value;
         }
     }
-}
+}
diff --git a/SteamWebAPI2/SteamWebSession.cs b/SteamWebAPI2/SteamWebSession.cs
@@ -42,5 +42,11 @@ public async Task<CSGOServerStatusResult> GetCSGOGameServerStatusAsync()
             CSGOServers csgoServers = new CSGOServers(steamWebApiKey);
             return await csgoServers.GetGameServerStatusAsync();
         }
+        
+        public async Task<DOTA2PlayerOfficialInfoResult> GetDOTA2PlayerOfficialInfo(long steamId)
+        {
+            DOTA2Fantasy dotaFantasy = new DOTA2Fantasy(steamWebApiKey);
+            return await dotaFantasy.GetPlayerOfficialInfo(steamId);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,12 @@ namespace SteamWebAPI2`
`9`	`9`	`{`
`10`	`10`	`internal class CSGOServers : SteamWebRequest`
`11`	`11`	`{`
`12`		`- public CSGOServers(SteamWebRequestParameter developerKey) : base(developerKey) { }`
	`12`	`+ public CSGOServers(SteamWebRequestParameter developerKey)`
	`13`	`+ : base(developerKey, "ICSGOServers_730") { }`
`13`	`14`
`14`	`15`	`public async Task<CSGOServerStatusResult> GetGameServerStatusAsync()`
`15`	`16`	`{`
`16`		`- var gameServerStatus = await GetJsonAsync<CSGOServerStatusResultContainer>("ICSGOServers_730", "GetGameServersStatus", 1);`
	`17`	`+ var gameServerStatus = await GetJsonAsync<CSGOServerStatusResultContainer>(interfaceName, "GetGameServersStatus", 1);`
`17`	`18`	`return gameServerStatus.Result;`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@ namespace SteamWebAPI2`
`9`	`9`	`{`
`10`	`10`	`internal class SteamUser : SteamWebRequest`
`11`	`11`	`{`
`12`		`- public SteamUser(SteamWebRequestParameter developerKey) : base(developerKey) { }`
	`12`	`+ public SteamUser(SteamWebRequestParameter developerKey)`
	`13`	`+ : base(developerKey, "ISteamUser") { }`
`13`	`14`
`14`	`15`	`public async Task<PlayerSummary> GetPlayerSummaryAsync(string steamId)`
`15`	`16`	`{`
`16`	`17`	`List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();`
`17`	`18`	`parameters.Add(new SteamWebRequestParameter("steamids", steamId));`
`18`		`- var playerSummary = await GetJsonAsync<PlayerSummaryResponseContainer>("ISteamUser", "GetPlayerSummaries", 2, parameters);`
	`19`	`+ var playerSummary = await GetJsonAsync<PlayerSummaryResponseContainer>(interfaceName, "GetPlayerSummaries", 2, parameters);`
`19`	`20`
`20`	`21`	`if (playerSummary.Response.Players.Count > 0)`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,18 @@ namespace SteamWebAPI2`
`10`	`10`	`{`
`11`	`11`	`internal class SteamWebAPIUtil : SteamWebRequest`
`12`	`12`	`{`
`13`		`- public SteamWebAPIUtil(SteamWebRequestParameter developerKey) : base(developerKey) { }`
	`13`	`+ public SteamWebAPIUtil(SteamWebRequestParameter developerKey)`
	`14`	`+ : base(developerKey, "ISteamWebAPIUtil") { }`
`14`	`15`
`15`	`16`	`public async Task<SteamServerInfo> GetServerInfoAsync()`
`16`	`17`	`{`
`17`		`- var steamServerInfo = await GetJsonAsync<SteamServerInfo>("ISteamWebAPIUtil", "GetServerInfo", 1);`
	`18`	`+ var steamServerInfo = await GetJsonAsync<SteamServerInfo>(interfaceName, "GetServerInfo", 1);`
`18`	`19`	`return steamServerInfo;`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public async Task<IReadOnlyCollection<SteamInterface>> GetSupportedAPIListAsync()`
`22`	`23`	`{`
`23`		`- var steamApiListContainer = await GetJsonAsync<SteamApiListContainer>("ISteamWebAPIUtil", "GetSupportedAPIList", 1);`
	`24`	`+ var steamApiListContainer = await GetJsonAsync<SteamApiListContainer>(interfaceName, "GetSupportedAPIList", 1);`
`24`	`25`	`return new ReadOnlyCollection<SteamInterface>(steamApiListContainer.ApiList.Interfaces);`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@ namespace SteamWebAPI2`
`13`	`13`	`{`
`14`	`14`	`internal abstract class SteamWebRequest`
`15`	`15`	`{`
	`16`	`+ protected readonly string interfaceName;`
`16`	`17`	`private SteamWebRequestParameter developerKey;`
`17`	`18`
`18`		`- public SteamWebRequest(SteamWebRequestParameter developerKey)`
	`19`	`+ public SteamWebRequest(SteamWebRequestParameter developerKey, string interfaceName)`
`19`	`20`	`{`
`20`	`21`	`// we assert here because SteamWebRequest is never constructed by the application, instead it is constructed by SteamWebSession (controlled by this library)`
`21`	`22`	`Debug.Assert(developerKey != null);`
`@@ -29,6 +30,10 @@ public SteamWebRequest(SteamWebRequestParameter developerKey)`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`this.developerKey = developerKey;`
	`33`	`+`
	`34`	`+ Debug.Assert(!String.IsNullOrEmpty(interfaceName));`
	`35`	`+`
	`36`	`+ this.interfaceName = interfaceName;`
`32`	`37`	`}`
`33`	`38`
`34`	`39`	`protected async Task<T> GetJsonAsync<T>(string interfaceName, string methodName, int methodVersion)`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,15 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`	`2`
`7`	`3`	`namespace SteamWebAPI2`
`8`	`4`	`{`
`9`		`- public class SteamWebRequestParameter`
	`5`	`+ internal class SteamWebRequestParameter`
`10`	`6`	`{`
`11`	`7`	`public string Name { get; private set; }`
`12`	`8`	`public string Value { get; private set; }`
`13`	`9`
`14`	`10`	`public SteamWebRequestParameter(string name, string value)`
`15`	`11`	`{`
`16`		`- if(String.IsNullOrEmpty(name))`
	`12`	`+ if (String.IsNullOrEmpty(name))`
`17`	`13`	`{`
`18`	`14`	`throw new ArgumentNullException("name");`
`19`	`15`	`}`
`@@ -22,4 +18,4 @@ public SteamWebRequestParameter(string name, string value)`
`22`	`18`	`this.Value = value;`
`23`	`19`	`}`
`24`	`20`	`}`
`25`		`-}`
	`21`	`+}`