feat: Made GetUserIdFromUserNameAsync retry Added the ability to post a image with message

tidusjar · tidusjar · commit b7c0273f66be · 2023-07-13T21:31:10.000+01:00
diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ Don't forget to give the project a star! Thanks again!
 <!-- CONTACT -->
 ## Contact
 
-Your Name - [@tidusjar](https://twitter.com/@tidusjar) - tidusjar@gmail.com
+Jamie - [@tidusjar](https://twitter.com/@tidusjar) - tidusjar@gmail.com
 
 Project Link: [https://github.com/tidusjar/Threads.Api](https://github.com/tidusjar/Threads.Api)
 
diff --git a/src/Threads.Api.Tests/IntegrationTests.cs b/src/Threads.Api.Tests/IntegrationTests.cs
@@ -0,0 +1,54 @@
+﻿namespace Threads.Api.Tests;
+
+[TestFixture]
+[Ignore("yeah")]
+public class IntegrationTests
+{
+    private ThreadsApi _subject;
+
+    private readonly string? _username = Environment.GetEnvironmentVariable("TEST_USERNAME");
+    private readonly string? _password = Environment.GetEnvironmentVariable("TEST_PASSWORD");
+
+    [SetUp]
+    public void Setup()
+    {
+        _subject = new ThreadsApi(new HttpClient());
+        if (string.IsNullOrEmpty(_username))
+        {
+            throw new ArgumentNullException(nameof(_username));
+        }
+
+        if (string.IsNullOrEmpty(_password))
+        {
+            throw new ArgumentNullException(nameof(_password));
+        }
+    }
+
+    [Test]
+    [Ignore("Locks me out")]
+    public async Task Login_Test()
+    {
+        var result = await _subject.LoginAsync(_username, _password);
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Token, Is.Not.Null.Or.Empty);
+            Assert.That(result.UserId, Is.Not.Null.Or.Empty);
+        });
+    }
+
+    [Test]
+    [Ignore("Hit and miss")]
+    public async Task GetUserIdFromUserName_Test()
+    {
+        var result = await _subject.GetUserIdFromUserNameAsync(_username);
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Token, Is.Not.Null);
+            Assert.That(result.UserId, Is.EqualTo(3897985));
+        });
+    }
+}
diff --git a/src/Threads.Api/IThreadsApi.cs b/src/Threads.Api/IThreadsApi.cs
@@ -66,6 +66,8 @@ public interface IThreadsApi
     /// <returns>ID of the post</returns>
     Task<string> PostAsync(string userId, string message, string authToken, CancellationToken cancellationToken = default);
 
+    Task<string> PostImageAsync(string username, string message, string authToken, ImageUploadRequest image, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Follows a user
     /// </summary>
@@ -85,4 +87,5 @@ public interface IThreadsApi
     /// <param name="cancellationToken"><see cref="CancellationToken"/></param>
     /// <returns>true if success else false</returns>
     Task<bool> UnFollowAsync(int userId, string token, string authToken, CancellationToken cancellationToken = default);
+
 }
diff --git a/src/Threads.Api/Models/ImageUploadRequest.cs b/src/Threads.Api/Models/ImageUploadRequest.cs
@@ -0,0 +1,18 @@
+﻿namespace Threads.Api.Models;
+
+
+public class ImageUploadRequest
+{
+    /// <summary>
+    /// Can be either a local path or remote
+    /// </summary>
+    public string Path { get; set; }
+    /// <summary>
+    /// Byte[] of the image content
+    /// </summary>
+    public byte[] Content { get; set; }
+    /// <summary>
+    /// Use in conjunction with <see cref="Content"/>
+    /// </summary>
+    public string MimeType { get; set; }
+}
diff --git a/src/Threads.Api/Models/Response/ImageUploadResponse.cs b/src/Threads.Api/Models/Response/ImageUploadResponse.cs
@@ -0,0 +1,7 @@
+﻿namespace Threads.Api.Models.Response;
+
+internal class ImageUploadResponse
+{
+    public string upload_id { get; set; }
+    public string status { get; set; }
+}
diff --git a/src/Threads.Api/Threads.Api.csproj b/src/Threads.Api/Threads.Api.csproj
@@ -8,7 +8,7 @@
 		<Title>Threads.Net API</Title>
 		<Description>An unofficial Threads.Net API</Description>
 		<PackageProjectUrl>https://github.com/tidusjar/Threads.Net</PackageProjectUrl>
-		<PackageVersion>1.2.0-alpha</PackageVersion>
+		<PackageVersion>1.2.1-alpha</PackageVersion>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<PackageTags>Threads; twitter; meta; insta; api; threads.net; instagram</PackageTags>
 		<RepositoryUrl>https://github.com/tidusjar/Threads.Api/</RepositoryUrl>
diff --git a/src/Threads.Api/ThreadsApi.cs b/src/Threads.Api/ThreadsApi.cs
@@ -11,6 +11,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -30,6 +31,7 @@ public partial class ThreadsApi : IThreadsApi
 
     private readonly string LoginUrl = $"{BaseApiUrl}/bloks/apps/com.bloks.www.bloks.caa.login.async.send_login_request/";
     private readonly string PostUrl = $"{BaseApiUrl}/media/configure_text_only_post/";
