diff --git a/Models/configData.cs b/Models/configData.cs index 1b625c8..b236a8c 100755 --- a/Models/configData.cs +++ b/Models/configData.cs @@ -3,7 +3,7 @@ namespace CatsOfMastodonBot.Models public class configData { - public static Boolean fetchData() + public static config fetchData() { // Load from .env file first DotNetEnv.Env.Load(); @@ -20,7 +20,7 @@ namespace CatsOfMastodonBot.Models if (string.IsNullOrEmpty(dbName) || string.IsNullOrEmpty(botToken) || string.IsNullOrEmpty(tag) || string.IsNullOrEmpty(channelNumId) || string.IsNullOrEmpty(adminNumId)) { - return false; // Failure if any are missing + return null; // Failure if any are missing } // If all required variables are present, assign to the config @@ -33,7 +33,7 @@ namespace CatsOfMastodonBot.Models ADMIN_NUMID = adminNumId }; - return true; // Success + return config; // Success } public class config diff --git a/Program.cs b/Program.cs index 29d058f..8e5a9b7 100755 --- a/Program.cs +++ b/Program.cs @@ -8,8 +8,6 @@ using Telegram.Bot.Types.Enums; public class MastodonBot { - - private static Timer _timer; private static async Task Main() @@ -23,13 +21,15 @@ public class MastodonBot }); var logger = loggerFactory.CreateLogger(); - if (!configData.fetchData()) + var config = configData.fetchData(); + if (config==null) { logger.LogCritical("Error reading envinonment variables, either some values are missing or no .env file was found"); throw new Exception("Error reading envinonment variables, either some values are missing or no .env file was found"); } - var config = new configData.config(); + // Setup DB + Console.WriteLine("DB name: " + config.DB_NAME); var db = await DbInitializer.SetupDb(config.DB_NAME); if (db == null) { diff --git a/Services/HandlePostAction.cs b/Services/HandlePostAction.cs index c8d5e14..733c7ff 100755 --- a/Services/HandlePostAction.cs +++ b/Services/HandlePostAction.cs @@ -13,7 +13,7 @@ namespace mstdnCats.Services { public static async Task HandleCallbackQuery(CallbackQuery callbackQuery, IDocumentCollection _db, TelegramBotClient _bot, ILogger? logger) { - var config = new configData.config(); + var config = configData.fetchData(); // Extract media ID from callback query data string[] parts = callbackQuery.Data.Split('-'); diff --git a/Services/ProcessPosts.cs b/Services/ProcessPosts.cs index e3c1507..d1eb7e5 100755 --- a/Services/ProcessPosts.cs +++ b/Services/ProcessPosts.cs @@ -12,7 +12,7 @@ namespace mstdnCats.Services { public static async Task> checkAndInsertPostsAsync(IDocumentCollection _db, TelegramBotClient _bot, List fetchedPosts, ILogger? logger) { - var config = new configData.config(); + var config = configData.fetchData(); // Get existing posts var existingPosts = _db.AsQueryable().Select(x => x.mstdnPostId).ToArray();