Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add more functions #25

Merged
merged 4 commits into from
Apr 25, 2024
Merged

Feature/add more functions #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e0f281
refactored some code and added feature
FabioGaming Apr 19, 2024
0bd1bbd
Added more functions
FabioGaming Apr 22, 2024
9a3d58f
Added function template
FabioGaming Apr 22, 2024
0a0bee2
added functions
FabioGaming Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 136 additions & 3 deletions Amino.NET/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
using System.Globalization;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow;
using Amino.Objects;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using RestSharp;
Expand Down Expand Up @@ -389,6 +388,47 @@ public Task login_sid(string sessionId, bool fetchProfile = true, bool connectSo
return Task.CompletedTask;
}

/// <summary>
/// Allows you to register an Amino account using a google account
/// </summary>
/// <param name="nickname"></param>
/// <param name="googleToken"></param>
/// <param name="password"></param>
/// <param name="deviceId"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public Task register_google(string nickname, string googleToken, string password, string deviceId = null)
{
deviceId = deviceId == null ? helpers.generate_device_id() : deviceId;
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest("/g/s/auth/login");
request.AddHeaders(headers);

Dictionary<string, object> data = new Dictionary<string, object>()
{
{ "secret", $"12 {googleToken}" },
{ "secret2", $"0 {password}" },
{ "deviceID", deviceId },
{ "clientType", 100 },
{ "nickname", nickname },
{ "latitude", 0 },
{ "longitude", 0 },
{ "address", null },
{ "clientCallbackURL", "narviiapp://relogin" },
{ "timestamp", helpers.GetTimestamp() * 1000 },
};

request.AddJsonBody(System.Text.Json.JsonSerializer.Serialize(data));
request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(System.Text.Json.JsonSerializer.Serialize(data)));

var response = client.ExecutePost(request);
if((int)response.StatusCode != 200) { throw new Exception(response.Content); }
if(debug) { Trace.WriteLine(response.Content); }
return Task.CompletedTask;
}




/// <summary>
/// Allows you to register an Amino account
Expand Down Expand Up @@ -428,7 +468,7 @@ public Task register(string _name, string _email, string _password, string _veri
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest("/g/s/auth/register");
request.AddHeaders(headers);
request.AddJsonBody(data);
request.AddJsonBody(JsonConvert.SerializeObject(data));
request.AddHeader("NDC-MSG-SIG", helpers.generate_signiture(JsonConvert.SerializeObject(data)));
var response = client.ExecutePost(request);
if ((int)response.StatusCode != 200) { throw new Exception(response.Content); }
Expand Down Expand Up @@ -1416,6 +1456,11 @@ public Task flag_community(string communityId, string reason, Types.Flag_Types f
/// <returns>string : The URL to the media file you just uploaded</returns>
public string upload_media(string filePath, Types.upload_File_Types type)
{
if(filePath.StartsWith("http"))
{
byte[] fileBytes = new HttpClient().GetAsync(filePath).Result.Content.ReadAsByteArrayAsync().Result;
return upload_media(fileBytes, type);
}
return upload_media(File.ReadAllBytes(filePath), type);
}

Expand Down Expand Up @@ -2421,6 +2466,94 @@ public Task send_sticker(string chatId, string stickerId)
return Task.CompletedTask;
}

/// <summary>
/// Allows you to get information about a blog post
/// </summary>
/// <param name="blogId"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public Objects.Blog get_blog_info(string blogId)
{
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest($"/g/s/blog/{blogId}");
request.AddHeaders(headers);
var response = client.ExecuteGet(request);
if((int)response.StatusCode != 200) { throw new Exception(response.Content); }
if(debug) { Trace.WriteLine(response.Content); }
return new Objects.Blog(JObject.Parse(response.Content));
}


/// <summary>
/// Allows you to get information about a wiki post
/// </summary>
/// <param name="wikiId"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public Objects.Wiki get_wiki_info(string wikiId)
{
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest($"/g/s/item/{wikiId}");
request.AddHeaders(headers);
var response = client.ExecuteGet(request);
if((int)response.StatusCode != 200) { throw new Exception(response.Content); }
if(debug) { Trace.WriteLine(response.Content); }
return new Objects.Wiki(JObject.Parse(response.Content));
}

/// <summary>
/// Allows you to get information about a message in a chat
/// </summary>
/// <param name="chatId"></param>
/// <param name="messageId"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public Objects.Message get_message_info(string chatId, string messageId)
{
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest($"/g/s/chat/thread/{chatId}/message/{messageId}");
request.AddHeaders(headers);
var response = client.ExecuteGet(request);
if((int)response.StatusCode != 200) { throw new Exception(response.Content); }
if(debug) { Trace.WriteLine(response.Content); }
return new Objects.Message(JObject.Parse(response.Content));
}

/// <summary>
/// Allows you to get comments from a blog, THIS FUNCTION IS NOT FINISHED
/// </summary>
/// <param name="blogId"></param>
/// <param name="start"></param>
/// <param name="size"></param>
/// <param name="sorting"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public List<Objects.Comment> get_blog_comments(string blogId, int start = 0, int size = 25, Types.Sorting_Types sorting = Types.Sorting_Types.Newest)
{
string sortingType = "";
switch(sorting)
{
case Types.Sorting_Types.Newest:
sortingType = "newest";
break;
case Types.Sorting_Types.Oldest:
sortingType = "oldest";
break;
case Types.Sorting_Types.Top:
sortingType = "vote";
break;
}
RestClient client = new RestClient(helpers.BaseUrl);
RestRequest request = new RestRequest($"/g/s/blog/{blogId}?sort={sortingType}&start={size}&size={size}");
request.AddHeaders(headers);
var response = client.ExecuteGet(request);
if((int)response.StatusCode != 200) { throw new Exception(response.Content); }
if(debug) { Trace.WriteLine(response.Content); }

return null; // FINISH LATER

}


/// <summary>
/// Sets the SubClient of the Client, not for development use
Expand Down
6 changes: 3 additions & 3 deletions Amino.NET/SubClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public Task delete_invite_code(string inviteId)
/// <param name="fansOnly"></param>
/// <param name="backgroundColor"></param>
/// <returns></returns>
public Task post_blog(string title, string content, List<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
public Task post_blog(string title, string content, IEnumerable<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
{
JArray mediaList = new JArray();
JObject extensionData = new JObject();
Expand Down Expand Up @@ -200,7 +200,7 @@ public Task post_blog(string title, string content, List<byte[]> imageList = nul
/// <param name="fansOnly"></param>
/// <param name="backgroundColor"></param>
/// <returns></returns>
public Task post_wiki(string title, string content, List<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
public Task post_wiki(string title, string content, IEnumerable<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
{
JArray mediaList = new JArray();
JObject extensionData = new JObject();
Expand Down Expand Up @@ -249,7 +249,7 @@ public Task post_wiki(string title, string content, List<byte[]> imageList = nul
/// <param name="fansOnly"></param>
/// <param name="backgroundColor"></param>
/// <returns></returns>
public Task edit_blog(string blogId, string title = null, string content = null, List<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
public Task edit_blog(string blogId, string title = null, string content = null, IEnumerable<byte[]> imageList = null, bool fansOnly = false, string backgroundColor = null)
{
JArray mediaList = new JArray();
JObject extensionData = new JObject();
Expand Down
Loading