dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Factor out commandAvailable

master
June McEnroe 2022-02-26 15:40:11 -05:00
parent f51e7b4d2c
commit 628e064056
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2020 C. McEnroe <june@causal.agency> /* Copyright (C) 2020 June McEnroe <june@causal.agency>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -639,6 +639,12 @@ size_t commandWillSplit(uint id, const char *input) {
return 0; return 0;
} }
static bool commandAvailable(const struct Handler *handler) {
if (handler->flags & Restrict && self.restricted) return false;
if (handler->flags & Kiosk && self.kiosk) return false;
return true;
}
void command(uint id, char *input) { void command(uint id, char *input) {
if (id == Debug && input[0] != '/' && !self.restricted) { if (id == Debug && input[0] != '/' && !self.restricted) {
commandQuote(id, input); commandQuote(id, input);
@ -667,10 +673,7 @@ void command(uint id, char *input) {
uiFormat(id, Warm, NULL, "No such command %s", cmd); uiFormat(id, Warm, NULL, "No such command %s", cmd);
return; return;
} }
if ( if (!commandAvailable(handler)) {
(self.restricted && handler->flags & Restrict) ||
(self.kiosk && handler->flags & Kiosk)
) {
uiFormat(id, Warm, NULL, "Command %s is unavailable", cmd); uiFormat(id, Warm, NULL, "Command %s is unavailable", cmd);
return; return;
} }