Skip to content

Commit 32dc07d

Browse files
pietrodicapriopietrodicaprio
committed
Code cleanup
1 parent 17df672 commit 32dc07d

File tree

3 files changed

+43
-34
lines changed

3 files changed

+43
-34
lines changed

‎Unifiedban.Terminal/Bot/Manager.cs

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public static void Initialize(string apikey)
4040

4141
if (string.IsNullOrEmpty(apikey))
4242
{
43-
Data.Utils.Logging.AddLog(new Models.SystemLog()
43+
Logging.AddLog(new SystemLog()
4444
{
4545
LoggerName = CacheData.LoggerName,
4646
Date = DateTime.Now,
4747
Function = "Unifiedban Terminal Startup",
48-
Level = Models.SystemLog.Levels.Fatal,
48+
Level = SystemLog.Levels.Fatal,
4949
Message = "API KEY must be set!",
5050
UserId = -1
5151
});
@@ -65,24 +65,24 @@ public static void Initialize(string apikey)
6565
var me = BotClient.GetMeAsync().Result;
6666
Username = me.Username;
6767
MyId = me.Id;
68-
Data.Utils.Logging.AddLog(new Models.SystemLog()
68+
Logging.AddLog(new SystemLog()
6969
{
7070
LoggerName = CacheData.LoggerName,
7171
Date = DateTime.Now,
7272
Function = "Unifiedban Terminal Startup",
73-
Level = Models.SystemLog.Levels.Warn,
73+
Level = SystemLog.Levels.Warn,
7474
Message = $"Hello, World! I am user {me.Id} and my name is {me.FirstName}.",
7575
UserId = -1
7676
});
7777

7878
Console.Title = $"Unifiedban - Username: {me.Username} - Instance ID: {instanceId}";
7979

80-
Data.Utils.Logging.AddLog(new Models.SystemLog()
80+
Logging.AddLog(new SystemLog()
8181
{
8282
LoggerName = CacheData.LoggerName,
8383
Date = DateTime.Now,
8484
Function = "Unifiedban Terminal Startup",
85-
Level = Models.SystemLog.Levels.Info,
85+
Level = SystemLog.Levels.Info,
8686
Message = "Bot Client initialized",
8787
UserId = -2
8888
});
@@ -106,30 +106,30 @@ await BotClient.SendTextMessageAsync(
106106
var infoUrl = $"https://api.telegram.org/bot{APIKEY}/getWebhookInfo";
107107
var infoClient = new HttpClient();
108108
var infoRes = await infoClient.GetAsync(infoUrl);
109-
Data.Utils.Logging.AddLog(new Models.SystemLog()
109+
Logging.AddLog(new SystemLog()
110110
{
111111
LoggerName = CacheData.LoggerName,
112112
Date = DateTime.Now,
113113
Function = "StartReceiving",
114-
Level = Models.SystemLog.Levels.Warn,
114+
Level = SystemLog.Levels.Warn,
115115
Message = infoRes.Content.ReadAsStringAsync().Result,
116116
UserId = -2
117117
});
118-
Data.Utils.Logging.AddLog(new Models.SystemLog()
118+
Logging.AddLog(new SystemLog()
119119
{
120120
LoggerName = CacheData.LoggerName,
121121
Date = DateTime.Now,
122122
Function = "StartReceiving",
123-
Level = Models.SystemLog.Levels.Warn,
123+
Level = SystemLog.Levels.Warn,
124124
Message = $"Skipping pending updates older than: {pastHoursToSkip} hour(s)",
125125
UserId = -2
126126
});
127-
Data.Utils.Logging.AddLog(new Models.SystemLog()
127+
Logging.AddLog(new SystemLog()
128128
{
129129
LoggerName = CacheData.LoggerName,
130130
Date = DateTime.Now,
131131
Function = "StartReceiving",
132-
Level = Models.SystemLog.Levels.Warn,
132+
Level = SystemLog.Levels.Warn,
133133
Message = $"Throwing pending updates: {throwPendingUpdates}",
134134
UserId = -2
135135
});
@@ -202,6 +202,16 @@ ApiRequestException apiRequestException
202202
=> $"Telegram API Error:\n[{apiRequestException.ErrorCode}]\n{apiRequestException.Message}",
203203
_ => ex.ToString()
204204
};
205+
206+
Logging.AddLog(new SystemLog()
207+
{
208+
LoggerName = CacheData.LoggerName,
209+
Date = DateTime.Now,
210+
Function = "PollingErrorHandler",
211+
Level = SystemLog.Levels.Error,
212+
Message = errMsg,
213+
UserId = -1
214+
});
205215

206216
if(!Cts.IsCancellationRequested)
207217
Restart(ex.Message);
@@ -295,12 +305,12 @@ private static async Task HandleCallbackQuery(CallbackQuery callbackQuery)
295305
{
296306
if (callbackQuery.Message!.Date < DateTime.Now.AddHours(-pastHoursToSkip))
297307
{
298-
Data.Utils.Logging.AddLog(new Models.SystemLog()
308+
Logging.AddLog(new SystemLog()
299309
{
300310
LoggerName = CacheData.LoggerName,
301311
Date = DateTime.Now,
302312
Function = "Unifiedban.Bot.Manager.BotClient_OnCallbackQuery",
303-
Level = Models.SystemLog.Levels.Debug,
313+
Level = SystemLog.Levels.Debug,
304314
Message = $"Skipping callback older than {pastHoursToSkip} hour(s)",
305315
UserId = -1
306316
});
@@ -310,14 +320,14 @@ private static async Task HandleCallbackQuery(CallbackQuery callbackQuery)
310320
await Task.Run(() => CacheData.IncrementHandledMessages());
311321

312322
if(CacheData.Groups[callbackQuery.Message.Chat.Id].State !=
313-
Models.Group.TelegramGroup.Status.Active) return;
323+
TelegramGroup.Status.Active) return;
314324

315-
Data.Utils.Logging.AddLog(new Models.SystemLog()
325+
Logging.AddLog(new SystemLog()
316326
{
317327
LoggerName = CacheData.LoggerName,
318328
Date = DateTime.Now,
319329
Function = "Unifiedban.Bot.Manager.BotClient_OnCallbackQuery",
320-
Level = Models.SystemLog.Levels.Debug,
330+
Level = SystemLog.Levels.Debug,
321331
Message = "CallbackQuery received",
322332
UserId = -1
323333
});
@@ -335,37 +345,36 @@ private static async Task HandleUpdateAsync(Message message)
335345
{
336346
if (message.Date < DateTime.Now.AddHours(-pastHoursToSkip))
337347
{
338-
Data.Utils.Logging.AddLog(new Models.SystemLog()
348+
Logging.AddLog(new SystemLog()
339349
{
340350
LoggerName = CacheData.LoggerName,
341351
Date = DateTime.Now,
342352
Function = "Unifiedban.Bot.Manager.BotClient_OnMessage",
343-
Level = Models.SystemLog.Levels.Debug,
353+
Level = SystemLog.Levels.Debug,
344354
Message = $"Skipping update older than {pastHoursToSkip} hour(s)",
345355
UserId = -1
346356
});
347357
return;
348358
}
349359

350360
await Task.Run(CacheData.IncrementHandledMessages);
361+
await Task.Run(() => Functions.CacheUsername(message));
351362

352-
if(CacheData.Groups.Keys.Contains(message.Chat.Id))
353-
if (CacheData.Groups[message.Chat.Id].State !=
354-
Models.Group.TelegramGroup.Status.Active &&
355-
message.Text != "/enable") return;
356-
357-
Data.Utils.Logging.AddLog(new Models.SystemLog()
363+
Logging.AddLog(new SystemLog()
358364
{
359365
LoggerName = CacheData.LoggerName,
360366
Date = DateTime.Now,
361367
Function = "Unifiedban.Bot.Manager.BotClient_OnMessage",
362-
Level = Models.SystemLog.Levels.Debug,
368+
Level = SystemLog.Levels.Debug,
363369
Message = "Message received",
364370
UserId = -1
365371
});
366372

367-
await Task.Run(() => Functions.CacheUsername(message));
368-
373+
if(CacheData.Groups.Keys.Contains(message.Chat.Id))
374+
if (CacheData.Groups[message.Chat.Id].State !=
375+
TelegramGroup.Status.Active &&
376+
message.Text != "/enable") return;
377+
369378
if (message.MigrateToChatId is not null)
370379
{
371380
Functions.MigrateToChatId(message);
@@ -398,7 +407,7 @@ private static async Task HandleUpdateAsync(Message message)
398407
message.Chat.Id,
399408
message.Chat.Id.ToString().Replace("-", ""),
400409
Guid.NewGuid());
401-
MessageQueueManager.EnqueueLog(new Models.ChatMessage()
410+
MessageQueueManager.EnqueueLog(new ChatMessage()
402411
{
403412
ParseMode = ParseMode.Markdown,
404413
Text = logMessage
@@ -410,16 +419,15 @@ await BotClient.SendTextMessageAsync(message.Chat.Id,
410419
"We're sorry but an error has occurred while retrieving this chat on our database.\n" +
411420
"Please add again the bot if you want to continue to use it.\n" +
412421
"For any doubt reach us in our support group @unifiedban_group");
413-
414422
}
415423
catch (Exception ex)
416424
{
417-
Logging.AddLog(new Models.SystemLog()
425+
Logging.AddLog(new SystemLog()
418426
{
419427
LoggerName = CacheData.LoggerName,
420428
Date = DateTime.Now,
421429
Function = "Unifiedban.Bot.Manager.BotClient_OnMessage",
422-
Level = Models.SystemLog.Levels.Warn,
430+
Level = SystemLog.Levels.Warn,
423431
Message = $"Can't send left notification due to missing permission.\n\n{ex}",
424432
UserId = -1
425433
});
@@ -461,6 +469,7 @@ await BotClient.SendTextMessageAsync(message.Chat.Id,
461469
Controls.Manager.DoCheck(message);
462470
}
463471
}
472+
464473
if (message.NewChatMembers != null)
465474
{
466475
Functions.UserJoinedAction(message);

‎Unifiedban.Terminal/Unifiedban.Terminal.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RepositoryUrl>https://github.com/unified-ban/Terminal</RepositoryUrl>
1111
<RepositoryType>GIT</RepositoryType>
1212
<AssemblyVersion>3.13.11</AssemblyVersion>
13-
<FileVersion>3.13.11.1</FileVersion>
13+
<FileVersion>3.13.11.2</FileVersion>
1414
<LangVersion>9</LangVersion>
1515
<Nullable>enable</Nullable>
1616
</PropertyGroup>

‎Unifiedban.Terminal/Utils/ConfigTools.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static void LoadRabbitMQManager()
429429
});
430430
var factory = new ConnectionFactory();
431431
factory.UserName = "fabs";
432-
factory.Password = "***REMOVED***";
432+
factory.Password = "Fab2021}";
433433
factory.VirtualHost = "/";
434434
factory.HostName = "10.0.0.4";
435435
factory.Port = 5672;

0 commit comments

Comments
 (0)