calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-03-14 19:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor string checks and fix exception when exporting multiple channels

Browse Source 
Fix #164
This commit is contained in:
Alexey Golub
2019-04-11 22:56:29 +03:00
parent 7951703cf2
commit 30cba7959f
20 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
</ItemGroup>
</Project>

2
DiscordChatExporter.Core.Models/Emoji.cs
View File

@@ -40,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
public static string GetImageUrl(string id, string name, bool isAnimated)
{
// Custom emoji
if (id != null)
if (!id.IsNullOrWhiteSpace())
{
// Animated
if (isAnimated)

6
DiscordChatExporter.Core.Models/Guild.cs
View File

@@ -1,4 +1,6 @@
namespace DiscordChatExporter.Core.Models
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Models
{
// https://discordapp.com/developers/docs/resources/guild#guild-object
@@ -28,7 +30,7 @@
{
public static string GetIconUrl(string id, string iconHash)
{
return iconHash != null
return !iconHash.IsNullOrWhiteSpace()
? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
: "https://cdn.discordapp.com/embed/avatars/0.png";
}

3
DiscordChatExporter.Core.Models/User.cs
View File

@@ -1,4 +1,5 @@
using System;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Core.Models
{
@@ -39,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
public static string GetAvatarUrl(string id, int discriminator, string avatarHash)
{
// Custom avatar
if (avatarHash != null)
if (!avatarHash.IsNullOrWhiteSpace())
{
// Animated
if (avatarHash.StartsWith("a_", StringComparison.Ordinal))