|
@@ -891,12 +891,12 @@ class SetPresenceState(Resource):
|
|
|
if user not in app.cache['ustates']:
|
|
if user not in app.cache['ustates']:
|
|
|
return noUser(user)
|
|
return noUser(user)
|
|
|
# app.logger.warning('state={}, getUserStateCombined({})={}'.format(state, user, getUserStateCombined(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'):
|
|
|
|
|
|
|
+ if (state.lower() in ('available','not_set','xa','chat')) and (getUserStateCombined(user) in ('dnd', 'away')):
|
|
|
result = await amiDBDel('DND', '{}'.format(user))
|
|
result = await amiDBDel('DND', '{}'.format(user))
|
|
|
result = await amiSetVar('PRESENCE_STATE(CustomPresence:{})'.format(user), state)
|
|
result = await amiSetVar('PRESENCE_STATE(CustomPresence:{})'.format(user), state)
|
|
|
if result is not None:
|
|
if result is not None:
|
|
|
return errorReply(result)
|
|
return errorReply(result)
|
|
|
- if state.lower() == 'dnd':
|
|
|
|
|
|
|
+ if state.lower() in ('dnd', 'away'):
|
|
|
result = await amiDBPut('DND', '{}'.format(user), 'YES')
|
|
result = await amiDBPut('DND', '{}'.format(user), 'YES')
|
|
|
return successfullySetState(user, state)
|
|
return successfullySetState(user, state)
|
|
|
|
|
|