diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index af2b97d..1bcdd41 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -38,11 +38,6 @@ jobs: - name: Pack run: dotnet pack --no-build --configuration Release -p:PackageVersion=${{ env.PACKAGE_VERSION }} - - name: Add GitHub source - run: dotnet nuget add source --username ${{ github.repository_owner }} --password ${{ secrets.GHCR_TOKEN }} --store-password-in-clear-text --name github ${{ env.GITHUB_SOURCE }} - - - name: Publish to GitHub Packages - run: dotnet nuget push "**/*.nupkg" --source "github" - name: Publish to NuGet - run: dotnet nuget push "**/*.nupkg" --source ${{ env.NUGET_SOURCE }} --api-key ${{ secrets.NUGET_API_KEY }} \ No newline at end of file + run: dotnet nuget push "**/*.nupkg" --source ${{ env.NUGET_SOURCE }} --api-key ${{ secrets.NUGET_API_KEY }} diff --git a/Entities/AvatarDecoration.cs b/Entities/AvatarDecoration.cs index 7b88e96..be4c8f3 100644 --- a/Entities/AvatarDecoration.cs +++ b/Entities/AvatarDecoration.cs @@ -8,5 +8,5 @@ internal class AvatarDecoration : IAvatarDecoration [JsonPropertyName("asset")] public string AssetHash { get; set; } [JsonPropertyName("sku_id")] - public ulong AssetArticular { get; set; } + public string AssetArticular { get; set; } } \ No newline at end of file diff --git a/Entities/DiscordGuild.cs b/Entities/DiscordGuild.cs index 38763d4..fa19453 100644 --- a/Entities/DiscordGuild.cs +++ b/Entities/DiscordGuild.cs @@ -6,7 +6,7 @@ namespace yawaflua.Discord.Net.Entities; internal class DiscordGuild : IGuild { - [JsonPropertyName("id")] public ulong Id { get; set; } + [JsonPropertyName("id")] public string Id { get; set; } [JsonPropertyName("name")] public string Name { get; set; } diff --git a/Entities/DiscordRole.cs b/Entities/DiscordRole.cs index c5a06f5..ef2d56b 100644 --- a/Entities/DiscordRole.cs +++ b/Entities/DiscordRole.cs @@ -5,7 +5,7 @@ namespace yawaflua.Discord.Net.Entities; internal class DiscordRole : IRole { - public ulong Id { get; set; } + public string Id { get; set; } public string Name { get; set; } public int Color { get; set; } private RoleColor Colors { get; set; } diff --git a/Entities/DiscordSession.cs b/Entities/DiscordSession.cs index 6e0fac3..90e9909 100644 --- a/Entities/DiscordSession.cs +++ b/Entities/DiscordSession.cs @@ -31,7 +31,7 @@ internal class DiscordSession (IToken token, HttpClient httpClient, ScopesBuilde return await _req("users/@me/guilds"); } - public async Task GetGuildMemberAsync(ulong guildId, CancellationToken cancellationToken = default) + public async Task GetGuildMemberAsync(string guildId, CancellationToken cancellationToken = default) { if (token.AccessToken is null) { @@ -41,7 +41,7 @@ internal class DiscordSession (IToken token, HttpClient httpClient, ScopesBuilde return await _req($"users/@me/guilds/{guildId}/member"); } - public async Task AddMemberToGuildAsync(ulong guildId, ulong userId, CancellationToken cancellationToken = default) + public async Task AddMemberToGuildAsync(string guildId, string userId, CancellationToken cancellationToken = default) { if (token.AccessToken is null) { diff --git a/Interfaces/Models/IAvatarDecoration.cs b/Interfaces/Models/IAvatarDecoration.cs index 0e32f3f..bbcab82 100644 --- a/Interfaces/Models/IAvatarDecoration.cs +++ b/Interfaces/Models/IAvatarDecoration.cs @@ -3,5 +3,5 @@ public interface IAvatarDecoration { public string AssetHash { get; set; } - public ulong AssetArticular { get; set; } + public string AssetArticular { get; set; } } \ No newline at end of file diff --git a/Interfaces/Models/IGuild.cs b/Interfaces/Models/IGuild.cs index 6560b42..29a1632 100644 --- a/Interfaces/Models/IGuild.cs +++ b/Interfaces/Models/IGuild.cs @@ -4,7 +4,7 @@ namespace yawaflua.Discord.Net.Interfaces.Models; public interface IGuild { - public ulong Id { get; set; } + public string Id { get; set; } public string Name { get; set; } public string? IconHash { get; set; } public string? BannerHash { get; set; } diff --git a/Interfaces/Models/IRole.cs b/Interfaces/Models/IRole.cs index 1064836..bfaa945 100644 --- a/Interfaces/Models/IRole.cs +++ b/Interfaces/Models/IRole.cs @@ -4,7 +4,7 @@ namespace yawaflua.Discord.Net.Interfaces.Models; public interface IRole { - public ulong Id { get; set; } + public string Id { get; set; } public string Name { get; set; } [Obsolete("Deprecated integer representation of hexadecimal color code")] public int Color { get; set; } diff --git a/Interfaces/Models/ISession.cs b/Interfaces/Models/ISession.cs index 9ed4e1b..34ce3d9 100644 --- a/Interfaces/Models/ISession.cs +++ b/Interfaces/Models/ISession.cs @@ -3,8 +3,8 @@ public interface ISession { Task?> GetGuildsAsync(CancellationToken cancellationToken = default); - Task GetGuildMemberAsync(ulong guildId, CancellationToken cancellationToken = default); - Task AddMemberToGuildAsync(ulong guildId, ulong userId, CancellationToken cancellationToken = default); + Task GetGuildMemberAsync(string guildId, CancellationToken cancellationToken = default); + Task AddMemberToGuildAsync(string guildId, string userId, CancellationToken cancellationToken = default); Task GetCurrentUserAsync(CancellationToken cancellationToken = default); Task GetConnectionAsync(CancellationToken cancellationToken = default);