From 6635ab97dd7c432a941a19b4c40cbeb182a1f1e2 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 29 Oct 2015 02:30:23 -0300
Subject: [PATCH] Cleaned up ToString on model classes

---
 src/Discord.Net/Models/Channel.cs | 4 ++--
 src/Discord.Net/Models/Invite.cs  | 4 ++--
 src/Discord.Net/Models/Message.cs | 2 +-
 src/Discord.Net/Models/Role.cs    | 2 +-
 src/Discord.Net/Models/Server.cs  | 4 ++--
 src/Discord.Net/Models/User.cs    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs
index fc27cea51..4ce0b1b51 100644
--- a/src/Discord.Net/Models/Channel.cs
+++ b/src/Discord.Net/Models/Channel.cs
@@ -141,8 +141,6 @@ namespace Discord
             }
 		}
 
-		public override string ToString() => Name;
-
 		internal void AddMessage(Message message)
 		{
 			var cacheLength = _client.Config.MessageCacheLength;
@@ -208,5 +206,7 @@ namespace Discord
 			_areMembersStale = true;
 			user.UpdateChannelPermissions(this);
 		}
+
+		public override string ToString() => Name ?? Id;
 	}
 }
diff --git a/src/Discord.Net/Models/Invite.cs b/src/Discord.Net/Models/Invite.cs
index 97ad94a04..db7c1215a 100644
--- a/src/Discord.Net/Models/Invite.cs
+++ b/src/Discord.Net/Models/Invite.cs
@@ -83,8 +83,6 @@ namespace Discord
 		}
 		internal override void UnloadReferences() { }
 
-		public override string ToString() => XkcdCode ?? Id;
-
 
 		internal void Update(InviteReference model)
 		{
@@ -110,5 +108,7 @@ namespace Discord
 			if (model.Uses != null)
 				Uses = model.Uses.Value;
 		}
+
+		public override string ToString() => XkcdCode ?? Id;
 	}
 }
diff --git a/src/Discord.Net/Models/Message.cs b/src/Discord.Net/Models/Message.cs
index e9d9da72c..e1a676880 100644
--- a/src/Discord.Net/Models/Message.cs
+++ b/src/Discord.Net/Models/Message.cs
@@ -218,6 +218,6 @@ namespace Discord
 			}
 		}
 
-		public override string ToString() => User.Name + ": " + RawText;
+		public override string ToString() => $"{User}: {RawText}";
 	}
 }
diff --git a/src/Discord.Net/Models/Role.cs b/src/Discord.Net/Models/Role.cs
index f65a17d13..bbf896404 100644
--- a/src/Discord.Net/Models/Role.cs
+++ b/src/Discord.Net/Models/Role.cs
@@ -70,6 +70,6 @@ namespace Discord
 				member.UpdateServerPermissions();
 		}
 
-		public override string ToString() => Name;
+		public override string ToString() => Name ?? Id;
 	}
 }
diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs
index c38327c20..ce4961d8f 100644
--- a/src/Discord.Net/Models/Server.cs
+++ b/src/Discord.Net/Models/Server.cs
@@ -178,8 +178,6 @@ namespace Discord
 			}
 		}
 
-		public override string ToString() => Name;
-
 		internal void AddBan(string banId)
 		{
 			_bans.TryAdd(banId, true);
@@ -253,5 +251,7 @@ namespace Discord
 					EveryoneRole = null;
 			}
 		}
+
+		public override string ToString() => Name ?? Id;
 	}
 }
diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 29f99eb93..6d9fa1ff7 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -155,8 +155,6 @@ namespace Discord
 			_server.Unload();
 		}
 
-		public override string ToString() => Id;
-
 		internal void Update(UserReference model)
 		{
 			if (model.Avatar != null)
@@ -376,5 +374,7 @@ namespace Discord
 			
 			return _roles.ContainsKey(role.Id);
 		}
+
+		public override string ToString() => Name ?? Id;
 	}
 }
\ No newline at end of file