diff --git a/DragonFruit.Six.Api.Tests/Data/AccountActivityTests.cs b/DragonFruit.Six.Api.Tests/Data/AccountActivityTests.cs
index ea71c4bd..cf4d3a84 100644
--- a/DragonFruit.Six.Api.Tests/Data/AccountActivityTests.cs
+++ b/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);
}
diff --git a/DragonFruit.Six.Api.Tests/Utils/IpInfoTests.cs b/DragonFruit.Six.Api.Tests/Utils/IpInfoTests.cs
index 2f8e4e43..a644473e 100644
--- a/DragonFruit.Six.Api.Tests/Utils/IpInfoTests.cs
+++ b/DragonFruit.Six.Api.Tests/Utils/IpInfoTests.cs
@@ -12,7 +12,7 @@ public class IpInfoTests : Dragon6ApiTest
[Test]
public void TestIpInformation()
{
- Client.GetUserLocationInfo();
+ Client.GeolocateSelf();
}
}
}
diff --git a/DragonFruit.Six.Api/Extensions/AccountActivityExtensions.cs b/DragonFruit.Six.Api/Extensions/AccountActivityExtensions.cs
index 66506d40..202f7b42 100644
--- a/DragonFruit.Six.Api/Extensions/AccountActivityExtensions.cs
+++ b/DragonFruit.Six.Api/Extensions/AccountActivityExtensions.cs
@@ -17,13 +17,13 @@ public static class AccountActivityExtensions
///
/// Get the for a specific
///
- public static AccountActivity GetLoginInfo(this T client, AccountInfo account, CancellationToken token = default) where T : Dragon6Client
- => GetLoginInfo(client, account.Yield(), token).For(account);
+ public static AccountActivity GetAccountActivity(this T client, AccountInfo account, CancellationToken token = default) where T : Dragon6Client
+ => GetAccountActivity(client, account.Yield(), token).For(account);
///
/// Get the for an array of s
///
- public static ILookup GetLoginInfo(this T client, IEnumerable accounts, CancellationToken token = default) where T : Dragon6Client
+ public static ILookup GetAccountActivity(this T client, IEnumerable accounts, CancellationToken token = default) where T : Dragon6Client
{
var data = client.Perform(new AccountActivityRequest(accounts), token);
return data.DeserializeAccountLoginInfo();
diff --git a/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs b/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs
index 55e2100d..626145e4 100644
--- a/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs
+++ b/DragonFruit.Six.Api/Extensions/UserLocationInfoExtensions.cs
@@ -12,9 +12,9 @@ public static class UserLocationInfoExtensions
///
/// Get the user's IP address and info from the ubisoft servers
///
- public static UserLocationInfo GetUserLocationInfo(this T client, CancellationToken token = default) where T : Dragon6Client
+ public static UserLocationInfo GeolocateSelf(this T client, CancellationToken token = default) where T : Dragon6Client
{
- var request = new UserLocationInfoRequest();
+ var request = new GeolocationRequest();
return client.Perform(request, token);
}
}
diff --git a/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs b/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs
index 47efb502..84a37184 100644
--- a/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs
+++ b/DragonFruit.Six.Api/Requests/AccountActivityRequest.cs
@@ -32,12 +32,17 @@ public AccountActivityRequest(IEnumerable profiles)
[QueryParameter("applicationIds", CollectionConversionMode.Concatenated)]
public IEnumerable AppIds { get; set; }
+ ///
+ /// A of profile ids to use. If set, this will ignore the property
+ ///
+ public IEnumerable Profiles { get; set; }
+
///
/// The accounts to check against the activity logs for
///
public IEnumerable Accounts { get; set; }
[QueryParameter("profileIds", CollectionConversionMode.Concatenated)]
- private IEnumerable ProfileIdString => Accounts.Select(x => x.Identifiers.Profile);
+ private IEnumerable ProfileIdString => Profiles ?? Accounts.Select(x => x.Identifiers.Profile);
}
}
diff --git a/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs b/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs
index dc6ab080..98dfd187 100644
--- a/DragonFruit.Six.Api/Requests/AccountInfoRequest.cs
+++ b/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 queries)
diff --git a/DragonFruit.Six.Api/Requests/UserLocationInfoRequest.cs b/DragonFruit.Six.Api/Requests/GeolocationRequest.cs
similarity index 86%
rename from DragonFruit.Six.Api/Requests/UserLocationInfoRequest.cs
rename to DragonFruit.Six.Api/Requests/GeolocationRequest.cs
index e2b04032..d8ae87e5 100644
--- a/DragonFruit.Six.Api/Requests/UserLocationInfoRequest.cs
+++ b/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";
}