yawaflua/Discord.Net
1
0
Fork 0
mirror of https://github.com/yawaflua/Discord.Net.git synced 2025-12-09 03:49:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitri Shimanski
2025-08-22 08:53:58 +03:00
parent 3d724a4686 5bc221399f
commit 36d3f4f32a
9 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/nuget.yml vendored
View File

@@ -38,11 +38,6 @@ jobs:
- name: Pack - name: Pack
run: dotnet pack --no-build --configuration Release -p:PackageVersion=${{ env.PACKAGE_VERSION }} 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 - name: Publish to NuGet
run: dotnet nuget push "**/*.nupkg" --source ${{ env.NUGET_SOURCE }} --api-key ${{ secrets.NUGET_API_KEY }} run: dotnet nuget push "**/*.nupkg" --source ${{ env.NUGET_SOURCE }} --api-key ${{ secrets.NUGET_API_KEY }}

2
Entities/AvatarDecoration.cs
View File

@@ -8,5 +8,5 @@ internal class AvatarDecoration : IAvatarDecoration
[JsonPropertyName("asset")] [JsonPropertyName("asset")]
public string AssetHash { get; set; } public string AssetHash { get; set; }
[JsonPropertyName("sku_id")] [JsonPropertyName("sku_id")]
public ulong AssetArticular { get; set; } public string AssetArticular { get; set; }
} }

2
Entities/DiscordGuild.cs
View File

@@ -6,7 +6,7 @@ namespace yawaflua.Discord.Net.Entities;
internal class DiscordGuild : IGuild 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; } [JsonPropertyName("name")] public string Name { get; set; }

2
Entities/DiscordRole.cs
View File

@@ -5,7 +5,7 @@ namespace yawaflua.Discord.Net.Entities;
internal class DiscordRole : IRole internal class DiscordRole : IRole
{ {
public ulong Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public int Color { get; set; } public int Color { get; set; }
private RoleColor Colors { get; set; } private RoleColor Colors { get; set; }

4
Entities/DiscordSession.cs
View File

@@ -31,7 +31,7 @@ internal class DiscordSession (IToken token, HttpClient httpClient, ScopesBuilde
return await _req<DiscordGuild[]>("users/@me/guilds"); return await _req<DiscordGuild[]>("users/@me/guilds");
} }
public async Task<IGuildMember?> GetGuildMemberAsync(ulong guildId, CancellationToken cancellationToken = default) public async Task<IGuildMember?> GetGuildMemberAsync(string guildId, CancellationToken cancellationToken = default)
{ {
if (token.AccessToken is null) if (token.AccessToken is null)
{ {
@@ -41,7 +41,7 @@ internal class DiscordSession (IToken token, HttpClient httpClient, ScopesBuilde
return await _req<DiscordGuildMember>($"users/@me/guilds/{guildId}/member"); return await _req<DiscordGuildMember>($"users/@me/guilds/{guildId}/member");
} }
public async Task<IGuildMember?> AddMemberToGuildAsync(ulong guildId, ulong userId, CancellationToken cancellationToken = default) public async Task<IGuildMember?> AddMemberToGuildAsync(string guildId, string userId, CancellationToken cancellationToken = default)
{ {
if (token.AccessToken is null) if (token.AccessToken is null)
{ {

2
Interfaces/Models/IAvatarDecoration.cs
View File

@@ -3,5 +3,5 @@
public interface IAvatarDecoration public interface IAvatarDecoration
{ {
public string AssetHash { get; set; } public string AssetHash { get; set; }
public ulong AssetArticular { get; set; } public string AssetArticular { get; set; }
} }

2
Interfaces/Models/IGuild.cs
View File

@@ -4,7 +4,7 @@ namespace yawaflua.Discord.Net.Interfaces.Models;
public interface IGuild public interface IGuild
{ {
public ulong Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string? IconHash { get; set; } public string? IconHash { get; set; }
public string? BannerHash { get; set; } public string? BannerHash { get; set; }

2
Interfaces/Models/IRole.cs
View File

@@ -4,7 +4,7 @@ namespace yawaflua.Discord.Net.Interfaces.Models;
public interface IRole public interface IRole
{ {
public ulong Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
[Obsolete("Deprecated integer representation of hexadecimal color code")] [Obsolete("Deprecated integer representation of hexadecimal color code")]
public int Color { get; set; } public int Color { get; set; }

4
Interfaces/Models/ISession.cs
View File

@@ -3,8 +3,8 @@
public interface ISession public interface ISession
{ {
Task<IList<IGuild>?> GetGuildsAsync(CancellationToken cancellationToken = default); Task<IList<IGuild>?> GetGuildsAsync(CancellationToken cancellationToken = default);
Task<IGuildMember?> GetGuildMemberAsync(ulong guildId, CancellationToken cancellationToken = default); Task<IGuildMember?> GetGuildMemberAsync(string guildId, CancellationToken cancellationToken = default);
Task<IGuildMember?> AddMemberToGuildAsync(ulong guildId, ulong userId, CancellationToken cancellationToken = default); Task<IGuildMember?> AddMemberToGuildAsync(string guildId, string userId, CancellationToken cancellationToken = default);
Task<IUser?> GetCurrentUserAsync(CancellationToken cancellationToken = default); Task<IUser?> GetCurrentUserAsync(CancellationToken cancellationToken = default);
Task<IConnection?> GetConnectionAsync(CancellationToken cancellationToken = default); Task<IConnection?> GetConnectionAsync(CancellationToken cancellationToken = default);