Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -21,32 +21,33 @@ class ChatConsumer(WebsocketConsumer):
|
|||||||
|
|
||||||
from .funcs import send_msg
|
from .funcs import send_msg
|
||||||
resDict = send_msg(text_data)
|
resDict = send_msg(text_data)
|
||||||
# resDict.update({
|
resDict.update({
|
||||||
# 'type': 'chat_message',
|
'type': 'ws_send_msg',
|
||||||
#
|
'message': resDict,
|
||||||
# })
|
# 'sender': sender
|
||||||
print(f'send_msg res = {resDict}')
|
})
|
||||||
|
print(f'send_msg res = {len(resDict)}')
|
||||||
|
|
||||||
self.send(json.dumps(resDict))
|
self.send(json.dumps(resDict))
|
||||||
|
|
||||||
# async_to_sync(self.channel_layer.group_send)(
|
async_to_sync(self.channel_layer.group_send)(
|
||||||
# self.room_group_name,
|
self.room_group_name,
|
||||||
# resDict
|
resDict
|
||||||
# # {
|
# {
|
||||||
# # 'type': 'chat_message',
|
# 'type': 'chat_message',
|
||||||
# # 'message': message,
|
# 'message': message,
|
||||||
# # 'sender': sender
|
# 'sender': sender
|
||||||
# # }
|
# }
|
||||||
# )
|
)
|
||||||
|
|
||||||
def chat_message(self, event):
|
def ws_send_msg(self, event):
|
||||||
print('ws chat_message')
|
print('ws ws_send_msg')
|
||||||
|
|
||||||
message = event['message']
|
message = event['message']
|
||||||
sender = event['sender']
|
# sender = event['sender']
|
||||||
|
|
||||||
self.send(text_data=json.dumps({
|
self.send(text_data=json.dumps({
|
||||||
'type': 'chat',
|
'type': 'chat',
|
||||||
'message': message,
|
'message': message,
|
||||||
'sender': sender
|
# 'sender': sender
|
||||||
}))
|
}))
|
||||||
Reference in New Issue
Block a user