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

Added missing ToString and DebuggerDisplays

Browse Source
This commit is contained in:
RogueException
2016-10-04 16:41:40 -03:00
parent e70d478759
commit 7df38fea3a
28 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@ using Model = Discord.API.Message;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public abstract class SocketMessage : SocketEntity<ulong>, IMessage
{
private long _timestampTicks;
@@ -49,7 +48,8 @@ namespace Discord.WebSocket
if (model.Content.IsSpecified)
Content = model.Content.Value;
}
public override string ToString() => Content;
internal SocketMessage Clone() => MemberwiseClone() as SocketMessage;
//IMessage

7
src/Discord.Net.WebSocket/Entities/Messages/SocketSystemMessage.cs
View File

@@ -1,7 +1,9 @@
using Model = Discord.API.Message;
using System.Diagnostics;
using Model = Discord.API.Message;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
internal class SocketSystemMessage : SocketMessage, ISystemMessage
{
public MessageType Type { get; private set; }
@@ -22,8 +24,7 @@ namespace Discord.WebSocket
Type = model.Type;
}
public override string ToString() => Content;
private string DebuggerDisplay => $"{Author}: {Content} ({Id}, {Type})";
internal new SocketSystemMessage Clone() => MemberwiseClone() as SocketSystemMessage;
}

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

@@ -3,11 +3,13 @@ using Discord.Rest;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Threading.Tasks;
using Model = Discord.API.Message;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class SocketUserMessage : SocketMessage, IUserMessage
{
private bool _isMentioningEveryone, _isTTS, _isPinned;
@@ -131,7 +133,6 @@ namespace Discord.WebSocket
return text;
}
public override string ToString() => Content;
private string DebuggerDisplay => $"{Author}: {Content} ({Id}{(Attachments.Count > 0 ? $", {Attachments.Count} Attachments" : "")}";
internal new SocketUserMessage Clone() => MemberwiseClone() as SocketUserMessage;
}

4
src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs
View File

@@ -1,7 +1,9 @@
using Model = Discord.API.User;
using System.Diagnostics;
using Model = Discord.API.User;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
internal class SocketGlobalUser : SocketUser
{
public override bool IsBot { get; internal set; }

2
src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
View File

@@ -3,12 +3,14 @@ using Discord.Rest;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Threading.Tasks;
using Model = Discord.API.GuildMember;
using PresenceModel = Discord.API.Presence;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class SocketGuildUser : SocketUser, IGuildUser
{
private long? _joinedAtTicks;

7
src/Discord.Net.WebSocket/Entities/Users/SocketPresence.cs
View File

@@ -1,8 +1,10 @@
using Model = Discord.API.Presence;
using System.Diagnostics;
using Model = Discord.API.Presence;
namespace Discord.WebSocket
{
//TODO: C#7 Candidate for record type
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public struct SocketPresence : IPresence
{
public Game? Game { get; }
@@ -18,6 +20,9 @@ namespace Discord.WebSocket
return new SocketPresence(model.Game != null ? Discord.Game.Create(model.Game) : (Game?)null, model.Status);
}
public override string ToString() => Status.ToString();
internal string DebuggerDisplay => $"{Status}{(Game != null ? $", {Game.Value.Name} ({Game.Value.StreamType})" : "")}";
internal SocketPresence Clone() => this;
}
}

2
src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs
View File

@@ -1,11 +1,13 @@
using Discord.API.Rest;
using Discord.Rest;
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using Model = Discord.API.User;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class SocketSelfUser : SocketUser, ISelfUser
{
public string Email { get; private set; }

2
src/Discord.Net.WebSocket/Entities/Users/SocketSimpleUser.cs
View File

@@ -1,9 +1,11 @@
using System;
using System.Diagnostics;
using Model = Discord.API.User;
using PresenceModel = Discord.API.Presence;
namespace Discord.WebSocket
{
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class SocketSimpleUser : SocketUser
{
public override bool IsBot { get; internal set; }

2
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
View File

@@ -44,7 +44,7 @@ namespace Discord.WebSocket
=> UserHelper.CreateDMChannelAsync(this, Discord);
public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} (Id{(IsBot ? ", Bot" : "")})";
internal string DebuggerDisplay => $"{Username}#{Discriminator} (Id{(IsBot ? ", Bot" : "")})";
internal SocketUser Clone() => MemberwiseClone() as SocketUser;
//IUser

8
src/Discord.Net.WebSocket/Entities/Users/SocketVoiceState.cs
View File

@@ -1,15 +1,17 @@
using System;
using System.Diagnostics;
using Model = Discord.API.VoiceState;
namespace Discord.WebSocket
{
//TODO: C#7 Candidate for record type
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public struct SocketVoiceState : IVoiceState
{
[Flags]
private enum Flags : byte
{
None = 0x00,
Normal = 0x00,
Suppressed = 0x01,
Muted = 0x02,
Deafened = 0x04,
@@ -33,7 +35,7 @@ namespace Discord.WebSocket
VoiceChannel = voiceChannel;
VoiceSessionId = sessionId;
Flags voiceStates = Flags.None;
Flags voiceStates = Flags.Normal;
if (isSelfMuted)
voiceStates |= Flags.SelfMuted;
if (isSelfDeafened)
@@ -47,6 +49,8 @@ namespace Discord.WebSocket
return new SocketVoiceState(voiceChannel, model.SessionId, model.SelfMute, model.SelfDeaf, model.Suppress);
}
public override string ToString() => VoiceChannel?.Name ?? "Unknown";
internal string DebuggerDisplay => $"{VoiceChannel?.Name ?? "Unknown"} ({_voiceStates})";
internal SocketVoiceState Clone() => this;
IVoiceChannel IVoiceState.VoiceChannel => VoiceChannel;