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

Jump to bottom

Fix: Don't rely on Guild for id #2911

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Fix: Don't rely on Guild for id #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestCategoryChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ namespace Discord.Rest
public class RestCategoryChannel : RestGuildChannel, ICategoryChannel
{
#region RestCategoryChannel
internal RestCategoryChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id)
internal RestCategoryChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, guild, id, guildId)
{
}
internal new static RestCategoryChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestCategoryChannel(discord, guild, model.Id);
var entity = new RestCategoryChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestForumChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public class RestForumChannel : RestGuildChannel, IForumChannel
/// <inheritdoc/>
public string Mention => MentionUtils.MentionChannel(Id);

internal RestForumChannel(BaseDiscordClient client, IGuild guild, ulong id)
: base(client, guild, id)
internal RestForumChannel(BaseDiscordClient client, IGuild guild, ulong id, ulong guildId)
: base(client, guild, id, guildId)
{

}

internal new static RestForumChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestForumChannel(discord, guild, model.Id);
var entity = new RestForumChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
8 changes: 5 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,18 @@ public class RestGuildChannel : RestChannel, IGuildChannel
public string Name { get; private set; }
/// <inheritdoc />
public int Position { get; private set; }

/// <inheritdoc />
public ulong GuildId => Guild.Id;
public ulong GuildId { get; }

/// <inheritdoc />
public ChannelFlags Flags { get; private set; }

internal RestGuildChannel(BaseDiscordClient discord, IGuild guild, ulong id)
internal RestGuildChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, id)
{
Guild = guild;
GuildId = guildId;
}
internal static RestGuildChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
Expand All @@ -46,7 +48,7 @@ internal static RestGuildChannel Create(BaseDiscordClient discord, IGuild guild,
ChannelType.Forum => RestForumChannel.Create(discord, guild, model),
ChannelType.Category => RestCategoryChannel.Create(discord, guild, model),
ChannelType.PublicThread or ChannelType.PrivateThread or ChannelType.NewsThread => RestThreadChannel.Create(discord, guild, model),
_ => new RestGuildChannel(discord, guild, model.Id),
_ => new RestGuildChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value),
};
}
internal override void Update(Model model)
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestMediaChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ namespace Discord.Rest;

public class RestMediaChannel : RestForumChannel, IMediaChannel
{
internal RestMediaChannel(BaseDiscordClient client, IGuild guild, ulong id)
: base(client, guild, id)
internal RestMediaChannel(BaseDiscordClient client, IGuild guild, ulong id, ulong guildId)
: base(client, guild, id, guildId)
{

}

internal new static RestMediaChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestMediaChannel(discord, guild, model.Id);
var entity = new RestMediaChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestNewsChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ namespace Discord.Rest
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class RestNewsChannel : RestTextChannel, INewsChannel
{
internal RestNewsChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id)
internal RestNewsChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, guild, id, guildId)
{
}
internal new static RestNewsChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestNewsChannel(discord, guild, model.Id);
var entity = new RestNewsChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Discord.Net.Rest/Entities/Channels/RestStageChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class RestStageChannel : RestVoiceChannel, IStageChannel
/// <remarks>
/// This field is always true for stage channels.
/// </remarks>
///
///
[Obsolete("This property is no longer used because Discord enabled text-in-voice and text-in-stage for all channels.")]
public override bool IsTextInVoice
=> true;
Expand All @@ -28,12 +28,12 @@ public override bool IsTextInVoice

/// <inheritdoc/>
public bool IsLive { get; private set; }
internal RestStageChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id) { }
internal RestStageChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, guild, id, guildId) { }

internal new static RestStageChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestStageChannel(discord, guild, model.Id);
var entity = new RestStageChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ public class RestTextChannel : RestGuildChannel, IRestMessageChannel, ITextChann
/// <inheritdoc />
public int DefaultSlowModeInterval { get; private set; }

internal RestTextChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id)
internal RestTextChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, guild, id, guildId)
{
}
internal new static RestTextChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestTextChannel(discord, guild, model.Id);
var entity = new RestTextChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestThreadChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ public class RestThreadChannel : RestTextChannel, IThreadChannel
/// </summary>
public ulong ParentChannelId { get; private set; }

internal RestThreadChannel(BaseDiscordClient discord, IGuild guild, ulong id, DateTimeOffset? createdAt)
: base(discord, guild, id)
internal RestThreadChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId, DateTimeOffset? createdAt)
: base(discord, guild, id, guildId)
{
CreatedAt = createdAt ?? new DateTimeOffset(2022, 1, 9, 0, 0, 0, TimeSpan.Zero);
}

internal new static RestThreadChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestThreadChannel(discord, guild, model.Id, model.ThreadMetadata.GetValueOrDefault()?.CreatedAt.GetValueOrDefault());
var entity = new RestThreadChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value, model.ThreadMetadata.GetValueOrDefault()?.CreatedAt.GetValueOrDefault());
entity.Update(model);
return entity;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ public class RestVoiceChannel : RestTextChannel, IVoiceChannel, IRestAudioChanne
/// <inheritdoc/>
public VideoQualityMode VideoQualityMode { get; private set; }

internal RestVoiceChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id)
internal RestVoiceChannel(BaseDiscordClient discord, IGuild guild, ulong id, ulong guildId)
: base(discord, guild, id, guildId)
{
}
internal new static RestVoiceChannel Create(BaseDiscordClient discord, IGuild guild, Model model)
{
var entity = new RestVoiceChannel(discord, guild, model.Id);
var entity = new RestVoiceChannel(discord, guild, model.Id, guild?.Id ?? model.GuildId.Value);
entity.Update(model);
return entity;
}
Expand Down