Showing the changes to libraries/script-engine/src/UsersScriptingInterface.cpp (1 of 9 files). Show all
Unified · Split
| @@ -52,15 +52,14 @@ float UsersScriptingInterface::getAvatarGain(const QUuid& nodeID) { · 51 unmodified lines | |||
| 52 | return DependencyManager::get<NodeList>()->getAvatarGain(nodeID); | 52 | return DependencyManager::get<NodeList>()->getAvatarGain(nodeID); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | void UsersScriptingInterface::kick(const QUuid& nodeID, bool banByUsername, bool banByFingerprint, bool banByIP) { | 55 | void UsersScriptingInterface::kick(const QUuid& nodeID, int banFlags) { |
| 56 | |||
| 57 | if (_kickConfirmationOperator) { | 56 | if (_kickConfirmationOperator) { |
| 58 | bool waitingForKickResponse = _kickResponseLock.resultWithReadLock<bool>([&] { return _waitingForKickResponse; }); | 57 | bool waitingForKickResponse = _kickResponseLock.resultWithReadLock<bool>([&] { return _waitingForKickResponse; }); |
| 59 | if (getCanKick() && !waitingForKickResponse) { | 58 | if (getCanKick() && !waitingForKickResponse) { |
| 60 | _kickConfirmationOperator(nodeID, banByUsername, banByFingerprint, banByIP); | 59 | _kickConfirmationOperator(nodeID, banFlags); |
| 61 | } | 60 | } |
| 62 | } else { | 61 | } else { |
| 63 | DependencyManager::get<NodeList>()->kickNodeBySessionID(nodeID, banByUsername, banByFingerprint, banByIP); | 62 | DependencyManager::get<NodeList>()->kickNodeBySessionID(nodeID, banFlags); |
| 64 | } | 63 | } |
| 65 | } | 64 | } |
| 66 | 65 | ||