Some future stuff sketches

panthernet · Mar 6, 2019 · 92002ac · 92002ac
1 parent 0ae6adf
commit 92002ac
Show file tree

Hide file tree

Showing 16 changed files with 812 additions and 18 deletions.
diff --git a/ThunderED/API/DiscordAPI.cs b/ThunderED/API/DiscordAPI.cs
@@ -768,5 +768,11 @@ public List<string> GetUserRoleNames(ulong id)
         {
             return GetUser(id).Roles.Select(a => a.Name).ToList();
         }
+
+        public List<SocketGuildUser> GetUsers(ulong channelId, bool onlineOnly)
+        {
+            var users = channelId == 0 ? GetGuild().Users.ToList() : GetGuild().GetChannel(channelId).Users.ToList();
+            return onlineOnly ? users.Where(a => a.Status != UserStatus.Offline).ToList() : users;
+        }
     }
 }
diff --git a/ThunderED/Classes/DiscordCommands.cs b/ThunderED/Classes/DiscordCommands.cs
@@ -1050,6 +1050,45 @@ public async Task Stats2()
             }
         }
 
+        [Command("caps", RunMode = RunMode.Async), Summary("")]
+        public async Task Caps()
+        {
+            var forbidden = APIHelper.DiscordAPI.GetConfigForbiddenPublicChannels();
+            if(forbidden.Any() && forbidden.Contains(Context.Channel.Id))
+                return;
+            if (!SettingsManager.Settings.CommandsConfig.EnableCapsCommand) 
+                return;
+            if(SettingsManager.Settings.CommandsConfig.CapsCommandDiscordChannels.Any() && !SettingsManager.Settings.CommandsConfig.CapsCommandDiscordChannels.Contains(Context.Channel.Id))
+                return;
+            if (SettingsManager.Settings.CommandsConfig.CapsCommandDiscordRoles.Any() && !await IsAllowedByRoles(SettingsManager.Settings.CommandsConfig.CapsCommandDiscordRoles, Context.User.Id))
+                return;
+
+            await APIHelper.DiscordAPI.ReplyMessageAsync(Context, LM.Get("helpCaps", SettingsManager.Settings.Config.BotDiscordCommandPrefix, "caps"));
+        }
+
+        [Command("caps", RunMode = RunMode.Async), Summary("")]
+        public async Task Caps([Remainder] string x)
+        {
+            var forbidden = APIHelper.DiscordAPI.GetConfigForbiddenPublicChannels();
+            if(forbidden.Any() && forbidden.Contains(Context.Channel.Id))
+                return;
+            if (!SettingsManager.Settings.CommandsConfig.EnableCapsCommand) 
+                return;
+            if(SettingsManager.Settings.CommandsConfig.CapsCommandDiscordChannels.Any() && !SettingsManager.Settings.CommandsConfig.CapsCommandDiscordChannels.Contains(Context.Channel.Id))
+                return;
+            if (SettingsManager.Settings.CommandsConfig.CapsCommandDiscordRoles.Any() && !await IsAllowedByRoles(SettingsManager.Settings.CommandsConfig.CapsCommandDiscordRoles, Context.User.Id))
+                return;
+
+            try
+            {
+                await TickManager.GetModule<CapsModule>().ProcessWhoCommand(Context, x);
+            }
+            catch (Exception ex)
+            {
+                await LogHelper.LogEx("caps", ex);
+            }
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -1253,6 +1292,18 @@ private async Task<bool> IsExecByAdmin()
             return true;
         }
 
+        private async Task<bool> IsAllowedByRoles(List<string> roles, ulong userId)
+        {
+            var result = APIHelper.DiscordAPI.GetUserRoleNames(userId);
+            if (!result.Any(roles.Contains))
+            {
+                await APIHelper.DiscordAPI.ReplyMessageAsync(Context, LM.Get("comRequireRole"), true);
+                return false;
+            }
+
+            return true;
+        }
+
         #endregion
     }
 }
