Skip to content

Commit c08c580

Browse files
FabioGamingFabioGaming
committed
finished up object rework
1 parent f154cfc commit c08c580

2 files changed

Lines changed: 31 additions & 45 deletions

File tree

‎Amino.NET/SubClient.cs‎

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,7 @@ public Task accept_host(string chatId, string requestId)
13631363
public Task join_chat(string chatId)
13641364
{
13651365
RestClient client = new RestClient(helpers.BaseUrl);
1366-
RestRequest request = new RestRequest($"/x{communityId}/s/chat/thread/{chatId}/member/{this.client.userID}");
1366+
RestRequest request = new RestRequest($"/x{communityId}/s/chat/thread/{chatId}/member/{this.client.UserId}");
13671367
request.AddHeaders(headers);
13681368
var response = client.ExecutePost(request);
13691369
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
@@ -1374,7 +1374,7 @@ public Task join_chat(string chatId)
13741374
public Task leave_chat(string chatId)
13751375
{
13761376
RestClient client = new RestClient(helpers.BaseUrl);
1377-
RestRequest request = new RestRequest($"/x{communityId}/s/chat/thread/{chatId}/member/{this.client.userID}");
1377+
RestRequest request = new RestRequest($"/x{communityId}/s/chat/thread/{chatId}/member/{this.client.UserId}");
13781378
request.AddHeaders(headers);
13791379
var response = client.Delete(request);
13801380
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
@@ -1498,18 +1498,13 @@ public Objects.UserCheckins get_user_checkins(string userId)
14981498

14991499
public List<Objects.Wiki> get_user_wikis(string userId, int start = 0, int size = 25)
15001500
{
1501-
List<Objects.Wiki> wikis = new List<Objects.Wiki>();
15021501
RestClient client = new RestClient(helpers.BaseUrl);
15031502
RestRequest request = new RestRequest($"/x{communityId}/s/item?type=user-all&start={start}&size={size}&cv=1.2&uid={userId}");
15041503
request.AddHeaders(headers);
15051504
var response = client.ExecuteGet(request);
15061505
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1507-
if (debug) { Trace.WriteLine(response.Content); }
1508-
foreach (JObject wiki in JObject.Parse(response.Content)["itemList"])
1509-
{
1510-
wikis.Add(new Objects.Wiki(wiki));
1511-
}
1512-
return wikis;
1506+
if (Debug) { Trace.WriteLine(response.Content); }
1507+
return System.Text.Json.JsonSerializer.Deserialize<List<Wiki>>(JsonDocument.Parse(response.Content).RootElement.GetProperty("itemList").GetRawText());
15131508
}
15141509

15151510
public Objects.UserAchievements get_user_achievements(string userId)
@@ -1519,8 +1514,8 @@ public Objects.UserAchievements get_user_achievements(string userId)
15191514
request.AddHeaders(headers);
15201515
var response = client.ExecuteGet(request);
15211516
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1522-
if (debug) { Trace.WriteLine(response.Content); }
1523-
return new Objects.UserAchievements((JObject)JObject.Parse(response.Content)["achievements"]);
1517+
if (Debug) { Trace.WriteLine(response.Content); }
1518+
return System.Text.Json.JsonSerializer.Deserialize<UserAchievements>(JsonDocument.Parse(response.Content).RootElement.GetProperty("achievements").GetRawText());
15241519
}
15251520

15261521
public Objects.InfluencerInfo get_influencer_info(string userId, int start = 0, int size = 25)
@@ -1530,8 +1525,8 @@ public Objects.InfluencerInfo get_influencer_info(string userId, int start = 0,
15301525
request.AddHeaders(headers);
15311526
var response = client.ExecuteGet(request);
15321527
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1533-
if (debug) { Trace.WriteLine(response.Content); }
1534-
return new(JObject.Parse(response.Content));
1528+
if (Debug) { Trace.WriteLine(response.Content); }
1529+
return System.Text.Json.JsonSerializer.Deserialize<InfluencerInfo>(JsonDocument.Parse(response.Content).RootElement.GetRawText());
15351530

15361531
}
15371532

@@ -1549,7 +1544,7 @@ public Task add_influencer(string userId, int monthlyFee)
15491544
request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
15501545
var response = client.ExecutePost(request);
15511546
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1552-
if (debug) { Trace.WriteLine(response.Content); }
1547+
if (Debug) { Trace.WriteLine(response.Content); }
15531548
return Task.CompletedTask;
15541549
}
15551550
public Task remove_influencer(string userId)
@@ -1559,7 +1554,7 @@ public Task remove_influencer(string userId)
15591554
request.AddHeaders(headers);
15601555
var response = client.Delete(request);
15611556
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1562-
if (debug) { Trace.WriteLine(response.Content); }
1557+
if (Debug) { Trace.WriteLine(response.Content); }
15631558
return Task.CompletedTask;
15641559
}
15651560

