Merge pull request #237 from aspriddell/accountinfo-renames

naming cleanups

DragonFruit.Six.Api.Tests/Data/AccountActivityTests.cs

@@ -23,7 +23,7 @@ public void TestAccountActivity(string id, Platform platform, int lastLogin)
             }
 
             var account = GetAccountInfoFor(id, platform);
-            var login = Client.GetLoginInfo(account);
+            var login = Client.GetAccountActivity(account);
 
             Assert.IsTrue(login.Activity.Last.UtcDateTime.Date > lastLoginDate.Date);
         }

DragonFruit.Six.Api.Tests/Utils/IpInfoTests.cs

@@ -12,7 +12,7 @@ public class IpInfoTests : Dragon6ApiTest
         [Test]
         public void TestIpInformation()
         {
-            Client.GetUserLocationInfo();
+            Client.GeolocateSelf();
         }
     }
 }

DragonFruit.Six.Api/Extensions/AccountActivityExtensions.cs

@@ -17,13 +17,13 @@ public static class AccountActivityExtensions
         /// <summary>
         /// Get the <see cref="AccountActivity"/> for a specific <see cref="AccountInfo"/>
         /// </summary>
-        public static AccountActivity GetLoginInfo<T>(this T client, AccountInfo account, CancellationToken token = default) where T : Dragon6Client
-            => GetLoginInfo(client, account.Yield(), token).For(account);
+        public static AccountActivity GetAccountActivity<T>(this T client, AccountInfo account, CancellationToken token = default) where T : Dragon6Client
+            => GetAccountActivity(client, account.Yield(), token).For(account);
 
         /// <summary>
         /// Get the <see cref="AccountActivity"/> for an array of <see cref="AccountInfo"/>s
         /// </summary>
-        public static ILookup<string, AccountActivity> GetLoginInfo<T>(this T client, IEnumerable<AccountInfo> accounts, CancellationToken token = default) where T : Dragon6Client
+        public static ILookup<string, AccountActivity> GetAccountActivity<T>(this T client, IEnumerable<AccountInfo> accounts, CancellationToken token = default) where T : Dragon6Client
         {
             var data = client.Perform<JObject>(new AccountActivityRequest(accounts), token);
             return data.DeserializeAccountLoginInfo();

DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs

@@ -12,9 +12,9 @@ public static class UserLocationInfoExtensions
         /// <summary>
         /// Get the user's IP address and info from the ubisoft servers
         /// </summary>
-        public static UserLocationInfo GetUserLocationInfo<T>(this T client, CancellationToken token = default) where T : Dragon6Client
+        public static UserLocationInfo GeolocateSelf<T>(this T client, CancellationToken token = default) where T : Dragon6Client
         {
-            var request = new UserLocationInfoRequest();
+            var request = new GeolocationRequest();
             return client.Perform<UserLocationInfo>(request, token);
         }
     }

DragonFruit.Six.Api/Requests/AccountActivityRequest.cs

@@ -32,12 +32,17 @@ public AccountActivityRequest(IEnumerable<AccountInfo> profiles)
         [QueryParameter("applicationIds", CollectionConversionMode.Concatenated)]
         public IEnumerable<string> AppIds { get; set; }
 
+        /// <summary>
+        /// A <see cref="IEnumerable{T}"/> of profile ids to use. If set, this will ignore the <see cref="Accounts"/> property
+        /// </summary>
+        public IEnumerable<string> Profiles { get; set; }
+
         /// <summary>
         /// The accounts to check against the activity logs for <see cref="AppIds"/>
         /// </summary>
         public IEnumerable<AccountInfo> Accounts { get; set; }
 
         [QueryParameter("profileIds", CollectionConversionMode.Concatenated)]
-        private IEnumerable<string> ProfileIdString => Accounts.Select(x => x.Identifiers.Profile);
+        private IEnumerable<string> ProfileIdString => Profiles ?? Accounts.Select(x => x.Identifiers.Profile);
     }
 }

DragonFruit.Six.Api/Requests/AccountInfoRequest.cs

@@ -19,11 +19,8 @@ public AccountInfoRequest()
         }
 
         public AccountInfoRequest(Platform platform, LookupMethod lookupMethod, string query)
+            : this(platform, lookupMethod, query.Yield())
         {
-            Platform = platform;
-            LookupMethod = lookupMethod;
-
-            LookupQuery = new[] { query };
         }
 
         public AccountInfoRequest(Platform platform, LookupMethod lookupMethod, IEnumerable<string> queries)

DragonFruit.Six.Api/Requests/UserLocationInfoRequest.cs → DragonFruit.Six.Api/Requests/GeolocationRequest.cs

@@ -5,7 +5,7 @@
 
 namespace DragonFruit.Six.Api.Requests
 {
-    public class UserLocationInfoRequest : ApiRequest
+    public class GeolocationRequest : ApiRequest
     {
         public override string Path => $"{Endpoints.BaseEndpoint}/v2/profiles/me/iplocation";
     }