Merge branch 'master' of https://gogs.halsbox.ru/RRT/pbx

app/app.py

@@ -248,13 +248,14 @@ async def celCallback(mngr: Manager, msg: Message):
             _cb = {'user': called,
                  'state': 'group_start_ringing',
                  'callerId': cid,
-                 'callId': firstMessage.UniqueID}
+                 'callId': msg.UniqueID}
           else:                                                      #end dial
             app.cache['cel_calls'][uid]['current_channels'].pop(channel, False)
             _cb = {'user': called,
                  'state': 'group_end_ringing',
                  'callerId': cid,
-                 'callId': firstMessage.UniqueID}
+                 'callId': msg.UniqueID}
+
           if ('WebCallId' in app.cache['cel_calls'][msg.linkedid]):
               _cb['WebCallId'] = app.cache['cel_calls'][msg.linkedid]['WebCallId']
           reply = await doCallback('groupRinging', _cb)
@@ -267,7 +268,7 @@ async def celCallback(mngr: Manager, msg: Message):
                'users': list(app.cache['cel_calls'][uid]['all_channels'].values()),
                'state': 'group_answer',
                'callerId': cid,
-               'callId': firstMessage.UniqueID}
+               'callId': msg.UniqueID}
           if ('WebCallId' in app.cache['cel_calls'][msg.linkedid]):
             _cb['WebCallId'] = app.cache['cel_calls'][msg.linkedid]['WebCallId']
           reply = await doCallback('groupAnswered', _cb)