Browse Source

Added ToString to several Rest models

tags/1.0-rc
RogueException 9 years ago
parent
commit
4d565d1b29
10 changed files with 19 additions and 3 deletions
  1. +0
    -3
      src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
  2. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/Guild.cs
  3. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs
  4. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
  5. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs
  6. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs
  7. +2
    -0
      src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
  8. +3
    -0
      src/Discord.Net/Rest/Entities/Message.cs
  9. +2
    -0
      src/Discord.Net/Rest/Entities/Users/Connection.cs
  10. +2
    -0
      src/Discord.Net/Rest/Entities/Users/User.cs

+ 0
- 3
src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs View File

@@ -153,9 +153,6 @@ namespace Discord.Rest
Update(model);
}

/// <inheritdoc />
public override string ToString() => Name ?? Id.ToString();

IGuild IGuildChannel.Guild => Guild;
async Task<IGuildInvite> IGuildChannel.CreateInvite(int? maxAge, int? maxUses, bool isTemporary, bool withXkcd)
=> await CreateInvite(maxAge, maxUses, isTemporary, withXkcd).ConfigureAwait(false);


+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/Guild.cs View File

@@ -333,6 +333,8 @@ namespace Discord.Rest
}
}

public override string ToString() => Name ?? Id.ToString();

IEnumerable<Emoji> IGuild.Emojis => Emojis;
ulong IGuild.EveryoneRoleId => EveryoneRole.Id;
IEnumerable<string> IGuild.Features => Features;


+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/GuildEmbed.cs View File

@@ -28,5 +28,7 @@ namespace Discord.Rest
ChannelId = model.ChannelId;
IsEnabled = model.Enabled;
}

public override string ToString() => $"{Id} ({(IsEnabled ? "Enabled" : "Disabled")})";
}
}

+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs View File

@@ -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;


+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/IntegrationAccount.cs View File

@@ -7,5 +7,7 @@

/// <inheritdoc />
public string Name { get; private set; }

public override string ToString() => Name ?? Id.ToString();
}
}

+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/UserGUild.cs View File

@@ -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();
}
}

+ 2
- 0
src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs View File

@@ -26,5 +26,7 @@ namespace Discord.Rest
SampleHostname = model.SampleHostname;
SamplePort = model.SamplePort;
}

public override string ToString() => $"{Name ?? Id.ToString()}";
}
}

+ 3
- 0
src/Discord.Net/Rest/Entities/Message.cs View File

@@ -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<Attachment> IMessage.Attachments => Attachments;
IReadOnlyList<Embed> IMessage.Embeds => Embeds;


+ 2
- 0
src/Discord.Net/Rest/Entities/Users/Connection.cs View File

@@ -23,5 +23,7 @@ namespace Discord.Rest

Integrations = model.Integrations;
}

public override string ToString() => $"{Name ?? Id.ToString()} ({Type})";
}
}

+ 2
- 0
src/Discord.Net/Rest/Entities/Users/User.cs View File

@@ -54,6 +54,8 @@ namespace Discord.Rest
return new DMChannel(Discord, model);
}

public override string ToString() => $"{Username ?? Id.ToString()}";

/// <inheritdoc />
string IUser.CurrentGame => null;
/// <inheritdoc />


Loading…
Cancel
Save