Browse Source

Исправление ошибок #EBT-12 EBT-20 EBT-22

GandonKur 4 years ago
parent
commit
bc96675aa0
1 changed files with 41 additions and 13 deletions
  1. 41 13
      EthermineBotTelegram/Program.cs

+ 41 - 13
EthermineBotTelegram/Program.cs

@@ -134,9 +134,10 @@ namespace EthermineBotTelegram
         
                         default:
                             //await Usage(message);
-                            await botClient.SendTextMessageAsync(
-                                chatId: e.Message.Chat,
-                                text:   "Incorrect message");
+                            if (e.Message.Chat.Id > 0)
+                                await botClient.SendTextMessageAsync(
+                                    chatId: e.Message.Chat,
+                                    text:   "Incorrect message");
                             break;
                     }
 
@@ -320,12 +321,31 @@ namespace EthermineBotTelegram
             {
                 if (Botdb.users.Where(u => u.chat_id == e.Message.Chat.Id).FirstOrDefault() != null)
                 {
-                    Botdb.users.Where(u => u.chat_id == e.Message.Chat.Id).FirstOrDefault().wallet = 
-                        e.Message.Text.Split(' ')[1];
-                    Botdb.SaveChanges();
-                    await botClient.SendTextMessageAsync(
-                        chatId: e.Message.Chat,
-                        text:   "Wallet set!");
+                    if (e.Message.Text.Split(' ')[1].Length > 2)
+                    {
+                        if (e.Message.Text.Split(' ')[1].Contains("0x"))
+                        {
+                            Botdb.users.Where(u => u.chat_id == e.Message.Chat.Id).FirstOrDefault().wallet = 
+                                e.Message.Text.Split(' ')[1];
+                        }
+                        else
+                        {
+                            Botdb.users.Where(u => u.chat_id == e.Message.Chat.Id).FirstOrDefault().wallet = 
+                                "0x" + e.Message.Text.Split(' ')[1];
+                        }
+
+                        await Botdb.SaveChangesAsync();
+                        await botClient.SendTextMessageAsync(
+                            chatId: e.Message.Chat,
+                            text:   $"Wallet {"0x" + e.Message.Text.Split(' ')[1]} set!");
+                    }
+                    else
+                    {
+                        await botClient.SendTextMessageAsync(
+                            chatId: e.Message.Chat,
+                            text:   "Too short!");
+                    }
+                    //Botdb.SaveChanges();
                 }
                 else
                 {
@@ -350,10 +370,18 @@ namespace EthermineBotTelegram
                 if (Botdb.users.Where(users => users.chat_id == e.Id).FirstOrDefault() != null)
                 {
                     var deletableWallet = Botdb.users.Where(u => u.chat_id == e.Id).First().wallet;
-                    Botdb.workers.RemoveRange(Botdb.workers.Where(w=> w.wallet == deletableWallet));
-                    Botdb.miners.RemoveRange(Botdb.miners.Where(m=> m.wallet == deletableWallet));
-                    Botdb.users.RemoveRange(Botdb.users.Where(u=> u.chat_id == e.Id));
-                    Botdb.SaveChanges();
+                    if (Botdb.users.Where(u => u.wallet == deletableWallet).Count() > 1)
+                    {
+                        Botdb.users.RemoveRange(Botdb.users.Where(u=> u.chat_id == e.Id));
+                    }
+                    else
+                    {
+                        Botdb.workers.RemoveRange(Botdb.workers.Where(w=> w.wallet == deletableWallet));
+                        Botdb.miners.RemoveRange(Botdb.miners.Where(m=> m.wallet == deletableWallet));
+                        Botdb.users.RemoveRange(Botdb.users.Where(u=> u.chat_id == e.Id));
+                    }
+                    
+                    await Botdb.SaveChangesAsync();
                     await botClient.SendTextMessageAsync(
                         chatId: e,
                         text:   "Done!");