calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-04-30 09:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow using bot token instead of user token (#70)

Browse Source
This commit is contained in:
Alexey Golub
2018-07-24 22:47:45 +03:00
committed by GitHub
parent 37ee0b8be3
commit 3572a21aad
15 changed files with 232 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscordChatExporter.Gui/ViewModels/ExportSetupViewModel.cs
View File

@@ -34,7 +34,8 @@ namespace DiscordChatExporter.Gui.ViewModels
}
}
public IReadOnlyList<ExportFormat> AvailableFormats { get; }
public IReadOnlyList<ExportFormat> AvailableFormats =>
Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
public ExportFormat SelectedFormat
{
@@ -69,9 +70,6 @@ namespace DiscordChatExporter.Gui.ViewModels
{
_settingsService = settingsService;
// Defaults
AvailableFormats = Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
// Commands
ExportCommand = new RelayCommand(Export, () => FilePath.IsNotBlank());

3
DiscordChatExporter.Gui/ViewModels/IMainViewModel.cs
View File

@@ -12,7 +12,8 @@ namespace DiscordChatExporter.Gui.ViewModels
bool IsProgressIndeterminate { get; }
double Progress { get; }
string Token { get; set; }
bool IsBotToken { get; set; }
string TokenValue { get; set; }
IReadOnlyList<Guild> AvailableGuilds { get; }
Guild SelectedGuild { get; set; }

31
DiscordChatExporter.Gui/ViewModels/MainViewModel.cs
View File

@@ -26,7 +26,8 @@ namespace DiscordChatExporter.Gui.ViewModels
private bool _isBusy;
private double _progress;
private string _token;
private bool _isBotToken;
private string _tokenValue;
private IReadOnlyList<Guild> _availableGuilds;
private Guild _selectedGuild;
private IReadOnlyList<Channel> _availableChannels;
@@ -56,15 +57,21 @@ namespace DiscordChatExporter.Gui.ViewModels
}
}
public string Token
public bool IsBotToken
{
get => _token;
get => _isBotToken;
set => Set(ref _isBotToken, value);
}
public string TokenValue
{
get => _tokenValue;
set
{
// Remove invalid chars
value = value?.Trim('"');
Set(ref _token, value);
Set(ref _tokenValue, value);
PullDataCommand.RaiseCanExecuteChanged();
}
}
@@ -117,7 +124,7 @@ namespace DiscordChatExporter.Gui.ViewModels
// Commands
ViewLoadedCommand = new RelayCommand(ViewLoaded);
ViewClosedCommand = new RelayCommand(ViewClosed);
PullDataCommand = new RelayCommand(PullData, () => Token.IsNotBlank() && !IsBusy);
PullDataCommand = new RelayCommand(PullData, () => TokenValue.IsNotBlank() && !IsBusy);
ShowSettingsCommand = new RelayCommand(ShowSettings);
ShowAboutCommand = new RelayCommand(ShowAbout);
ShowExportSetupCommand = new RelayCommand<Channel>(ShowExportSetup, _ => !IsBusy);
@@ -132,8 +139,12 @@ namespace DiscordChatExporter.Gui.ViewModels
// Load settings
_settingsService.Load();
// Set last token
Token = _settingsService.LastToken;
// Get last token
if (_settingsService.LastToken != null)
{
IsBotToken = _settingsService.LastToken.Type == AuthTokenType.Bot;
TokenValue = _settingsService.LastToken.Value;
}
// Check and prepare update
try
@@ -169,8 +180,10 @@ namespace DiscordChatExporter.Gui.ViewModels
{
IsBusy = true;
// Copy token so it doesn't get mutated
var token = Token;
// Create token
var token = new AuthToken(
IsBotToken ? AuthTokenType.Bot : AuthTokenType.User,
TokenValue);
// Save token
_settingsService.LastToken = token;