diff --git a/ThunderED/Classes/Settings.cs b/ThunderED/Classes/Settings.cs
@@ -10,6 +10,7 @@
 namespace TED_ConfigEditor.Classes
 #else
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
@@ -22,6 +23,10 @@ public class ThunderSettings: SettingsBase<ThunderSettings>
     {
         [ConfigEntryName("")]
         public ConfigSettings Config { get; set; } = new ConfigSettings();
+        [ConfigEntryName("")]
+        [StaticConfigEntry]
+        public CommandsConfigSettings CommandsConfig { get; set; } = new CommandsConfigSettings();
+
         [ConfigEntryName("moduleWebServer")]
         public WebServerModuleSettings WebServerModule { get; set; } = new WebServerModuleSettings();
         [ConfigEntryName("moduleAuthWeb")]
@@ -104,6 +109,20 @@ public string Validate(List<string> usedModules)
 #endif
     }
 
+    public class CommandsConfigSettings
+    {
+#if EDITOR
+        public ObservableCollection<string> CapsCommandDiscordRoles { get; set; } = new ObservableCollection<string>();
+        public ObservableCollection<ulong> CapsCommandDiscordChannels { get; set; } = new ObservableCollection<ulong>();
+#else
+        public List<string> CapsCommandDiscordRoles { get; set; } = new List<string>();
+        public List<ulong> CapsCommandDiscordChannels { get; set; } = new List<ulong>();
+#endif
+
+        [Comment("Enable !caps command")]
+        public bool EnableCapsCommand { get; set; } = false;
+    }
+
     public class SovTrackerModuleSettings: ValidatableSettings
     {
         [Required]
@@ -1454,6 +1473,7 @@ public class ConfigSettings: ValidatableSettings
         [Comment("Optional path to language files folder. Empty by default and will use default folder")]
         public string LanguageFilesFolder { get; set; }
 
+
 #if EDITOR
         public override string this[string columnName]
         {

diff --git a/ThunderED/Classes/SettingsManager.cs b/ThunderED/Classes/SettingsManager.cs
@@ -43,6 +43,7 @@ public static partial class SettingsManager
         public static ThunderSettings Settings { get; private set; }
 
         public static bool IsLinux { get; } = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+        public static string FileShipsData { get; set; }
 
 
         public static string Prepare(string settingsPath = null)
@@ -65,6 +66,7 @@ public static string Prepare(string settingsPath = null)
                 FileTemplateHRM_MailBody = Path.Combine(RootDirectory, "Templates", "hrm_inspect_mail.html");
                 FileTemplateHRM_Table = Path.Combine(RootDirectory, "Templates", "hrm_inspect_table.html");
                 FileTemplateHRM_SearchMailPage = Path.Combine(RootDirectory, "Templates", "hrmMailSearch.html");
+                FileShipsData = Path.Combine(DataDirectory, "shipdata.json");
                 return null;
             }
             catch (Exception ex)

diff --git a/ThunderED/Classes/TickManager.cs b/ThunderED/Classes/TickManager.cs
@@ -86,7 +86,7 @@ public static void LoadModules()
             if (SettingsManager.Settings.Config.ModuleHRM)
                 Modules.Add(new HRMModule());
 
-            //on demand modules - only could be pinged by other modules
+            //on demand modules - only could be pinged by other modules or commands
             if (SettingsManager.Settings.Config.ModuleLiveKillFeed)
                 OnDemandModules.Add(new LiveKillFeedModule());
 
@@ -96,6 +96,9 @@ public static void LoadModules()
             if (SettingsManager.Settings.Config.ModuleChatRelay)
                 OnDemandModules.Add(new ChatRelayModule());
 
+            if (SettingsManager.Settings.CommandsConfig.EnableCapsCommand)
+                OnDemandModules.Add(new CapsModule());
+
 
 
             //IMPORTANT - web auth is the last module - to be the last for 404 handling

diff --git a/ThunderED/Helpers/LogCat.cs b/ThunderED/Helpers/LogCat.cs
@@ -39,6 +39,7 @@ public enum LogCat
         ContractNotif,
         AuthStandings,
         SovTracker,
-        SimplAuth
+        SimplAuth,
+        Caps
     }
 }
