mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-06-07 09:54:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Oleksii Holub 2018-12-19 17:15:54 +02:00
parent bf5cedb646
commit e22e1c03fb
5 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
View file

@ -34,9 +34,11 @@ namespace DiscordChatExporter.Cli.Verbs
// Get channels // Get channels
var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId); var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
// Filter and order channels
channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
// Loop through channels // Loop through channels
foreach (var channel in channels.Where(c => c.Type.IsEither(ChannelType.GuildTextChat)) foreach (var channel in channels)
.OrderBy(c => c.Name))
{ {
try try
{ {

7
DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs
View file

@ -4,7 +4,6 @@ using System.Threading.Tasks;
using DiscordChatExporter.Cli.Verbs.Options; using DiscordChatExporter.Cli.Verbs.Options;
using DiscordChatExporter.Core.Models; using DiscordChatExporter.Core.Models;
using DiscordChatExporter.Core.Services; using DiscordChatExporter.Core.Services;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Cli.Verbs namespace DiscordChatExporter.Cli.Verbs
{ {
@ -23,9 +22,11 @@ namespace DiscordChatExporter.Cli.Verbs
// Get channels // Get channels
var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId); var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
// Filter and order channels
channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
// Print result // Print result
foreach (var channel in channels.Where(c => c.Type.IsEither(ChannelType.GuildTextChat)) foreach (var channel in channels)
.OrderBy(c => c.Name))
Console.WriteLine($"{channel.Id} | {channel.Name}"); Console.WriteLine($"{channel.Id} | {channel.Name}");
} }
} }

5
DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs
View file

@ -21,8 +21,11 @@ namespace DiscordChatExporter.Cli.Verbs
// Get channels // Get channels
var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken()); var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
// Order channels
channels = channels.OrderBy(c => c.Name).ToArray();
// Print result // Print result
foreach (var channel in channels.OrderBy(c => c.Name)) foreach (var channel in channels)
Console.WriteLine($"{channel.Id} | {channel.Name}"); Console.WriteLine($"{channel.Id} | {channel.Name}");
} }
} }

5
DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs
View file

@ -21,8 +21,11 @@ namespace DiscordChatExporter.Cli.Verbs
// Get guilds // Get guilds
var guilds = await dataService.GetUserGuildsAsync(Options.GetToken()); var guilds = await dataService.GetUserGuildsAsync(Options.GetToken());
// Order guilds
guilds = guilds.OrderBy(g => g.Name).ToArray();
// Print result // Print result
foreach (var guild in guilds.OrderBy(g => g.Name)) foreach (var guild in guilds)
Console.WriteLine($"{guild.Id} | {guild.Name}"); Console.WriteLine($"{guild.Id} | {guild.Name}");
} }
} }

16
DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
View file

@ -137,9 +137,13 @@ namespace DiscordChatExporter.Gui.ViewModels
// Get DM channels // Get DM channels
{ {
var channels = await _dataService.GetDirectMessageChannelsAsync(token);
var guild = Guild.DirectMessages; var guild = Guild.DirectMessages;
_guildChannelsMap[guild] = channels.OrderBy(c => c.Name).ToArray(); var channels = await _dataService.GetDirectMessageChannelsAsync(token);
// Order channels
channels = channels.OrderBy(c => c.Name).ToArray();
_guildChannelsMap[guild] = channels;
} }
// Get guild channels // Get guild channels
@ -148,9 +152,11 @@ namespace DiscordChatExporter.Gui.ViewModels
foreach (var guild in guilds) foreach (var guild in guilds)
{ {
var channels = await _dataService.GetGuildChannelsAsync(token, guild.Id); var channels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
_guildChannelsMap[guild] = channels.Where(c => c.Type == ChannelType.GuildTextChat)
.OrderBy(c => c.Name) // Filter and order channels
.ToArray(); channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
_guildChannelsMap[guild] = channels;
} }
} }