From 4495e6b605810ad24314801f91062569eac14341 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Mohammadi Date: Fri, 6 Dec 2024 13:11:47 +0330 Subject: [PATCH] Added MongoDb connection string to config options --- Models/{configData.cs => ConfigData.cs} | 3 ++- Program.cs | 2 +- Services/HandlePostAction.cs | 2 +- Services/ProcessPosts.cs | 2 +- Services/RunCheck.cs | 15 +++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) rename Models/{configData.cs => ConfigData.cs} (91%) diff --git a/Models/configData.cs b/Models/ConfigData.cs similarity index 91% rename from Models/configData.cs rename to Models/ConfigData.cs index 69eb190..4956c67 100755 --- a/Models/configData.cs +++ b/Models/ConfigData.cs @@ -1,6 +1,6 @@ namespace CatsOfMastodonBot.Models { - public class configData + public class ConfigData { public static config fetchData() @@ -10,6 +10,7 @@ namespace CatsOfMastodonBot.Models // Fetch values from .env file or environment variables (fall back) string dbName = DotNetEnv.Env.GetString("DB_NAME") ?? Environment.GetEnvironmentVariable("DB_NAME"); + string mongoDbConnectionString = DotNetEnv.Env.GetString("MONGODB_CONNECTION_STRING") ?? Environment.GetEnvironmentVariable("MONGODB_CONNECTION_STRING"); string botToken = DotNetEnv.Env.GetString("BOT_TOKEN") ?? Environment.GetEnvironmentVariable("BOT_TOKEN"); string tag = DotNetEnv.Env.GetString("TAG") ?? Environment.GetEnvironmentVariable("TAG"); string channelNumId = DotNetEnv.Env.GetString("CHANNEL_NUMID") ?? Environment.GetEnvironmentVariable("CHANNEL_NUMID"); diff --git a/Program.cs b/Program.cs index 41cd907..f2c7cb3 100755 --- a/Program.cs +++ b/Program.cs @@ -21,7 +21,7 @@ public class MastodonBot }); var logger = loggerFactory.CreateLogger(); - var config = configData.fetchData(); + var config = ConfigData.fetchData(); if (config==null) { logger.LogCritical("Error reading environment variables, either some values are missing or no .env file was found"); diff --git a/Services/HandlePostAction.cs b/Services/HandlePostAction.cs index 5e7e0ec..b21eb63 100755 --- a/Services/HandlePostAction.cs +++ b/Services/HandlePostAction.cs @@ -14,7 +14,7 @@ namespace mstdnCats.Services { public static async Task HandleCallbackQuery(CallbackQuery callbackQuery, IDocumentCollection _db, TelegramBotClient _bot, ILogger? logger) { - var config = configData.fetchData(); + 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 c2571a0..fad5290 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 = configData.fetchData(); + var config = ConfigData.fetchData(); // Get existing posts var existingPosts = _db.AsQueryable().Select(x => x.mstdnPostId).ToArray(); diff --git a/Services/RunCheck.cs b/Services/RunCheck.cs index 982d65d..52132a1 100755 --- a/Services/RunCheck.cs +++ b/Services/RunCheck.cs @@ -10,8 +10,8 @@ namespace mstdnCats.Services public static async Task runAsync(IDocumentCollection _db, TelegramBotClient _bot, string _tag, ILogger? logger, string _instance) { // Run check - //try - //{ + try + { // First get posts var posts = await PostResolver.GetPostsAsync(_tag, logger, _instance); @@ -22,12 +22,11 @@ namespace mstdnCats.Services // Then process them await ProcessPosts.checkAndInsertPostsAsync(_db, _bot, posts, logger); - //} - //catch (Exception ex) - //{ - // logger?.LogCritical("Error while running check: " + ex.Message); - // throw new Exception("Error while running check: " + ex.Message); - //} + } + catch (Exception ex) + { + logger?.LogCritical("Error while running check: " + ex.Message); + } return true; } }