diff --git a/ThunderED/Languages/en-US.json b/ThunderED/Languages/en-US.json
@@ -478,5 +478,13 @@
   "dailyRatingTopKill":  "Top Killers",
   "dailyRatingTopIsk":  "Top ISK Sinkers",
   "dailyRatingTopPts":  "Top Pts Hunters",
-  "dailyRatingTopEff":  "Top Efficiency"
+  "dailyRatingTopEff":  "Top Efficiency",
+  "capsNoUsersFound":  "No eligible users found!",
+  "helpCaps":  "Caps command displays information about capital ship drivers on channel/server. Examples: {0}{1} who , {0}{1} who online, {0}{1} all",
+  "capsCommandRunning":  "Command is already running, try again later",
+  "of":  "of",
+  "capsCalibr5":  "Max Calibration",
+  "comRequireRole": "You must have special Discord role to run this command",
+  "errFileNotFound": "File {0} not found!",
+  "errFileContainsInvalidData": "File {0} contains invalid data!" 
 }
diff --git a/ThunderED/Languages/ru-RU.json b/ThunderED/Languages/ru-RU.json
@@ -472,5 +472,13 @@
   "dailyRatingTopKill":  "Топ Убийцы",
   "dailyRatingTopIsk":  "Топ ISK",
   "dailyRatingTopPts":  "Топ Охотники",
-  "dailyRatingTopEff":  "Топ Эффективность"
- }
+  "dailyRatingTopEff":  "Топ Эффективность",
+  "capsNoUsersFound":  "Доступных мемберов не найдено!",
+  "helpCaps":  "Команда caps отображает данные о капиталоводах в канале/на сервере. Примеры: {0}{1} who , {0}{1} who online, {0}{1} all",
+  "capsCommandRunning":  "Команда уже выполняется, попробуйте позже",
+  "of":  "из",
+  "capsCalibr5":  "Макс. Калибровка",
+  "comRequireRole": "У вас должна быть особая роль Discord, чтобы выполнить эту команду",
+  "errFileNotFound": "Файл {0} не найден!",
+  "errFileContainsInvalidData": "Файл {0} содержит неверные данные!" 
+}
diff --git a/ThunderED/Modules/MailModule.cs b/ThunderED/Modules/MailModule.cs
@@ -226,11 +226,11 @@ public override async Task Run(object prm)
 
         private static async Task SendMailNotification(ulong channel, JsonClasses.Mail mail, string from, string mention)
         {
-            var stamp = DateTime.Parse(mail.timestamp).ToString(SettingsManager.Settings.Config.ShortTimeFormat);
+           // var stamp = DateTime.Parse(mail.timestamp).ToString(SettingsManager.Settings.Config.ShortTimeFormat);
             var body = await PrepareBodyMessage(mail.body);
             var fields = body.Split(1023);
 
-            var embed = new EmbedBuilder()
+           /* var embed = new EmbedBuilder()
                 .WithThumbnailUrl(SettingsManager.Settings.Resources.ImgMail);
             var cnt = 0;
             foreach (var field in fields)
@@ -241,9 +241,11 @@ private static async Task SendMailNotification(ulong channel, JsonClasses.Mail m
                     embed.AddField($"-", string.IsNullOrWhiteSpace(field) ? "---" : field);
                 cnt++;
             }
-            embed.WithFooter($"{LM.Get("mailDate")} {stamp}");
+            embed.WithFooter($"{LM.Get("mailDate")} {stamp}");*/
             var ch = APIHelper.DiscordAPI.GetChannel(channel);
-            await APIHelper.DiscordAPI.SendMessageAsync(ch, $"{mention} {from}", embed.Build()).ConfigureAwait(false);
+            await APIHelper.DiscordAPI.SendMessageAsync(ch, $"{mention} {from}");
+            foreach (var field in fields)
+                await APIHelper.DiscordAPI.SendMessageAsync(ch, field);
         }
 
         public static async Task<string> PrepareBodyMessage(string input, bool forWeb = false)