|
|
@@ -889,7 +889,7 @@ class SetPresenceState(Resource):
|
|
|
return noUser(user)
|
|
|
# app.logger.warning('state={}, getUserStateCombined({})={}'.format(state, user, getUserStateCombined(user)))
|
|
|
if (state.lower() in ('available','not_set','away','xa','chat')) and (getUserStateCombined(user) == 'dnd'):
|
|
|
- result = await amiDBPut('DND', '{}'.format(user), 'NO')
|
|
|
+ result = await amiDBDel('DND', '{}'.format(user))
|
|
|
result = await amiSetVar('PRESENCE_STATE(CustomPresence:{})'.format(user), state)
|
|
|
if result is not None:
|
|
|
return errorReply(result)
|
|
|
@@ -944,7 +944,7 @@ class UserDeviceBind(Resource):
|
|
|
ast = await getGlobalVars()
|
|
|
if currentUser not in NONEs: # If any other user is bound to device, unbind him,
|
|
|
result = await amiSetVar('PRESENCE_STATE(CustomPresence:{})'.format(user), 'available')
|
|
|
- result = await amiDBPut('DND', '{}'.format(user), 'NO')
|
|
|
+ result = await amiDBDel('DND', '{}'.format(user))
|
|
|
await setUserDevice(currentUser, None)
|
|
|
if ast.QUEDEVSTATE == 'TRUE': # set device states for previous user queues
|
|
|
await setQueueStates(currentUser, device, 'NOT_INUSE')
|
|
|
@@ -982,7 +982,7 @@ class DeviceUnBind(Resource):
|
|
|
return noUserBound(device)
|
|
|
else:
|
|
|
result = await amiSetVar('PRESENCE_STATE(CustomPresence:{})'.format(user), 'available')
|
|
|
- result = await amiDBPut('DND', '{}'.format(user), 'NO')
|
|
|
+ result = await amiDBDel('DND', '{}'.format(user))
|
|
|
ast = await getGlobalVars()
|
|
|
await setUserDevice(currentUser, None) # Unbind device from current user
|
|
|
if ast.QUEDEVSTATE == 'TRUE': # set device states for current user queues
|
