Skip to content

Commit e679748

Browse files
committed
add custom server support
1 parent 417ac2f commit e679748

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

GeometryDashAPI/GeometryDashAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<RepositoryUrl>https://github.com/Folleach/GeometryDashAPI</RepositoryUrl>
1212
<RepositoryType>git</RepositoryType>
1313
<PackageTags>api, geometry, dash</PackageTags>
14-
<PackageVersion>0.1.19</PackageVersion>
14+
<PackageVersion>0.1.20</PackageVersion>
1515
<LangVersion>latest</LangVersion>
1616
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1717
</PropertyGroup>

GeometryDashAPI/Server/GameServer.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public async Task<ServerResponse<TopResponse>> GetTop(TopType type, int count)
3030
.AddToChain(GetIdentifier())
3131
.AddProperty(new Property("type", type.GetAttributeOfSelected<OriginalNameAttribute>().OriginalName))
3232
.AddProperty(new Property("count", count));
33-
return await Get<TopResponse>("/database/getGJScores20.php", query);
33+
return await Get<TopResponse>("/getGJScores20.php", query);
3434
}
3535

3636
public async Task<ServerResponse<LevelPageResponse>> GetLevels(GetLevelsQuery getLevelsQuery)
3737
{
3838
var query = new FlexibleQuery()
3939
.AddToChain(OnlineQuery.Default)
4040
.AddToChain(getLevelsQuery);
41-
return await Get<LevelPageResponse>("/database/getGJLevels21.php", query);
41+
return await Get<LevelPageResponse>("/getGJLevels21.php", query);
4242
}
4343

4444
public async Task<ServerResponse<LevelPageResponse>> GetFeatureLevels(int page)
@@ -58,7 +58,7 @@ public async Task<ServerResponse<LoginResponse>> Login(string username, string p
5858
.AddProperty(new Property("password", password))
5959
.AddProperty(new Property("sID", 76561198946149263))
6060
.AddProperty(new Property("secret", "Wmfv3899gc9"));
61-
return await Get<LoginResponse>("/database/accounts/loginGJAccount.php", query);
61+
return await Get<LoginResponse>("/accounts/loginGJAccount.php", query);
6262
}
6363

6464
public async Task<ServerResponse<AccountCommentPageResponse>> GetAccountComments(int accountId, int page)
@@ -68,7 +68,7 @@ public async Task<ServerResponse<AccountCommentPageResponse>> GetAccountComments
6868
.AddProperty(new Property("accountID", accountId))
6969
.AddProperty(new Property("page", page))
7070
.AddProperty(new Property("total", 0));
71-
return await Get<AccountCommentPageResponse>("/database/getGJAccountComments20.php", query);
71+
return await Get<AccountCommentPageResponse>("/getGJAccountComments20.php", query);
7272
}
7373

7474
public async Task<ServerResponse<UserResponse>> GetUserByName(string name)
@@ -78,7 +78,7 @@ public async Task<ServerResponse<UserResponse>> GetUserByName(string name)
7878
.AddProperty(new Property("str", name))
7979
.AddProperty(new Property("total", 0))
8080
.AddProperty(new Property("page", 0));
81-
return await Get<UserResponse>("/database/getGJUsers20.php", query);
81+
return await Get<UserResponse>("/getGJUsers20.php", query);
8282
}
8383

8484
public async Task<ServerResponse<LevelResponse>> DownloadLevel(int id)
@@ -88,7 +88,7 @@ public async Task<ServerResponse<LevelResponse>> DownloadLevel(int id)
8888
.AddProperty(new Property("levelID", id))
8989
.AddProperty(new Property("inc", 0))
9090
.AddProperty(new Property("extras", 0));
91-
return await Get<LevelResponse>("/database/downloadGJLevel22.php", query);
91+
return await Get<LevelResponse>("/downloadGJLevel22.php", query);
9292
}
9393

9494
public async Task<ServerResponse<AccountInfoResponse>> GetAccountInfo(int accountId)
@@ -97,7 +97,7 @@ public async Task<ServerResponse<AccountInfoResponse>> GetAccountInfo(int accoun
9797
.AddToChain(OnlineQuery.Default)
9898
.AddToChain(GetIdentifier())
9999
.AddProperty(new Property("targetAccountID", accountId));
100-
return await Get<AccountInfoResponse>("/database/getGJUserInfo20.php", query);
100+
return await Get<AccountInfoResponse>("/getGJUserInfo20.php", query);
101101
}
102102

103103
public async Task<ServerResponse<LevelPageResponse>> GetMyLevels(PasswordQuery account, int userId, int page)
@@ -110,7 +110,7 @@ public async Task<ServerResponse<LevelPageResponse>> GetMyLevels(PasswordQuery a
110110
QueryString = userId.ToString(),
111111
Page = page
112112
});
113-
return await Get<LevelPageResponse>("/database/getGJLevels21.php", query);
113+
return await Get<LevelPageResponse>("/getGJLevels21.php", query);
114114
}
115115

116116
private async Task<ServerResponse<T>> Get<T>(string path, IQuery query)

GeometryDashAPI/Server/Network.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@ namespace GeometryDashAPI.Server
1010
public class Network
1111
{
1212
private readonly IFactory<HttpClient> httpClientFactory;
13+
private readonly string server;
1314
private readonly Func<string, bool> responseFilter;
14-
public Encoding DataEncoding { get; }
1515
public int Timeout { get; set; } = 30_000;
1616

17-
public Network() : this(Encoding.ASCII)
17+
public Network(string server = "http://www.boomlings.com/database", IFactory<HttpClient> httpClientFactory = null, Func<string, bool> responseFilter = null)
1818
{
19-
}
20-
21-
public Network(Encoding encoding, IFactory<HttpClient> httpClientFactory = null, Func<string, bool> responseFilter = null)
22-
{
23-
DataEncoding = encoding;
2419
this.httpClientFactory = httpClientFactory ?? new DefaultHttpClientFactory();
20+
this.server = server;
2521
this.responseFilter = responseFilter;
2622
}
2723

@@ -35,7 +31,7 @@ public Network(Encoding encoding, IFactory<HttpClient> httpClientFactory = null,
3531
using var httpClient = httpClientFactory.Create();
3632
httpClient.Timeout = TimeSpan.FromMilliseconds(Timeout);
3733

38-
using var response = await httpClient.PostAsync($"http://www.boomlings.com{path}",
34+
using var response = await httpClient.PostAsync($"{server}{path}",
3935
new StringContent(properties.ToString(), Encoding.UTF8, "application/x-www-form-urlencoded"));
4036

4137
var result = await response.Content.ReadAsStringAsync();

0 commit comments

Comments
 (0)