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

[CLI] Fix sorting by channel/category position (#490)

Browse source
This commit is contained in:
Lucas LaBuff 2021-01-31 10:23:46 -05:00 • committed by GitHub
parent 77b7977324
commit 8b9afe45b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
View file

@ -4,6 +4,7 @@ using CliFx;
using CliFx.Attributes;
using DiscordChatExporter.Cli.Commands.Base;
using DiscordChatExporter.Domain.Discord;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Utilities;
namespace DiscordChatExporter.Cli.Commands
@ -18,7 +19,7 @@ namespace DiscordChatExporter.Cli.Commands
{
var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
foreach (var channel in channels.OrderBy(c => c.Category).ThenBy(c => c.Name))
foreach (var channel in channels.OrderBy(c => c.Category, PositionBasedComparer.Instance).ThenBy(c => c.Name))
console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
}
}

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

@ -4,6 +4,7 @@ using CliFx;
using CliFx.Attributes;
using DiscordChatExporter.Cli.Commands.Base;
using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Utilities;
namespace DiscordChatExporter.Cli.Commands
@ -15,7 +16,7 @@ namespace DiscordChatExporter.Cli.Commands
{
var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
foreach (var channel in channels.OrderBy(c => c.Category).ThenBy(c => c.Name))
foreach (var channel in channels.OrderBy(c => c.Category, PositionBasedComparer.Instance).ThenBy(c => c.Name))
console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
}
}

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

@ -22,7 +22,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
}
// https://discord.com/developers/docs/resources/channel#channel-object
public partial class Channel : IHasId
public partial class Channel : IHasIdAndPosition
{
public Snowflake Id { get; }

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

@ -8,7 +8,7 @@ using Tyrrrz.Extensions;
namespace DiscordChatExporter.Domain.Discord.Models
{
public partial class ChannelCategory : IHasId
public partial class ChannelCategory : IHasIdAndPosition
{
public Snowflake Id { get; }

18
DiscordChatExporter.Domain/Discord/Models/Common/ChannelPositionBasedComparer.cs
View file

@ -2,29 +2,29 @@
namespace DiscordChatExporter.Domain.Discord.Models.Common
{
public partial class ChannelPositionBasedComparer : IComparer<Channel>
public partial class PositionBasedComparer : IComparer<IHasIdAndPosition>
{
public int Compare(Channel? x, Channel? y)
public int Compare(IHasIdAndPosition? x, IHasIdAndPosition? y)
{
int result;
if (x != null)
{
result = x.Position.CompareTo(y?.Position);
}
else if (y != null)
{
result = -y.Position.CompareTo(x?.Position);
if(result == 0)
{
result = x.Id.Value.CompareTo(y?.Id.Value);
}
}
else
{
result = 0;
result = y == null ? 0 : -1;
}
return result;
}
}
public partial class ChannelPositionBasedComparer
public partial class PositionBasedComparer
{
public static ChannelPositionBasedComparer Instance { get; } = new();
public static PositionBasedComparer Instance { get; } = new();
}
}

7
DiscordChatExporter.Domain/Discord/Models/Common/IHasIdAndPosition.cs Normal file
View file

@ -0,0 +1,7 @@
namespace DiscordChatExporter.Domain.Discord.Models.Common
{
public interface IHasIdAndPosition : IHasId
{
int Position { get; }
}
}