diff --git a/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
index 0361ec8c2..c14e918fe 100644
--- a/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
@@ -153,9 +153,6 @@ namespace Discord.Rest
Update(model);
}
- ///
- public override string ToString() => Name ?? Id.ToString();
-
IGuild IGuildChannel.Guild => Guild;
async Task IGuildChannel.CreateInvite(int? maxAge, int? maxUses, bool isTemporary, bool withXkcd)
=> await CreateInvite(maxAge, maxUses, isTemporary, withXkcd).ConfigureAwait(false);
diff --git a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
index 18a80655f..481a8d884 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
@@ -333,6 +333,8 @@ namespace Discord.Rest
}
}
+ public override string ToString() => Name ?? Id.ToString();
+
IEnumerable IGuild.Emojis => Emojis;
ulong IGuild.EveryoneRoleId => EveryoneRole.Id;
IEnumerable IGuild.Features => Features;
diff --git a/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs b/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
index f3045e10d..5d9220ade 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
@@ -28,5 +28,7 @@ namespace Discord.Rest
ChannelId = model.ChannelId;
IsEnabled = model.Enabled;
}
+
+ public override string ToString() => $"{Id} ({(IsEnabled ? "Enabled" : "Disabled")})";
}
}
diff --git a/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
index 35482d96d..c479f9f4d 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
@@ -77,6 +77,8 @@ namespace Discord.Rest
await Discord.BaseClient.SyncGuildIntegration(Guild.Id, Id).ConfigureAwait(false);
}
+ public override string ToString() => $"{Name ?? Id.ToString()} ({(IsEnabled ? "Enabled" : "Disabled")})";
+
IGuild IGuildIntegration.Guild => Guild;
IRole IGuildIntegration.Role => Role;
IUser IGuildIntegration.User => User;
diff --git a/src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs b/src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
index ba5fb431f..f28061955 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
@@ -7,5 +7,7 @@
///
public string Name { get; private set; }
+
+ public override string ToString() => Name ?? Id.ToString();
}
}
diff --git a/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs b/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
index 7e4f41fbd..d278b6341 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
@@ -51,5 +51,7 @@ namespace Discord.Rest
throw new InvalidOperationException("Unable to leave a guild the current user owns, use Delete() instead.");
await Discord.BaseClient.DeleteGuild(Id).ConfigureAwait(false);
}
+
+ public override string ToString() => Name ?? Id.ToString();
}
}
diff --git a/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs b/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
index 557fca63d..1c3ee7f20 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
@@ -26,5 +26,7 @@ namespace Discord.Rest
SampleHostname = model.SampleHostname;
SamplePort = model.SamplePort;
}
+
+ public override string ToString() => $"{Name ?? Id.ToString()}";
}
}
diff --git a/src/Discord.Net/Rest/Entities/Message.cs b/src/Discord.Net/Rest/Entities/Message.cs
index ebffae995..97ed04512 100644
--- a/src/Discord.Net/Rest/Entities/Message.cs
+++ b/src/Discord.Net/Rest/Entities/Message.cs
@@ -137,6 +137,9 @@ namespace Discord.Rest
await Discord.BaseClient.DeleteMessage(Channel.Id, Id).ConfigureAwait(false);
}
+
+ public override string ToString() => $"{Author.ToString()}: {Text}";
+
IUser IMessage.Author => Author;
IReadOnlyList IMessage.Attachments => Attachments;
IReadOnlyList