Browse Source

Create unspecified channel object for unknown channel types (#811)

* Partial fix of #810, addresses critical connection issues.

* Implement fix for REST.

* Implement fix on RestChannel.
tags/2.0.0-beta
Alex Gravely Finite Reality 7 years ago
parent
commit
ec03883e26
3 changed files with 14 additions and 12 deletions
  1. +4
    -4
      src/Discord.Net.Rest/Entities/Channels/RestChannel.cs
  2. +3
    -2
      src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs
  3. +7
    -6
      src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs

+ 4
- 4
src/Discord.Net.Rest/Entities/Channels/RestChannel.cs View File

@@ -6,7 +6,7 @@ using Model = Discord.API.Channel;


namespace Discord.Rest namespace Discord.Rest
{ {
public abstract class RestChannel : RestEntity<ulong>, IChannel, IUpdateable
public class RestChannel : RestEntity<ulong>, IChannel, IUpdateable
{ {
public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);


@@ -25,7 +25,7 @@ namespace Discord.Rest
case ChannelType.Group: case ChannelType.Group:
return CreatePrivate(discord, model) as RestChannel; return CreatePrivate(discord, model) as RestChannel;
default: default:
throw new InvalidOperationException($"Unexpected channel type: {model.Type}");
return new RestChannel(discord, model.Id);
} }
} }
internal static IRestPrivateChannel CreatePrivate(BaseDiscordClient discord, Model model) internal static IRestPrivateChannel CreatePrivate(BaseDiscordClient discord, Model model)
@@ -40,9 +40,9 @@ namespace Discord.Rest
throw new InvalidOperationException($"Unexpected channel type: {model.Type}"); throw new InvalidOperationException($"Unexpected channel type: {model.Type}");
} }
} }
internal abstract void Update(Model model);
internal virtual void Update(Model model) { }


public abstract Task UpdateAsync(RequestOptions options = null);
public virtual Task UpdateAsync(RequestOptions options = null) => Task.Delay(0);


//IChannel //IChannel
string IChannel.Name => null; string IChannel.Name => null;


+ 3
- 2
src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs View File

@@ -7,7 +7,7 @@ using Model = Discord.API.Channel;


namespace Discord.Rest namespace Discord.Rest
{ {
public abstract class RestGuildChannel : RestChannel, IGuildChannel, IUpdateable
public class RestGuildChannel : RestChannel, IGuildChannel, IUpdateable
{ {
private ImmutableArray<Overwrite> _overwrites; private ImmutableArray<Overwrite> _overwrites;


@@ -33,7 +33,8 @@ namespace Discord.Rest
case ChannelType.Voice: case ChannelType.Voice:
return RestVoiceChannel.Create(discord, guild, model); return RestVoiceChannel.Create(discord, guild, model);
default: default:
throw new InvalidOperationException("Unknown guild channel type");
// TODO: Channel categories
return new RestGuildChannel(discord, guild, model.Id);
} }
} }
internal override void Update(Model model) internal override void Update(Model model)


+ 7
- 6
src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs View File

@@ -10,7 +10,7 @@ using Model = Discord.API.Channel;
namespace Discord.WebSocket namespace Discord.WebSocket
{ {
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public abstract class SocketGuildChannel : SocketChannel, IGuildChannel
public class SocketGuildChannel : SocketChannel, IGuildChannel
{ {
private ImmutableArray<Overwrite> _overwrites; private ImmutableArray<Overwrite> _overwrites;


@@ -19,7 +19,7 @@ namespace Discord.WebSocket
public int Position { get; private set; } public int Position { get; private set; }


public IReadOnlyCollection<Overwrite> PermissionOverwrites => _overwrites; public IReadOnlyCollection<Overwrite> PermissionOverwrites => _overwrites;
public new abstract IReadOnlyCollection<SocketGuildUser> Users { get; }
public new virtual IReadOnlyCollection<SocketGuildUser> Users => ImmutableArray.Create<SocketGuildUser>();


internal SocketGuildChannel(DiscordSocketClient discord, ulong id, SocketGuild guild) internal SocketGuildChannel(DiscordSocketClient discord, ulong id, SocketGuild guild)
: base(discord, id) : base(discord, id)
@@ -35,7 +35,8 @@ namespace Discord.WebSocket
case ChannelType.Voice: case ChannelType.Voice:
return SocketVoiceChannel.Create(guild, state, model); return SocketVoiceChannel.Create(guild, state, model);
default: default:
throw new InvalidOperationException("Unknown guild channel type");
// TODO: Proper implementation for channel categories
return new SocketGuildChannel(guild.Discord, model.Id, guild);
} }
} }
internal override void Update(ClientState state, Model model) internal override void Update(ClientState state, Model model)
@@ -49,7 +50,7 @@ namespace Discord.WebSocket
newOverwrites.Add(overwrites[i].ToEntity()); newOverwrites.Add(overwrites[i].ToEntity());
_overwrites = newOverwrites.ToImmutable(); _overwrites = newOverwrites.ToImmutable();
} }
public Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null) public Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null)
=> ChannelHelper.ModifyAsync(this, Discord, func, options); => ChannelHelper.ModifyAsync(this, Discord, func, options);
public Task DeleteAsync(RequestOptions options = null) public Task DeleteAsync(RequestOptions options = null)
@@ -115,7 +116,7 @@ namespace Discord.WebSocket
public async Task<RestInviteMetadata> CreateInviteAsync(int? maxAge = 3600, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) public async Task<RestInviteMetadata> CreateInviteAsync(int? maxAge = 3600, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null)
=> await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false); => await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false);


public new abstract SocketGuildUser GetUser(ulong id);
public new virtual SocketGuildUser GetUser(ulong id) => null;


public override string ToString() => Name; public override string ToString() => Name;
internal new SocketGuildChannel Clone() => MemberwiseClone() as SocketGuildChannel; internal new SocketGuildChannel Clone() => MemberwiseClone() as SocketGuildChannel;
@@ -145,7 +146,7 @@ namespace Discord.WebSocket
=> await RemovePermissionOverwriteAsync(role, options).ConfigureAwait(false); => await RemovePermissionOverwriteAsync(role, options).ConfigureAwait(false);
async Task IGuildChannel.RemovePermissionOverwriteAsync(IUser user, RequestOptions options) async Task IGuildChannel.RemovePermissionOverwriteAsync(IUser user, RequestOptions options)
=> await RemovePermissionOverwriteAsync(user, options).ConfigureAwait(false); => await RemovePermissionOverwriteAsync(user, options).ConfigureAwait(false);
IAsyncEnumerable<IReadOnlyCollection<IGuildUser>> IGuildChannel.GetUsersAsync(CacheMode mode, RequestOptions options) IAsyncEnumerable<IReadOnlyCollection<IGuildUser>> IGuildChannel.GetUsersAsync(CacheMode mode, RequestOptions options)
=> ImmutableArray.Create<IReadOnlyCollection<IGuildUser>>(Users).ToAsyncEnumerable(); => ImmutableArray.Create<IReadOnlyCollection<IGuildUser>>(Users).ToAsyncEnumerable();
Task<IGuildUser> IGuildChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options) Task<IGuildUser> IGuildChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)


Loading…
Cancel
Save