Skip to content

Adding support for latest changes done to Commando #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Adding support for latest changes done to Commando #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 25 additions & 29 deletions src/CortexPE/Hierarchy/command/subcommand/ACPermissionModifierCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,43 +87,39 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
if($permission instanceof Permission) {
switch($args["targetType"] ?? "undefined") {
case TargetEnumArgument::TARGET_MEMBER:
foreach($args["target"] as $target){
if($target instanceof BaseMember) {
if($sender->hasPermission("hierarchy.member." . static::CHILD_PERMISSION)) {
if($this->doHierarchyPositionCheck($target, $permission)) {
$this->doOperationOnMember($target, $permission);
$this->sendFormattedMessage("cmd." . static::MESSAGE_ROOT . ".member.success", [
"permission" => $permission->getName(),
"member" => $target->getName()
]);
} else {
$this->sendFormattedMessage("err.target_higher_hrk");
}
$target = $args["target"];
if($target instanceof BaseMember) {
if($sender->hasPermission("hierarchy.member." . static::CHILD_PERMISSION)) {
if($this->doHierarchyPositionCheck($target, $permission)) {
$this->doOperationOnMember($target, $permission);
$this->sendFormattedMessage("cmd." . static::MESSAGE_ROOT . ".member.success", [
"permission" => $permission->getName(),
"member" => $target->getName()
]);
} else {
$this->sendPermissionError();
$this->sendFormattedMessage("err.target_higher_hrk");
}
break;
} else {
$this->sendPermissionError();
}
}
break;
case TargetEnumArgument::TARGET_ROLE:
foreach($args["target"] as $target) {
if($target instanceof Role) {
if($sender->hasPermission("hierarchy.role." . static::CHILD_PERMISSION)) {
if($this->doHierarchyPositionCheck($target)) {
$this->doOperationOnRole($target, $permission);
$this->sendFormattedMessage("cmd." . static::MESSAGE_ROOT . ".role.success", [
"permission" => $permission->getName(),
"role" => $target->getName(),
"role_id" => $target->getId()
]);
} else {
$this->sendFormattedMessage("err.target_higher_hrk");
}
$target = $args["target"];
if($target instanceof Role) {
if($sender->hasPermission("hierarchy.role." . static::CHILD_PERMISSION)) {
if($this->doHierarchyPositionCheck($target)) {
$this->doOperationOnRole($target, $permission);
$this->sendFormattedMessage("cmd." . static::MESSAGE_ROOT . ".role.success", [
"permission" => $permission->getName(),
"role" => $target->getName(),
"role_id" => $target->getId()
]);
} else {
$this->sendPermissionError();
$this->sendFormattedMessage("err.target_higher_hrk");
}
break;
} else {
$this->sendPermissionError();
}
}
break;
Expand Down
92 changes: 44 additions & 48 deletions src/CortexPE/Hierarchy/command/subcommand/InfoCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,67 +144,63 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
if($args["targetType"] === InfoTargetEnumArgument::TARGET_MEMBER && isset($args["targetMember"])) {
if($sender->hasPermission("hierarchy.info.member")) {
/** @var BaseMember $target */
foreach($args["targetMember"] as $target) {
$this->sendFormattedMessage("cmd.info.member.header", [
"member" => $target->getName()
$target = $args["targetMember"];
$this->sendFormattedMessage("cmd.info.member.header", [
"member" => $target->getName()
]);
$this->sendFormattedMessage("cmd.info.member.roles_header");
foreach($target->getRoles() as $role) {
$this->sendFormattedMessage("cmd.info.member.role_entry", [
"role" => $role->getName(),
"role_id" => $role->getId()
]);
$this->sendFormattedMessage("cmd.info.member.roles_header");
foreach($target->getRoles() as $role) {
$this->sendFormattedMessage("cmd.info.member.role_entry", [
"role" => $role->getName(),
"role_id" => $role->getId()
}
$this->sendFormattedMessage("cmd.info.member.m_perms_header");
if(count($target->getMemberPermissions()) > 0) {
foreach($target->getMemberPermissions() as $permission => $allowed) {
$this->sendFormattedMessage("cmd.info.member.m_perm_entry", [
"permission" => $permission,
"color" => $allowed ? TextFormat::GREEN : TextFormat::RED . "-"
]);
}
$this->sendFormattedMessage("cmd.info.member.m_perms_header");
if(count($target->getMemberPermissions()) > 0) {
foreach($target->getMemberPermissions() as $permission => $allowed) {
$this->sendFormattedMessage("cmd.info.member.m_perm_entry", [
"permission" => $permission,
"color" => $allowed ? TextFormat::GREEN : TextFormat::RED . "-"
]);
}
} else {
$this->sendFormattedMessage("cmd.info.member.no_extra_perms");
}
break;
} else {
$this->sendFormattedMessage("cmd.info.member.no_extra_perms");
}
} else {
$this->sendPermissionError();
}
} elseif($args["targetType"] === InfoTargetEnumArgument::TARGET_ROLE && isset($args["targetRole"])) {
if($sender->hasPermission("hierarchy.info.role")) {
/** @var Role $target */
foreach($args["targetRole"] as $target) {
$this->sendFormattedMessage("cmd.info.role.header", [
"role" => $target->getName(),
"role_id" => $target->getId()
]);
$this->sendFormattedMessage("cmd.info.role.position", [
"position" => $target->getPosition()
$target = $args["targetRole"];
$this->sendFormattedMessage("cmd.info.role.header", [
"role" => $target->getName(),
"role_id" => $target->getId()
]);
$this->sendFormattedMessage("cmd.info.role.position", [
"position" => $target->getPosition()
]);
$this->sendFormattedMessage("cmd.info.role.default", [
"isDefault" => $target->isDefault() ? TextFormat::GREEN . "YES" : TextFormat::RED . "NO"
]);
$this->sendFormattedMessage("cmd.info.role.perms_header");
foreach($target->getPermissions() as $permission => $allowed) {
$this->sendFormattedMessage("cmd.info.role.perm_entry", [
"permission" => $permission,
"color" => $allowed ? TextFormat::GREEN : TextFormat::RED . "-"
]);
$this->sendFormattedMessage("cmd.info.role.default", [
"isDefault" => $target->isDefault() ? TextFormat::GREEN . "YES" : TextFormat::RED . "NO"
]);
$this->sendFormattedMessage("cmd.info.role.perms_header");
foreach($target->getPermissions() as $permission => $allowed) {
$this->sendFormattedMessage("cmd.info.role.perm_entry", [
"permission" => $permission,
"color" => $allowed ? TextFormat::GREEN : TextFormat::RED . "-"
}
$this->sendFormattedMessage("cmd.info.role.members_header", [
"count" => ($c = count($target->getMembers()))
]);
if($c > 0) {
foreach($target->getMembers() as $member) {
$this->sendFormattedMessage("cmd.info.role.member_entry", [
"member" => $member->getName()
]);
}
$this->sendFormattedMessage("cmd.info.role.members_header", [
"count" => ($c = count($target->getMembers()))
]);
if($c > 0) {
foreach($target->getMembers() as $member) {
$this->sendFormattedMessage("cmd.info.role.member_entry", [
"member" => $member->getName()
]);
}
} else {
$this->sendFormattedMessage("cmd.info.role.no_online_members");
}
break;
} else {
$this->sendFormattedMessage("cmd.info.role.no_online_members");
}
} else {
$this->sendPermissionError();
Expand Down