From 09ded7d9e3b727ca633dd46c0b515b082de6c97b Mon Sep 17 00:00:00 2001
From: Mojtaba Asgari <49837313+Lupine-Mojtaba@users.noreply.github.com>
Date: Fri, 8 Jul 2022 21:19:35 +0430
Subject: [PATCH] Sending game notify message after sending started game
---
.../Werewolf Control/Commands/Helpers.cs | 32 +++++++++----------
.../Werewolf Node/Werewolf.cs | 20 ++++++++++++
2 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/Werewolf for Telegram/Werewolf Control/Commands/Helpers.cs b/Werewolf for Telegram/Werewolf Control/Commands/Helpers.cs
index c3ba4143..17f90816 100644
--- a/Werewolf for Telegram/Werewolf Control/Commands/Helpers.cs
+++ b/Werewolf for Telegram/Werewolf Control/Commands/Helpers.cs
@@ -143,25 +143,25 @@ private static void StartGame(GameMode gameMode, Update update)
{
node.StartGame(update, gameMode);
//notify waiting players
- using (var db = new WWContext())
- {
- var notify = db.NotifyGames.Where(x => x.GroupId == update.Message.Chat.Id).ToList();
- var groupName = update.Message.Chat.Title.ToBold();
- if (update.Message.Chat.Username != null)
- groupName += $" @{update.Message.Chat.Username}";
- else if (grp.GroupLink != null)
- groupName = $"{update.Message.Chat.Title}";
- foreach (var n in notify)
- {
- if (n.UserId != update.Message.From.Id)
- Send(GetLocaleString("NotifyNewGame", grp.Language, groupName), n.UserId);
- Thread.Sleep(500);
- }
+ //using (var db = new WWContext())
+ //{
+ //var notify = db.NotifyGames.Where(x => x.GroupId == update.Message.Chat.Id).ToList();
+ //var groupName = update.Message.Chat.Title.ToBold();
+ //if (update.Message.Chat.Username != null)
+ //groupName += $" @{update.Message.Chat.Username}";
+ //else if (grp.GroupLink != null)
+ //groupName = $"{update.Message.Chat.Title}";
+ //foreach (var n in notify)
+ //{
+ //if (n.UserId != update.Message.From.Id)
+ //Send(GetLocaleString("NotifyNewGame", grp.Language, groupName), n.UserId);
+ //Thread.Sleep(500);
+ //}
//just to be sure...
//db.Database.ExecuteSqlCommand($"DELETE FROM NotifyGame WHERE GroupId = {update.Message.Chat.Id}");
- db.SaveChanges();
- }
+ //db.SaveChanges();
+ //}
}
else
{
diff --git a/Werewolf for Telegram/Werewolf Node/Werewolf.cs b/Werewolf for Telegram/Werewolf Node/Werewolf.cs
index 3c109d2f..b94a18d6 100644
--- a/Werewolf for Telegram/Werewolf Node/Werewolf.cs
+++ b/Werewolf for Telegram/Werewolf Node/Werewolf.cs
@@ -12,6 +12,7 @@
using Telegram.Bot.Types.ReplyMarkups;
using Werewolf_Node.Helpers;
using Werewolf_Node.Models;
+using Werewolf_Control.Models;
using Shared;
using Telegram.Bot;
@@ -253,6 +254,25 @@ public Werewolf(long chatid, User u, string chatGroup, GameMode gameMode)
SendPlayerList(true);
new Thread(GameTimer).Start();
+
+ using (var db = new WWContext())
+ {
+ var notify = db.NotifyGames.Where(x => x.GroupId == update.Message.Chat.Id).ToList();
+ var groupName = update.Message.Chat.Title.ToBold();
+ if (update.Message.Chat.Username != null)
+ groupName += $" @{update.Message.Chat.Username}";
+ else if (grp.GroupLink != null)
+ groupName = $"{update.Message.Chat.Title}";
+ foreach (var n in notify)
+ {
+ if (n.UserId != update.Message.From.Id)
+ Send(GetLocaleString("NotifyNewGame", grp.Language, groupName), n.UserId);
+ Thread.Sleep(500);
+ }
+
+ db.SaveChanges();
+ }
+
}
catch (Exception ex)
{