refactor(Contact): improve the visual design

Added the output of the necessary information at the stages. The text is included in the localization files. Fixed bugs/minor inaccuracies
ZenonEl · Jan 8, 2025 · d79b4de · d79b4de
1 parent 608428c
commit d79b4de
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/TelegramBot/Menu/Contacts.cs b/TelegramBot/Menu/Contacts.cs
@@ -48,6 +48,14 @@ public static async Task ViewContacts(ITelegramBotClient botClient, Update updat
     public static async Task EditContactGroup(ITelegramBotClient botClient, Update update, long chatId)
     {
         TelegramBot.userStates[chatId] = new ProcessContactGroupState();
-        await Utils.Utils.SendMessage(botClient, update, KeyboardUtils.GetReturnButtonMarkup(), cancellationToken, "(Инфо по группе) укажите айди группы для работы:");
+
+        int userId = DBforGetters.GetUserIDbyTelegramID(chatId);
+        List<string> groupInfos = UsersGroup.GetUserGroupByUserId(userId);
+
+        string messageText = groupInfos.Any() 
+            ? $"{Config.GetResourceString("YourGroupsText")}\n{string.Join("\n", groupInfos)}" 
+            : Config.GetResourceString("AltYourGroupsText");
+
+        await Utils.Utils.SendMessage(botClient, update, KeyboardUtils.GetReturnButtonMarkup(), cancellationToken, string.Format(Config.GetResourceString("ContactGroupInfoText"), messageText));
     }
 }
diff --git a/TelegramBot/States/ContactGroup.cs b/TelegramBot/States/ContactGroup.cs
@@ -138,12 +138,25 @@ await Utils.Utils.SendMessage(
                                                 groupId,
                                                 DBforGroups.GetGroupDescriptionById(groupId), DBforGroups.GetGroupMemberCount(groupId), 
                                                 DBforGroups.GetIsDefaultGroup(groupId));
+
+                    List<int> allContactsIds = DBforGroups.GetAllUsersIdsInGroup(groupId);
+                    List<string> allContactsNames = [];
+
+                    foreach (int contactId in allContactsIds)
+                    {
+                        allContactsNames.Add(DBforGetters.GetUserNameByID(contactId) + $" (ID: {contactId})");
+                    }
+
+                    string allContactsText;
+                    allContactsText = $"{Config.GetResourceString("AllContactsText")} {string.Join("\n", allContactsNames)}";
+
+                    string messageText = $"{groupInfo}\n{allContactsText}\n{Config.GetResourceString("ChooseOptionText")}";
                     await Utils.Utils.SendMessage(
                         botClient,
                         update,
                         ContactGroup.GetContactGroupEditActionsKeyboardMarkup(groupId),
                         cancellationToken,
-                        groupInfo + "\n (вывод всех участников)\n" + Config.GetResourceString("ChooseOptionText"));
+                        messageText);
                     return false;
                 }
                 return null;
@@ -154,20 +167,19 @@ await Utils.Utils.SendMessage(
                     await Utils.Utils.SendMessage(
                         botClient,
                         update,
-                        KeyboardUtils.GetConfirmForActionKeyboardMarkup(),
+                        KeyboardUtils.GetReturnButton(),
                         cancellationToken,
                         Config.GetResourceString("InputContactIDsText"));
                     return true;
                 }
                 else if (callbackAction.StartsWith("user_remove_contact_from_group:"))
                 {
                     groupId = int.Parse(callbackAction.Split(':')[1]);
-                    await Utils.Utils.SendMessage(
-                        botClient,
-                        update,
-                        KeyboardUtils.GetConfirmForActionKeyboardMarkup(),
-                        cancellationToken,
-                        Config.GetResourceString("InputContactIDsText"));
+                    await botClient.SendMessage(
+                        Utils.Utils.GetIDfromUpdate(update),
+                        Config.GetResourceString("InputContactIDsText"),
+                        replyMarkup: KeyboardUtils.GetReturnButtonMarkup(),
+                        cancellationToken: cancellationToken);
                     return true;
                 }
                 return null;
@@ -186,18 +198,21 @@ await Utils.Utils.SendMessage(
                 groupId = int.Parse(callbackAction.Split(':')[1]);
                 contactIDs = update.Message!.Text!.Split(" ").Select(x => int.Parse(x)).ToList();
                 List<int> allowedIds = [];
+
                 foreach (int contactId in contactIDs)
                 {
                     bool status = DBforContactGroups.CheckUserAndContactConnect(userId, contactId);
                     if (status) allowedIds.Add(contactId);
                 }
+
                 if (allowedIds.Count == 0) return null;
                 await Utils.Utils.SendMessage(
                     botClient,
                     update,
                     KeyboardUtils.GetConfirmForActionKeyboardMarkup("accept_add_contact_to_group"),
                     cancellationToken,
                     Config.GetResourceString("ConfirmAddContactsToGroupText"));
+                contactIDs = allowedIds;
                 return true;
             }
             else if (callbackAction.StartsWith("user_remove_contact_from_group:"))
@@ -214,7 +229,7 @@ await Utils.Utils.SendMessage(
             }
             return null;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
             return null;
         }