+    private readonly string PostImageUrl = $"{BaseApiUrl}/media/configure_text_post_app_feed/";
 
     public ThreadsApi(HttpClient httpClient)
     {
@@ -44,6 +46,39 @@ public async Task<UserIdResponse> GetUserIdFromUserNameAsync(string username, Ca
             throw new ArgumentNullException(nameof(username));
         }
 
+        try
+        {
+            var userResult = await GetUserIdFromUserNameInternal(username, cancellationToken);
+
+            if (int.TryParse(userResult.UserId, out int value))
+            {
+                return new UserIdResponse
+                {
+                    Token = userResult.LsdToken,
+                    UserId = value
+                };
+            }
+        }
+        catch (UserNotFoundException)
+        {
+            var userResult = await GetUserIdFromUserNameInternal(username, cancellationToken);
+
+            if (int.TryParse(userResult.UserId, out int value))
+            {
+                return new UserIdResponse
+                {
+                    Token = userResult.LsdToken,
+                    UserId = value
+                };
+            }
+        }
+
+
+        throw new UserNotFoundException(username);
+    }
+
+    private async Task<(string UserId, string LsdToken)> GetUserIdFromUserNameInternal(string username, CancellationToken cancellationToken)
+    {
         var request = new HttpRequestMessage(HttpMethod.Get, $"{_url}@{username}");
         GetDefaultHeaders(null, request);
 
@@ -74,16 +109,7 @@ public async Task<UserIdResponse> GetUserIdFromUserNameAsync(string username, Ca
             throw new UserNotFoundException(username);
         }
 
-        if (int.TryParse(userID, out int value))
-        {
-            return new UserIdResponse
-            {
-                Token = lsdToken,
-                UserId = value
-            };
-        }
-
-        throw new UserNotFoundException(username);
+        return (userID, lsdToken);
     }
 
 
@@ -390,6 +416,65 @@ public async Task<string> PostAsync(string username, string message, string auth
         return postData?.media?.id;
     }
 
