Added MongoDb connection string to config options
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
namespace CatsOfMastodonBot.Models
|
namespace CatsOfMastodonBot.Models
|
||||||
{
|
{
|
||||||
public class configData
|
public class ConfigData
|
||||||
{
|
{
|
||||||
|
|
||||||
public static config fetchData()
|
public static config fetchData()
|
||||||
@@ -10,6 +10,7 @@ namespace CatsOfMastodonBot.Models
|
|||||||
|
|
||||||
// Fetch values from .env file or environment variables (fall back)
|
// Fetch values from .env file or environment variables (fall back)
|
||||||
string dbName = DotNetEnv.Env.GetString("DB_NAME") ?? Environment.GetEnvironmentVariable("DB_NAME");
|
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 botToken = DotNetEnv.Env.GetString("BOT_TOKEN") ?? Environment.GetEnvironmentVariable("BOT_TOKEN");
|
||||||
string tag = DotNetEnv.Env.GetString("TAG") ?? Environment.GetEnvironmentVariable("TAG");
|
string tag = DotNetEnv.Env.GetString("TAG") ?? Environment.GetEnvironmentVariable("TAG");
|
||||||
string channelNumId = DotNetEnv.Env.GetString("CHANNEL_NUMID") ?? Environment.GetEnvironmentVariable("CHANNEL_NUMID");
|
string channelNumId = DotNetEnv.Env.GetString("CHANNEL_NUMID") ?? Environment.GetEnvironmentVariable("CHANNEL_NUMID");
|
@@ -21,7 +21,7 @@ public class MastodonBot
|
|||||||
});
|
});
|
||||||
var logger = loggerFactory.CreateLogger<MastodonBot>();
|
var logger = loggerFactory.CreateLogger<MastodonBot>();
|
||||||
|
|
||||||
var config = configData.fetchData();
|
var config = ConfigData.fetchData();
|
||||||
if (config==null)
|
if (config==null)
|
||||||
{
|
{
|
||||||
logger.LogCritical("Error reading environment variables, either some values are missing or no .env file was found");
|
logger.LogCritical("Error reading environment variables, either some values are missing or no .env file was found");
|
||||||
|
@@ -14,7 +14,7 @@ namespace mstdnCats.Services
|
|||||||
{
|
{
|
||||||
public static async Task HandleCallbackQuery(CallbackQuery callbackQuery, IDocumentCollection<Post> _db, TelegramBotClient _bot, ILogger<MastodonBot>? logger)
|
public static async Task HandleCallbackQuery(CallbackQuery callbackQuery, IDocumentCollection<Post> _db, TelegramBotClient _bot, ILogger<MastodonBot>? logger)
|
||||||
{
|
{
|
||||||
var config = configData.fetchData();
|
var config = ConfigData.fetchData();
|
||||||
|
|
||||||
// Extract media ID from callback query data
|
// Extract media ID from callback query data
|
||||||
string[] parts = callbackQuery.Data.Split('-');
|
string[] parts = callbackQuery.Data.Split('-');
|
||||||
|
@@ -12,7 +12,7 @@ namespace mstdnCats.Services
|
|||||||
{
|
{
|
||||||
public static async Task<List<MediaAttachment>> checkAndInsertPostsAsync(IDocumentCollection<Post> _db, TelegramBotClient _bot, List<Post> fetchedPosts, ILogger<MastodonBot>? logger)
|
public static async Task<List<MediaAttachment>> checkAndInsertPostsAsync(IDocumentCollection<Post> _db, TelegramBotClient _bot, List<Post> fetchedPosts, ILogger<MastodonBot>? logger)
|
||||||
{
|
{
|
||||||
var config = configData.fetchData();
|
var config = ConfigData.fetchData();
|
||||||
|
|
||||||
// Get existing posts
|
// Get existing posts
|
||||||
var existingPosts = _db.AsQueryable().Select(x => x.mstdnPostId).ToArray();
|
var existingPosts = _db.AsQueryable().Select(x => x.mstdnPostId).ToArray();
|
||||||
|
@@ -10,8 +10,8 @@ namespace mstdnCats.Services
|
|||||||
public static async Task<bool> runAsync(IDocumentCollection<Post> _db, TelegramBotClient _bot, string _tag, ILogger<MastodonBot>? logger, string _instance)
|
public static async Task<bool> runAsync(IDocumentCollection<Post> _db, TelegramBotClient _bot, string _tag, ILogger<MastodonBot>? logger, string _instance)
|
||||||
{
|
{
|
||||||
// Run check
|
// Run check
|
||||||
//try
|
try
|
||||||
//{
|
{
|
||||||
// First get posts
|
// First get posts
|
||||||
var posts = await PostResolver.GetPostsAsync(_tag, logger, _instance);
|
var posts = await PostResolver.GetPostsAsync(_tag, logger, _instance);
|
||||||
|
|
||||||
@@ -22,12 +22,11 @@ namespace mstdnCats.Services
|
|||||||
|
|
||||||
// Then process them
|
// Then process them
|
||||||
await ProcessPosts.checkAndInsertPostsAsync(_db, _bot, posts, logger);
|
await ProcessPosts.checkAndInsertPostsAsync(_db, _bot, posts, logger);
|
||||||
//}
|
}
|
||||||
//catch (Exception ex)
|
catch (Exception ex)
|
||||||
//{
|
{
|
||||||
// logger?.LogCritical("Error while running check: " + ex.Message);
|
logger?.LogCritical("Error while running check: " + ex.Message);
|
||||||
// throw new Exception("Error while running check: " + ex.Message);
|
}
|
||||||
//}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user