Browse Source

Fix minor consistencies & redundant impl

pull/1161/head
Still Hsu 7 years ago
parent
commit
0ad66f6765
No known key found for this signature in database GPG Key ID: 8601A145FDA95209
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs
  2. +1
    -1
      src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs
  3. +1
    -1
      src/Discord.Net.WebSocket/Audio/AudioClient.cs

+ 3
- 3
src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs View File

@@ -54,9 +54,9 @@ namespace Discord.Commands
if (GuildPermission.HasValue)
{
if (guildUser == null)
return Task.FromResult(PreconditionResult.FromError("Command must be used in a guild channel"));
return Task.FromResult(PreconditionResult.FromError("Command must be used in a guild channel."));
if (!guildUser.GuildPermissions.Has(GuildPermission.Value))
return Task.FromResult(PreconditionResult.FromError($"User requires guild permission {GuildPermission.Value}"));
return Task.FromResult(PreconditionResult.FromError($"User requires guild permission {GuildPermission.Value}."));
}

if (ChannelPermission.HasValue)
@@ -68,7 +68,7 @@ namespace Discord.Commands
perms = ChannelPermissions.All(context.Channel);

if (!perms.Has(ChannelPermission.Value))
return Task.FromResult(PreconditionResult.FromError($"User requires channel permission {ChannelPermission.Value}"));
return Task.FromResult(PreconditionResult.FromError($"User requires channel permission {ChannelPermission.Value}."));
}

return Task.FromResult(PreconditionResult.FromSuccess());


+ 1
- 1
src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs View File

@@ -9,7 +9,7 @@ using Model = Discord.API.GuildMember;
namespace Discord.Rest
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class RestGuildUser : RestUser, IGuildUser, IUpdateable
public class RestGuildUser : RestUser, IGuildUser
{
private long? _joinedAtTicks;
private ImmutableArray<ulong> _roleIds;


+ 1
- 1
src/Discord.Net.WebSocket/Audio/AudioClient.cs View File

@@ -16,7 +16,7 @@ using System.Collections.Generic;
namespace Discord.Audio
{
//TODO: Add audio reconnecting
internal partial class AudioClient : IAudioClient, IDisposable
internal partial class AudioClient : IAudioClient
{
internal struct StreamPair
{


Loading…
Cancel
Save