Improvements

TelegramBotFramework.Core/DefaultModules/Admin.cs

@@ -86,7 +86,10 @@ public CommandResponse AddBotAdmin(CommandEventArgs args)
                     target.IsBotAdmin = true;
                     return new CommandResponse($"{target.Name} is now a bot admin.");
                 }
-                return new CommandResponse(null);
+                if (target != null && target.Id == args.SourceUser.Id)
+                    return new CommandResponse("You can't add yourself!");
+                else
+                    return new CommandResponse("Unknown user or user is not cached!");
             }          
         }
 
@@ -99,7 +102,10 @@ public CommandResponse RemoveBotAdmin(CommandEventArgs args)
                 target.IsBotAdmin = false;
                 return new CommandResponse($"{target.Name} is no longer a bot admin.");
             }
-            return new CommandResponse(null);
+            if (target != null && target.Id == args.SourceUser.Id)
+                return new CommandResponse("You can't remove yourself!");
+            else 
+                return new CommandResponse("Unknown user or user is not cached!");
         }
         [ChatCommand(Triggers = new[] { "users" }, DevOnly = true, DontSearchInline = true)]
         public CommandResponse GetUsersList(CommandEventArgs args)

TelegramBotFramework.Core/Helpers/UserHelpers.cs

@@ -12,7 +12,7 @@ namespace TelegramBotFramework.Core.Helpers
 {
     public static class UserHelper
     {
-        public static TelegramBotUser GetTelegramUser(ITelegramBotDbContext db, int adminId, Update update = null, InlineQuery query = null, CallbackQuery cbQuery = null, bool logPoint = true)
+        public static TelegramBotUser GetTelegramUser(ITelegramBotDbContext db, long adminId, Update update = null, InlineQuery query = null, CallbackQuery cbQuery = null, bool logPoint = true)
         {           
             using(db)
             {
@@ -45,7 +45,7 @@ public static TelegramBotUser GetTelegramUser(ITelegramBotDbContext db, int admi
 
         public static TelegramBotUser GetTarget(this ITelegramBotDbContext db, CommandEventArgs args)
         {
-            return  args.Message.GetTarget(args.Parameters, args.SourceUser, db);
+            return  args.Message.GetTarget(args.Parameters, db);
         }
     }
 }

TelegramBotFramework.Core/Interfaces/ITelegramBotOptions.cs

@@ -8,11 +8,14 @@ public interface ITelegramBotOptions
     {
         string Key { get; set; }
         string Alias { get; set; }
-        int AdminId { get; set; }
+        long AdminId { get; set; }
         bool ShouldApprooveNewUsers { get; set; }
         string PaymentToken { get; set; }
         string Directory { get; set; }
         string WebHookUrl { get; set; }
         bool InMemoryDb { get; set; }
+        bool FileLog { get; set; }
+        bool AddonModules { get; set; }
+        bool DefaultModules { get; set; }
     }
 }

TelegramBotFramework.Core/Logging/TelegramBotLogger.cs

@@ -3,18 +3,25 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using TelegramBotFramework.Core.Interfaces;
 
 namespace TelegramBotFramework.Core.Logging
 {
     public class TelegramBotLogger
     {
         public readonly string Path;
         private readonly Queue<LogQueueItem> _logQueue = new Queue<LogQueueItem>();
-        public TelegramBotLogger(string directory)
+        private ITelegramBotOptions _options;
+        public TelegramBotLogger(ITelegramBotOptions options, string directory)
         {
+            _options = options;
             Path = directory;
-            Directory.CreateDirectory(Path);
-            new Task(WatchQueue).Start();
+
+            if (_options.FileLog)
+            {
+                Directory.CreateDirectory(Path);
+                new Task(WatchQueue).Start();
+            }
         }
         public void Write(object msg, LogLevel level = LogLevel.Info, ConsoleColor? overrideColor = null, string fileName = "log.log")
         {
@@ -43,7 +50,8 @@ public void Write(object msg, LogLevel level = LogLevel.Info, ConsoleColor? over
                         break;
                 }
             finalMessage += msg.ToString();
-            _logQueue.Enqueue(new LogQueueItem(System.IO.Path.Combine(Path, fileName), finalMessage));
+            if (_options.FileLog)
+                _logQueue.Enqueue(new LogQueueItem(System.IO.Path.Combine(Path, fileName), finalMessage));
 
             Console.ForegroundColor = color;
             Console.Write(finalMessage);

TelegramBotFramework.Core/Objects/DefaultBotOptions.cs

@@ -9,19 +9,31 @@ namespace TelegramBotFramework.Core.Objects
 {
     public class DefaultBotOptions : ITelegramBotOptions
     {
-        public DefaultBotOptions(string key, int adminId)
+        public DefaultBotOptions(string key, long adminId)
         {
             Key = key ?? throw new ArgumentNullException(nameof(key));
             AdminId = adminId;
         }
 
         public string Key {get;set;}
         public string Alias { get; set; } = "TelegramBot";
-        public int AdminId {get;set;}
+        public long AdminId {get;set;}
         public bool ShouldApprooveNewUsers { get; set; } = false;
         public string PaymentToken {get;set;}
         public string Directory { get; set; } = "TelegramBot";
         public string WebHookUrl {get;set;}
         public bool InMemoryDb { get; set; } = false;
+        /// <summary>
+        /// Write all internal logs to a file instead of only printing them on the console screen
+        /// </summary>
+        public bool FileLog { get; set; } = true;
+        /// <summary>
+        /// Allows external modules and scans for them in the AddonModules directory
+        /// </summary>
+        public bool AddonModules { get; set; } = true;
+        /// <summary>
+        /// Enables default modules such as Admin and DefaultBotModule
+        /// </summary>
+        public bool DefaultModules { get; set; } = true;
     }
 }

TelegramBotFramework.Core/SQLiteDb/Extensions/TelegramBotDbExtensions.cs

@@ -125,19 +125,17 @@ public static string ToString(this Telegram.Bot.Types.User user)
         }
 
         #region Helpers
-        public static TelegramBotUser GetTarget(this Message message, string args, TelegramBotUser sourceUser, ITelegramBotDbContext db)
+        public static TelegramBotUser GetTarget(this Message message, string args, ITelegramBotDbContext db)
         {
-            if (message == null) return sourceUser;
+            if (message == null) return null;
             if (message?.ReplyToMessage != null)
             {
                 var m = message.ReplyToMessage;
                 var userid = m.ForwardFrom?.Id ?? m.From.Id;
-                return db.TelegramBotUsers.AsNoTracking().FirstOrDefault(x => x.UserId == userid) ?? sourceUser;
+                return db.TelegramBotUsers.AsNoTracking().FirstOrDefault(x => x.UserId == userid);
             }
             if (String.IsNullOrWhiteSpace(args))
-            {
-                return sourceUser;
-            }
+                return null;
             //check for a user mention
             var mention = message?.Entities.FirstOrDefault(x => x.Type == MessageEntityType.Mention);
             var textmention = message?.Entities.FirstOrDefault(x => x.Type == MessageEntityType.TextMention);
@@ -160,7 +158,7 @@ public static TelegramBotUser GetTarget(this Message message, string args, Teleg
                         x =>
                             String.Equals(x.UserId.ToString(), args, StringComparison.InvariantCultureIgnoreCase) ||
                             String.Equals(x.UserName, args.Replace("@", ""), StringComparison.InvariantCultureIgnoreCase));
-            return result ?? sourceUser;
+            return result;
         }
         #endregion
     }

TelegramBotFramework.Core/SQLiteDb/TelegramBotSetting.cs

@@ -19,7 +19,7 @@ public class TelegramBotSetting:IEditableEntity
         /// <summary>
         /// The ID of the Telegram user who will be the main admin for the bot (typically, the person running the code)
         /// </summary>
-        public int TelegramDefaultAdminUserId { get; set; }
+        public long TelegramDefaultAdminUserId { get; set; }
         /// <summary>
         /// Your Telegram Bot API Token
         /// </summary>

TelegramBotFramework.Core/TelegramBotWrapper.cs

@@ -1,4 +1,4 @@
-
+
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Concurrent;
@@ -130,7 +130,7 @@ public TelegramBotWrapperWithDb(ITelegramBotOptions options, IDbContextFactory<T
             {
                 Directory.CreateDirectory(Path.Combine(RootDirectory));
             }
-            Log = new TelegramBotLogger(Path.Combine(RootDirectory, "Logs-" + Options.Alias));
+            Log = new TelegramBotLogger(options, Path.Combine(RootDirectory, "Logs-" + Options.Alias));
             var setting = new TelegramBotSetting() { Alias = options.Alias, TelegramDefaultAdminUserId = Options.AdminId, TelegramBotAPIKey = Options.Key };
             LoadedSetting = setting;
 
@@ -180,21 +180,26 @@ private void OnChanged(object sender, FileSystemEventArgs e)
 
         public void LoadModules()
         {
+            var currentAssembly = Assembly.GetExecutingAssembly();
             //Clear the list
             Commands.Clear();
             //load base methods first
-            GetMethodsFromAssembly(Assembly.GetExecutingAssembly());
-            Log.WriteLine("Scanning Addon TelegramBotModules directory for custom TelegramBotModules...", overrideColor: ConsoleColor.Cyan);
-            var telegramBotModuleDir = Path.Combine(RootDirectory, "AddonModules-" + LoadedSetting.Alias);
-            Directory.CreateDirectory(telegramBotModuleDir);
-
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-
-            //now load TelegramBotModules from directory
-            foreach (var file in Directory.GetFiles(telegramBotModuleDir, "*.dll"))
+            if (Options.DefaultModules)
+                GetMethodsFromAssembly(currentAssembly);
+            if (Options.AddonModules)
             {
-                GetMethodsFromAssembly(Assembly.LoadFrom(file));
+                Log.WriteLine("Scanning Addon TelegramBotModules directory for custom TelegramBotModules...", overrideColor: ConsoleColor.Cyan);
+                var telegramBotModuleDir = Path.Combine(RootDirectory, "AddonModules-" + LoadedSetting.Alias);
+                Directory.CreateDirectory(telegramBotModuleDir);
+
+                //now load TelegramBotModules from directory
+                foreach (var file in Directory.GetFiles(telegramBotModuleDir, "*.dll"))
+                {
+                    GetMethodsFromAssembly(Assembly.LoadFrom(file));
+                }
             }
+
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a=> a != currentAssembly);
             foreach (var assembly in assemblies)
             {
                 GetMethodsFromAssembly(assembly);
@@ -248,7 +253,7 @@ private void GetMethodsFromAssembly(Assembly assembly)
                         {
                             if (paramss[0].ParameterType.IsAssignableFrom(currentBot))
                             {
-                                Log.WriteLine($"Finded constructor, invoking it for loading {moduleAttributes.Name} at {this.GetType().FullName}");
+                                Log.WriteLine($"Found constructor, invoking it for loading {moduleAttributes.Name} at {this.GetType().FullName}");
 
                                 instance = c.Invoke(new object[] { this });
                             }
@@ -264,7 +269,7 @@ private void GetMethodsFromAssembly(Assembly assembly)
                     }
                     if (Modules.ContainsKey(moduleAttributes))
                     {
-                        Log.WriteLine($"{moduleAttributes.Name} has been already loaded. Rename it, if it is no dublicate");
+                        Log.WriteLine($"{moduleAttributes.Name} has been already loaded. Rename it, if it is no duplicate");
                         continue;
                     }
                     Modules.Add(moduleAttributes, instance);
@@ -287,7 +292,7 @@ private void GetMethodsFromAssembly(Assembly assembly)
                         var att = method.GetCustomAttributes<ChatCommand>().First();
                         if (Commands.ContainsKey(att))
                         {
-                            Log.WriteLine($"ChatCommand {method.Name}\n\t  with Trigger(s): {att.Triggers.Aggregate((a, b) => a + ", " + b)} not loaded, possible dublicate", overrideColor: ConsoleColor.Cyan);
+                            Log.WriteLine($"ChatCommand {method.Name}\n\t  with Trigger(s): {att.Triggers.Aggregate((a, b) => a + ", " + b)} not loaded, possible duplicate", overrideColor: ConsoleColor.Cyan);
                             continue;
                         }
                         Commands.Add(att, (ChatCommandMethod)Delegate.CreateDelegate(typeof(ChatCommandMethod), instance, method));
@@ -302,7 +307,7 @@ private void GetMethodsFromAssembly(Assembly assembly)
 
                         if (CallbackCommands.ContainsKey(att))
                         {
-                            Log.WriteLine($"Not loaded CallbackCommand {m.Name}\n\t Trigger: {att.Trigger}, possible dublicate", overrideColor: ConsoleColor.Cyan);
+                            Log.WriteLine($"Not loaded CallbackCommand {m.Name}\n\t Trigger: {att.Trigger}, possible duplicate", overrideColor: ConsoleColor.Cyan);
                             continue;
                         }
                         CallbackCommands.Add(att, (CallbackCommandMethod)Delegate.CreateDelegate(typeof(CallbackCommandMethod), instance, m));

TelegramBotFramework.Example/Program.cs

@@ -21,7 +21,7 @@ TelegramBotWrapper provides a simple bots menue. Just send /menu or /42 and test
             var builder = new ConfigurationBuilder().AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
             var configuration = builder.Build();
 
-            var opts = new DefaultBotOptions(configuration["key"], int.Parse(configuration["admin"]));
+            var opts = new DefaultBotOptions(configuration["key"], long.Parse(configuration["admin"]));
             opts.InMemoryDb = false;
 
             var bot = new SimpleTelegramBot(opts);