@@ -1582,50 +1577,41 @@ public Task subscribe(string userId, bool autoRenew = false, string transactionI
15821577
request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
15831578
var response = client.ExecutePost(request);
15841579
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1585-
if (debug) { Trace.WriteLine(response.Content); }
1580+
if (Debug) { Trace.WriteLine(response.Content); }
15861581
return Task.CompletedTask;
15871582
}
15881583

1589-
public List<Objects.BlockedUser> get_blocked_users(int start = 0, int size = 25)
1584+
public List<Objects.UserProfile> get_blocked_users(int start = 0, int size = 25)
15901585
{
1591-
List<Objects.BlockedUser> blocked = new List<Objects.BlockedUser>();
15921586
RestClient client = new RestClient(helpers.BaseUrl);
15931587
RestRequest request = new RestRequest($"/x{communityId}/s/block?start={start}&size={size}");
15941588
request.AddHeaders(headers);
15951589
var response = client.ExecuteGet(request);
15961590
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1597-
if (debug) { Trace.WriteLine(response.Content); }
1598-
foreach (JObject user in JObject.Parse(response.Content)["userProfileList"])
1599-
{
1600-
blocked.Add(new(user));
1601-
}
1602-
return blocked;
1591+
if (Debug) { Trace.WriteLine(response.Content); }
1592+
return System.Text.Json.JsonSerializer.Deserialize<List<UserProfile>>(JsonDocument.Parse(response.Content).RootElement.GetProperty("userProfileList").GetRawText());
16031593
}
16041594

16051595
public List<string> get_blocker_users(int start = 0, int size = 25)
16061596
{
1607-
List<string> blockers = new();
16081597
RestClient client = new RestClient(helpers.BaseUrl);
16091598
RestRequest request = new RestRequest($"/x{communityId}/s/block?start={start}&size={size}");
16101599
request.AddHeaders(headers);
16111600
var response = client.ExecuteGet(request);
16121601
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1613-
if (debug) { Trace.WriteLine(response.Content); }
1614-
foreach (string blocker in JObject.Parse(response.Content)["blockerUidList"]) { blockers.Add(blocker); }
1615-
return blockers;
1602+
if (Debug) { Trace.WriteLine(response.Content); }
1603+
return System.Text.Json.JsonSerializer.Deserialize<List<string>>(JsonDocument.Parse(response.Content).RootElement.GetProperty("blockerUidList").GetRawText());
16161604
}
16171605

16181606
public List<Objects.UserProfile> get_leaderboard_info(Types.Leaderboard_Ranking_Types type, int start = 0, int size = 25)
16191607
{
1620-
List<Objects.UserProfile> leaderboard = new();
16211608
RestClient client = new RestClient(helpers.BaseUrl);
16221609
RestRequest request = new RestRequest($"/g/s-x{communityId}/community/leaderboard?rankingType={(int)type}&start={start}&size={size}");
16231610
request.AddHeaders(headers);
16241611
var response = client.ExecuteGet(request);
16251612
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1626-
if (debug) { Trace.WriteLine(response.Content); }
1627-
foreach (JObject user in JObject.Parse(response.Content)["userProfileList"]) { leaderboard.Add(new(user)); }
1628-
return leaderboard;
1613+
if (Debug) { Trace.WriteLine(response.Content); }
1614+
return System.Text.Json.JsonSerializer.Deserialize<List<UserProfile>>(JsonDocument.Parse(response.Content).RootElement.GetProperty("userProfileList").GetRawText());
16291615
}
16301616

16311617

@@ -1636,8 +1622,8 @@ public Objects.Wiki get_wiki_info(string wikiId)
16361622
request.AddHeaders(headers);
16371623
var response = client.ExecuteGet(request);
16381624
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1639-
if (debug) { Trace.WriteLine(response.Content); }
1640-
return new((JObject)JObject.Parse(response.Content)["item"]);
1625+
if (Debug) { Trace.WriteLine(response.Content); }
1626+
return System.Text.Json.JsonSerializer.Deserialize<Wiki>(JsonDocument.Parse(response.Content).RootElement.GetProperty("item").GetRawText());
16411627
}
16421628

