github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Crosspost throwing InvalidOperationException (#1671)

Browse Source 
* Add INewsChannel

* Renaming variable to match the new type
This commit is contained in:
Paulo
2020-11-08 19:29:15 -03:00
committed by GitHub
parent 1e012ac0b8
commit 9134443494
6 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net.Core/Entities/Channels/INewsChannel.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Discord
{
/// <summary>
/// Represents a generic news channel in a guild that can send and receive messages.
/// </summary>
public interface INewsChannel : ITextChannel
{
}
}

2
src/Discord.Net.Rest/Entities/Channels/RestNewsChannel.cs
View File

@@ -12,7 +12,7 @@ namespace Discord.Rest
/// Represents a REST-based news channel in a guild that has the same properties as a <see cref="RestTextChannel"/>. /// Represents a REST-based news channel in a guild that has the same properties as a <see cref="RestTextChannel"/>.
/// </summary> /// </summary>
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class RestNewsChannel : RestTextChannel public class RestNewsChannel : RestTextChannel, INewsChannel
{ {
internal RestNewsChannel(BaseDiscordClient discord, IGuild guild, ulong id) internal RestNewsChannel(BaseDiscordClient discord, IGuild guild, ulong id)
:base(discord, guild, id) :base(discord, guild, id)

4
src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
View File

@@ -154,10 +154,10 @@ namespace Discord.Rest
=> MentionUtils.Resolve(this, 0, userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling); => MentionUtils.Resolve(this, 0, userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling);
/// <inheritdoc /> /// <inheritdoc />
/// <exception cref="InvalidOperationException">This operation may only be called on a <see cref="RestNewsChannel"/> channel.</exception> /// <exception cref="InvalidOperationException">This operation may only be called on a <see cref="INewsChannel"/> channel.</exception>
public async Task CrosspostAsync(RequestOptions options = null) public async Task CrosspostAsync(RequestOptions options = null)
{ {
if (!(Channel is RestNewsChannel)) if (!(Channel is INewsChannel))
{ {
throw new InvalidOperationException("Publishing (crossposting) is only valid in news channels."); throw new InvalidOperationException("Publishing (crossposting) is only valid in news channels.");
} }

2
src/Discord.Net.WebSocket/Entities/Channels/SocketNewsChannel.cs
View File

@@ -15,7 +15,7 @@ namespace Discord.WebSocket
/// </note> /// </note>
/// </remarks> /// </remarks>
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class SocketNewsChannel : SocketTextChannel public class SocketNewsChannel : SocketTextChannel, INewsChannel
{ {
internal SocketNewsChannel(DiscordSocketClient discord, ulong id, SocketGuild guild) internal SocketNewsChannel(DiscordSocketClient discord, ulong id, SocketGuild guild)
:base(discord, id, guild) :base(discord, id, guild)

2
src/Discord.Net.WebSocket/Entities/Invites/SocketInvite.cs
View File

@@ -34,7 +34,7 @@ namespace Discord.WebSocket
case ICategoryChannel categoryChannel: return ChannelType.Category; case ICategoryChannel categoryChannel: return ChannelType.Category;
case IDMChannel dmChannel: return ChannelType.DM; case IDMChannel dmChannel: return ChannelType.DM;
case IGroupChannel groupChannel: return ChannelType.Group; case IGroupChannel groupChannel: return ChannelType.Group;
case SocketNewsChannel socketNewsChannel: return ChannelType.News; case INewsChannel newsChannel: return ChannelType.News;
case ITextChannel textChannel: return ChannelType.Text; case ITextChannel textChannel: return ChannelType.Text;
default: throw new InvalidOperationException("Invalid channel type."); default: throw new InvalidOperationException("Invalid channel type.");
} }

4
src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
View File

@@ -158,10 +158,10 @@ namespace Discord.WebSocket
=> MentionUtils.Resolve(this, 0, userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling); => MentionUtils.Resolve(this, 0, userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling);
/// <inheritdoc /> /// <inheritdoc />
/// <exception cref="InvalidOperationException">This operation may only be called on a <see cref="SocketNewsChannel"/> channel.</exception> /// <exception cref="InvalidOperationException">This operation may only be called on a <see cref="INewsChannel"/> channel.</exception>
public async Task CrosspostAsync(RequestOptions options = null) public async Task CrosspostAsync(RequestOptions options = null)
{ {
if (!(Channel is SocketNewsChannel)) if (!(Channel is INewsChannel))
{ {
throw new InvalidOperationException("Publishing (crossposting) is only valid in news channels."); throw new InvalidOperationException("Publishing (crossposting) is only valid in news channels.");
} }