Fixed Conflicted issues.

This commit is contained in:
Christopher Darnell committed 2021-04-26 08:10:12 -07:00
commit e7a882724b
7 files changed
+145 -28

No files matched your search

+8 -11
View File
@@ -1,24 +1,13 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using DSharpPlus.CommandsNext;
using DSharpPlus.CommandsNext.Attributes;
using DSharpPlus.Entities;
using DSharpPlus.VoiceNext;
using System.Text.RegularExpressions;
using System.Linq;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Text;
using DSharpPlus;
using DSharpPlus.CommandsNext.Exceptions;
using DSharpPlus.EventArgs;
using DSharpPlus.VoiceNext.Codec;
using Microsoft.Extensions.Logging;
using DSharpPlus.Interactivity;
using DSharpPlus.Interactivity.Extensions;
using System.Threading;
namespace StarsiegeBot
{
@@ -32,6 +21,12 @@ namespace StarsiegeBot
public BotSettings()
{
Console.WriteLine("Bot Setting Commands Loaded");
if (!(GuildSettings is null))
{
// guild settings have already been set... stop resetting it.
return;
}
// Check for guild settings file. If it doesnt exist, create it.
if (!File.Exists("guildSettings.json"))
{
@@ -92,5 +87,7 @@ namespace StarsiegeBot
public Dictionary<int,List<DiscordRole>> LevelRoles { get; set; }
public DiscordChannel WelcomeChannel { get; set; }
public bool useWelcomeMessage { get; set; }
public List<DiscordRole> hiddenRolesList { get; set; }
}
}