16431629
public Task kick_from_chat(string userId, string chatId, bool allowRejoin = true)
@@ -1649,7 +1635,7 @@ public Task kick_from_chat(string userId, string chatId, bool allowRejoin = true
16491635

16501636
var response = client.Delete(request);
16511637
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1652-
if (debug) { Trace.WriteLine(response.Content); }
1638+
if (Debug) { Trace.WriteLine(response.Content); }
16531639
return Task.CompletedTask;
16541640
}
16551641

@@ -1660,7 +1646,7 @@ public Task delete_chat(string chatId)
16601646
request.AddHeaders(headers);
16611647
var response = client.Delete(request);
16621648
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1663-
if (debug) { Trace.WriteLine(response.Content); }
1649+
if (Debug) { Trace.WriteLine(response.Content); }
16641650
return Task.CompletedTask;
16651651
}
16661652

@@ -1673,7 +1659,7 @@ public Task handle_promotion(string noticeId, bool accept = true)
16731659
request.AddHeaders(headers);
16741660
var response = client.ExecutePost(request);
16751661
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1676-
if (debug) { Trace.WriteLine(response.Content); }
1662+
if (Debug) { Trace.WriteLine(response.Content); }
16771663
return Task.CompletedTask;
16781664
}
16791665

@@ -1709,7 +1695,7 @@ public Task play_quiz(string quizId, List<string> questionIdList, List<string> a
17091695
request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
17101696
var response = client.ExecutePost(request);
17111697
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
1712-
if (debug) { Trace.WriteLine(response.Content); }
1698+
if (Debug) { Trace.WriteLine(response.Content); }
17131699
return Task.CompletedTask;
17141700
}
17151701

‎Amino.NET/WebSocketHandler.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public WebSocketHandler(Amino.Client client)
2424

2525
private async Task StartWebSocket(Amino.Client _client)
2626
{
27-
var final = $"{_client.deviceID}|{(Math.Round(helpers.GetTimestamp())) * 1000}";
27+
var final = $"{_client.DeviceId}|{(Math.Round(helpers.GetTimestamp())) * 1000}";
2828
WebSocketURL += $"/?signbody={final.Replace("|", "%7C")}";
2929

3030
var factory = new Func<ClientWebSocket>(() =>
@@ -36,8 +36,8 @@ private async Task StartWebSocket(Amino.Client _client)
3636
KeepAliveInterval = TimeSpan.FromSeconds(30)
3737
}
3838
};
39-
client.Options.SetRequestHeader("NDCDEVICEID", _client.deviceID);
40-
client.Options.SetRequestHeader("NDCAUTH", $"sid={_client.sessionID}");
39+
client.Options.SetRequestHeader("NDCDEVICEID", _client.DeviceId);
40+
client.Options.SetRequestHeader("NDCAUTH", $"sid={_client.SessionId}");
4141
client.Options.SetRequestHeader("NDC-MSG-SIG", helpers.generate_signiture(final));
4242
client.Options.SetRequestHeader("Upgrade", "websocket");
4343
client.Options.SetRequestHeader("Connection", "Upgrade");
@@ -53,7 +53,7 @@ private async Task StartWebSocket(Amino.Client _client)
5353
ws_client.ReconnectTimeout = TimeSpan.FromSeconds(45);
5454
ws_client.DisconnectionHappened.Subscribe(info =>
5555
{
56-
if (_client.debug)
56+
if (_client.Debug)
5757
{
5858
Trace.WriteLine($"WebSocket: Disconnected\nReason: {info.CloseStatusDescription}");
5959
// Attempt reconnection only if the disconnection wasn't triggered by the user
@@ -65,14 +65,14 @@ private async Task StartWebSocket(Amino.Client _client)
6565
});
6666
ws_client.ReconnectionHappened.Subscribe(info =>
6767
{
68-
if (_client.debug)
68+
if (_client.Debug)
6969
{
7070
Trace.WriteLine($"WebSocket: Reconnected\nMessage: {info.Type}");
7171
}
7272
});
7373
ws_client.MessageReceived.Subscribe(msg =>
7474
{
75-
if (_client.debug)
75+
if (_client.Debug)
7676
{
7777
Trace.WriteLine($"WebSocket: Received Message: {msg.Text}");
7878
}
@@ -100,7 +100,7 @@ public async Task DisconnectSocket()
100100
{
101101
await ws_client.Stop(WebSocketCloseStatus.NormalClosure, "WebSocket closed successfully");
102102
ws_client.Dispose();
103-
if (_client.debug)
103+
if (_client.Debug)
104104
{
105105
Trace.WriteLine("WebSocket closed successfully.");
106106
}

0 commit comments

Comments
 (0)