mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-22 10:55:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when parsing position on DM channels (#496)

Browse source
This commit is contained in:
Lucas LaBuff 2021-02-06 10:00:29 -05:00 • committed by GitHub
parent e49cf997ea
commit a8031ad3aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs
View file

@ -16,7 +16,7 @@ namespace DiscordChatExporter.Cli.Commands
{
var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
foreach (var channel in channels.OrderBy(c => c.Category, PositionBasedComparer.Instance).ThenBy(c => c.Name))
foreach (var channel in channels.OrderBy(c => c.Name))
console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
}
}

8
DiscordChatExporter.Domain/Discord/Models/Channel.cs
View file

@ -41,11 +41,11 @@ namespace DiscordChatExporter.Domain.Discord.Models
public string Name { get; }
public int Position { get; }
public int? Position { get; }
public string? Topic { get; }
public Channel(Snowflake id, ChannelType type, Snowflake guildId, ChannelCategory? category, string name, int position, string? topic)
public Channel(Snowflake id, ChannelType type, Snowflake guildId, ChannelCategory? category, string name, int? position, string? topic)
{
Id = id;
Type = type;
@ -89,7 +89,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
id.ToString();
position ??= json.GetProperty("position").GetInt32();
position ??= json.GetPropertyOrNull("position")?.GetInt32();
return new Channel(
id,
@ -97,7 +97,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
guildId ?? Guild.DirectMessages.Id,
category ?? GetDefaultCategory(type),
name,
position.Value,
position,
topic
);
}

8
DiscordChatExporter.Domain/Discord/Models/ChannelCategory.cs
View file

@ -14,9 +14,9 @@ namespace DiscordChatExporter.Domain.Discord.Models
public string Name { get; }
public int Position { get; }
public int? Position { get; }
public ChannelCategory(Snowflake id, string name, int position)
public ChannelCategory(Snowflake id, string name, int? position)
{
Id = id;
Name = name;
@ -32,7 +32,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
public static ChannelCategory Parse(JsonElement json, int? position = null)
{
var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
position ??= json.GetProperty("position").GetInt32();
position ??= json.GetPropertyOrNull("position")?.GetInt32();
var name = json.GetPropertyOrNull("name")?.GetString() ??
json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
@ -41,7 +41,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
return new ChannelCategory(
id,
name,
position.Value
position
);
}

2
DiscordChatExporter.Domain/Discord/Models/Common/IHasIdAndPosition.cs
View file

@ -2,6 +2,6 @@
{
public interface IHasIdAndPosition : IHasId
{
int Position { get; }
int? Position { get; }
}
}

12
DiscordChatExporter.Domain/Discord/Models/Common/ChannelPositionBasedComparer.cs → DiscordChatExporter.Domain/Discord/Models/Common/PositionBasedComparer.cs
View file

@ -6,18 +6,10 @@ namespace DiscordChatExporter.Domain.Discord.Models.Common
{
public int Compare(IHasIdAndPosition? x, IHasIdAndPosition? y)
{
int result;
if (x != null)
{
result = x.Position.CompareTo(y?.Position);
int result = Comparer<int?>.Default.Compare(x?.Position, y?.Position);
if (result == 0)
{
result = x.Id.Value.CompareTo(y?.Id.Value);
}
}
else
{
result = y == null ? 0 : -1;
result = Comparer<ulong?>.Default.Compare(x?.Id.Value, y?.Id.Value);
}
return result;
}

4
DiscordChatExporter.Domain/Exporting/ExportRequest.cs
View file

@ -94,8 +94,8 @@ namespace DiscordChatExporter.Domain.Exporting
"%T" => channel.Category.Name,
"%c" => channel.Id.ToString(),
"%C" => channel.Name,
"%p" => channel.Position.ToString(),
"%P" => channel.Category.Position.ToString(),
"%p" => channel.Position?.ToString() ?? "0",
"%P" => channel.Category.Position?.ToString() ?? "0",
"%a" => (after ?? Snowflake.Zero).ToDate().ToString("yyyy-MM-dd"),
"%b" => (before?.ToDate() ?? DateTime.Now).ToString("yyyy-MM-dd"),
"%%" => "%",

2
DiscordChatExporter.Gui/Views/RootView.xaml
View file

@ -27,7 +27,7 @@
<Window.Resources>
<CollectionViewSource x:Key="AvailableChannelsViewSource" Source="{Binding AvailableChannels, Mode=OneWay}">
<CollectionViewSource.GroupDescriptions>
<PropertyGroupDescription PropertyName="Category" />
<PropertyGroupDescription PropertyName="Category.Name" />
</CollectionViewSource.GroupDescriptions>
<CollectionViewSource.SortDescriptions>
<componentModel:SortDescription Direction="Ascending" PropertyName="Position" />