+    public async Task<string> PostImageAsync(string username, string message, string authToken, ImageUploadRequest image, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(username))
+        {
+            throw new ArgumentNullException(username);
+        }
+        if (string.IsNullOrWhiteSpace(message))
+        {
+            throw new ArgumentNullException(message);
+        }
+        if (string.IsNullOrWhiteSpace(authToken))
+        {
+            throw new ArgumentNullException(authToken);
+        }
+
+        var userId = await GetUserIdFromUserNameAsync(username, cancellationToken);
+
+        var imageUploadResult = await UploadImageAsync(image, authToken, cancellationToken);
+
+        var data = new
+        {
+            text_post_app_info = new { reply_control = 0 },
+            timezone_offset = "3600",
+            source_type = '4',
+            _uid = userId.UserId,
+            device_id = _deviceId,
+            caption = message,
+            upload_id = imageUploadResult.upload_id,
+            device = new
+            {
+                manufacturer = "OnePlus",
+                model = "ONEPLUS+A3010",
+                os_version = 25,
+                os_release = "7.1.1",
+            },
+            publish_mode = "text_post",
+            scene_capture_type = string.Empty,
+        };
+
+
+        var payload = $"signed_body=SIGNATURE.{JsonSerializer.Serialize(data)}";
+
+        var request = new HttpRequestMessage(HttpMethod.Post, new Uri(PostImageUrl))
+        {
+            Content = new StringContent(payload)
+        };
+        GetAppHeaders(request, authToken);
+        request.Content.Headers.Clear();
+        request.Content.Headers.Add("Content-Type", "application/x-www-form-urlencoded");
+        request.Content.Headers.Add("Response-Type", "text");
+
+        var response = await _client.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+        var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+        var postData = await JsonSerializer.DeserializeAsync<PostResponse>(stream).ConfigureAwait(false);
+
+        return postData?.media?.id;
+    }
+
     /// <inheritdoc/>
     public Task<bool> FollowAsync(int userId, string token, string authToken, CancellationToken cancellationToken = default)
     {
@@ -423,6 +508,87 @@ private async Task<bool> FollowUnfollowInternal(string url, int userId, string t
         return data?.IsSuccess ?? false;
     }
 
+    private async Task<ImageUploadResponse> UploadImageAsync(ImageUploadRequest image, string authToken, CancellationToken cancellationToken = default)
+    {
+        string uploadId = DateTime.Now.Ticks.ToString();
+        string name = $"{uploadId}_0_{new Random().Next(100000000, 999999999)}";
+        string url = $"https://www.instagram.com/rupload_igphoto/{name}";
+
+        byte[] imageBytes;
+        string mime_type;
+
+        if (!string.IsNullOrEmpty(image.Path))
+        {
+            bool isFilePath = !image.Path.StartsWith("http");
+            if (isFilePath)
+            {
+                imageBytes = await File.ReadAllBytesAsync(image.Path).ConfigureAwait(false);
+                mime_type = "image/png" ?? "application/octet-stream";
+            }
+            else
+            {
+                HttpResponseMessage imageResponse = await _client.GetAsync(image.Path).ConfigureAwait(false);
+                imageBytes = await imageResponse.Content.ReadAsByteArrayAsync();
+                mime_type = imageResponse.Content.Headers.ContentType.MediaType;
+            }
+        }
+        else
+        {
+            imageBytes = image.Content;
+            mime_type = image.MimeType ?? "application/octet-stream";
+        }
+
+        Dictionary<string, string> x_instagram_rupload_params = new Dictionary<string, string>
+        {
+            { "upload_id", uploadId },
+            { "media_type", "1" },
+            { "sticker_burnin_params", "[]" },
+            { "image_compression", "{\"lib_name\":\"moz\",\"lib_version\":\"3.1.m\",\"quality\":\"80\"}" },
+            { "xsharing_user_ids", "[]" },
+            { "retry_context", "{\"num_step_auto_retry\":\"0\",\"num_reupload\":\"0\",\"num_step_manual_retry\":\"0\"}" },
+            { "IG-FB-Xpost-entry-point-v2", "feed" }
+        };
+
+        int contentLength = imageBytes.Length;
+        Dictionary<string, string> imageHeaders = new Dictionary<string, string>
+        {
+            { "X_FB_PHOTO_WATERFALL_ID", Guid.NewGuid().ToString() },
+            { "X-Entity-Type", mime_type ?? "image/jpeg" },
+            { "Offset", "0" },
+            { "X-Instagram-Rupload-Params", JsonSerializer.Serialize(x_instagram_rupload_params) },
+            { "X-Entity-Name", name },
+            { "X-Entity-Length", contentLength.ToString() },
+            { "Accept-Encoding", "gzip" }
+        };
+
+        Dictionary<string, string> contentHeaders = new Dictionary<string, string>
+        {
+            { "Content-Type", "application/octet-stream" },
+            { "Content-Length", contentLength.ToString() },
+        };
+
+
+
+        var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
+
+        GetDefaultHeaders(null, request, authToken);
+        request.Content = new ByteArrayContent(imageBytes);
+        //request.Content.Headers.Clear();
+        foreach (KeyValuePair<string, string> header in contentHeaders)
+        {
+            request.Content.Headers.Add(header.Key, header.Value);
+        }
+        foreach (KeyValuePair<string, string> header in imageHeaders)
+        {
+            request.Headers.Add(header.Key, header.Value);
+        }
+
+        var response = await _client.SendAsync(request, cancellationToken).ConfigureAwait(false);
+        var data = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+
+        return await JsonSerializer.DeserializeAsync<ImageUploadResponse>(data, cancellationToken: cancellationToken).ConfigureAwait(false);        
+    }
+
     private void GetDefaultHeaders(string token, HttpRequestMessage request, string authToken = default)
     {
         GetAppHeaders(request, authToken);
diff --git a/src/Threads.Example.App/Program.cs b/src/Threads.Example.App/Program.cs
@@ -8,18 +8,24 @@ static async Task Main(string[] args)
     {
         IThreadsApi api = new ThreadsApi(new HttpClient());
 
-        var username = "tidusjar";
+        var username = Environment.GetEnvironmentVariable("TEST_USERNAME");
 
-        var r = await api.GetUserIdFromUserNameAsync(username);
-        var userProfile = await api.GetUserProfileAsync(username, r.UserId, r.Token);
-        var threads = await api.GetThreadsAsync(username, r.UserId, r.Token);
-        var replies = await api.GetUserRepliesAsync(username, r.UserId, r.Token);
-        var authToken = await api.LoginAsync("tidusjar", "pass");
-        await api.PostAsync(username, "Hello!", authToken.Token);
+        //var r = await api.GetUserIdFromUserNameAsync(username);
+        //var userProfile = await api.GetUserProfileAsync(username, r.UserId, r.Token);
+        //var threads = await api.GetThreadsAsync(username, r.UserId, r.Token);
+        //var replies = await api.GetUserRepliesAsync(username, r.UserId, r.Token);
+        var authToken = await api.LoginAsync("tidusjar", Environment.GetEnvironmentVariable("TEST_PASSWORD"));
+        //await api.PostAsync(username, "Hello!", authToken.Token);
 
-        var userNameToFollow = "zuck";
-        var userToFollow = await api.GetUserIdFromUserNameAsync(userNameToFollow);
+        //var userNameToFollow = "zuck";
+        var userToFollow = await api.GetUserIdFromUserNameAsync("loganpaul");
         await api.FollowAsync(userToFollow.UserId, userToFollow.Token, authToken.Token);
 
+
+        var a = await api.PostImageAsync(username, "This message was posted from my C# Wrapper around the Threads API! https://github.com/tidusjar/Threads.Api", authToken.Token, new Api.Models.ImageUploadRequest
+        {
+            Path = "https://raw.githubusercontent.com/tidusjar/Threads.Api/main/assets/example.png"
+        });
+
     }
 }
