[Commands] #ginfo Cleanup. (#1955)

* [Commands] #ginfo Cleanup.
- Use popup over chat messages.

* Remove leader since GetLeaderName() is wrong.
This commit is contained in:
Kinglykrab 2022-02-03 18:52:31 -05:00 committed by GitHub
parent e9f48d5fba
commit 4e297f3d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,69 +28,64 @@ void command_ginfo(Client *c, const Seperator *sep)
return; return;
} }
c->Message( std::string popup_title = fmt::format(
Chat::White, "Group Info for {}",
c == target ?
"Yourself" :
fmt::format( fmt::format(
"Group Info for {} | ID: {} Members: {}", "{} ({})",
( target->GetCleanName(),
c == target ? target->GetID()
"Yourself" : )
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
)
),
target_group->GetID(),
target_group->GroupCount()
).c_str()
); );
std::string popup_text = "<table>";
popup_text += fmt::format(
"<tr><td>Group ID</td><td>{}</td><td>Members</td><td>{}</td>",
target_group->GetID(),
target_group->GroupCount()
);
popup_text += "<br><br>";
popup_text += "<tr>";
popup_text += "<td>Index</td>";
popup_text += "<td>Name</td>";
popup_text += "<td>In Zone</td>";
popup_text += "<td>Assist</td>";
popup_text += "<td>Puller</td>";
popup_text += "<td>Tank</td>";
popup_text += "</tr>";
for (int group_member = 0; group_member < MAX_GROUP_MEMBERS; group_member++) { for (int group_member = 0; group_member < MAX_GROUP_MEMBERS; group_member++) {
if (target_group->membername[group_member][0] == '\0') { if (target_group->membername[group_member][0] == '\0') {
continue; continue;
} }
int member_number = (group_member + 1);
bool is_assist = target_group->MemberRoles[group_member] & RoleAssist; bool is_assist = target_group->MemberRoles[group_member] & RoleAssist;
bool is_puller = target_group->MemberRoles[group_member] & RolePuller; bool is_puller = target_group->MemberRoles[group_member] & RolePuller;
bool is_tank = target_group->MemberRoles[group_member] & RoleTank; bool is_tank = target_group->MemberRoles[group_member] & RoleTank;
auto member_string = (
strcmp(target_group->membername[group_member], c->GetCleanName()) ?
(
fmt::format(
"Name: {} In Zone: {}",
target_group->membername[group_member],
target_group->members[group_member] ? "Yes" : "No"
)
) :
"You"
);
c->Message(
Chat::White,
fmt::format(
"Member {} | {}",
member_number,
member_string
).c_str()
);
if ( popup_text += fmt::format(
is_assist || "<tr><td>{}</td><td>{}</td><td>{}</td><td>{}</td><td>{}</td><td>{}</td></tr>",
is_puller || group_member,
is_tank (
) { strcmp(target_group->membername[group_member], c->GetCleanName()) ?
c->Message( target_group->membername[group_member] :
Chat::White,
fmt::format( fmt::format(
"Member {} Roles | Assist: {} Puller: {} Tank: {}", "{} (You)",
member_number, target_group->membername[group_member]
is_assist ? "Yes" : "No", )
is_puller ? "Yes" : "No", ),
is_tank ? "Yes" : "No" target_group->members[group_member] ? "<c \"#00FF00\">✔</c>" : "<c \"#F62217\">❌</c>",
).c_str() is_assist ? "<c \"#00FF00\">✔</c>" : "<c \"#F62217\">❌</c>",
); is_puller ? "<c \"#00FF00\">✔</c>" : "<c \"#F62217\">❌</c>",
} is_tank ? "<c \"#00FF00\">✔</c>" : "<c \"#F62217\">❌</c>"
);
} }
popup_text += "</table>";
c->SendPopupToClient(
popup_title.c_str(),
popup_text.c_str()
);
} }