| … | … | @@ -26,7 +26,7 @@ var seen_identities = LRU.new() |
| 26 | 26 | |
| 27 | 27 | onready var eventSource = $HyperGateway/HyperEventSource |
| 28 | 28 | onready var gateway = $HyperGateway |
| 29 | | onready var chatbox = $ScrollContainer/CatBox |
| 29 | onready var chatBox = $ScrollContainer/ChatBox |
| 30 | 30 | onready var chatText = $HBoxContainer/ChatInput |
| 31 | 31 | onready var username = $HBoxContainer/Username |
| 32 | 32 | onready var broadcastRequest = $HyperGateway/BroadcastRequest |
| … | … | @@ -39,11 +39,12 @@ func _ready(): |
| 39 | 39 | |
| 40 | 40 | func display_item(from, content): |
| 41 | 41 | # Add to item list |
| 42 | | chatText.text += from + ': ' + content + "\n" |
| 42 | chatBox.text += from + ': ' + content + "\n" |
| 43 | 43 | |
| 44 | 44 | func send_current(): |
| 45 | 45 | var text = chatText.text |
| 46 | 46 | chatText.text = "" |
| 47 | display_item(get_username(), text) |
| 47 | 48 | broadcast_text(text) |
| 48 | 49 | |
| 49 | 50 | func update_identity(from, username): |
| … | … | @@ -92,12 +93,12 @@ func broadcast_identity(): |
| 92 | 93 | |
| 93 | 94 | func broadcast_message(message): |
| 94 | 95 | # POST to extension URL |
| 95 | | if !message.has('id'): |
| 96 | if !("id" in message): |
| 96 | 97 | message.id = make_id() |
| 97 | 98 | seen_messages.track(message.id) |
| 98 | | print('Broadcasting message', message) |
| 99 | print('Broadcasting message', message, extensionPath) |
| 99 | 100 | var body = JSON.print(message) |
| 100 | | broadcastRequest.request(extensionPath,[], false, HTTPClient.METHOD_GET, body) |
| 101 | broadcastRequest.request(extensionPath,[], false, HTTPClient.METHOD_POST, body) |
| 101 | 102 | |
| 102 | 103 | func has_seen_identity(from): |
| 103 | 104 | return seen_identities.has(from) |
| … | … | @@ -106,13 +107,13 @@ func has_seen_message(id): |
| 106 | 107 | return seen_messages.has(id) |
| 107 | 108 | |
| 108 | 109 | func re_broadcast(message, from): |
| 109 | | if !message.has('from'): |
| 110 | if !("from" in message): |
| 110 | 111 | message.from = from |
| 111 | 112 | broadcast_message(message) |
| 112 | 113 | |
| 113 | 114 | func handle_message(message, from): |
| 114 | | var finalFrom = message.from if message.has('from') else from |
| 115 | | if !message.has('id'): |
| 115 | var finalFrom = message.from if "from" in message else from |
| 116 | if !("id" in message): |
| 116 | 117 | return _on_unknown_message(message, finalFrom) |
| 117 | 118 | if !has_seen_message(message.id): |
| 118 | 119 | re_broadcast(message, finalFrom) |
| … | … | @@ -144,6 +145,7 @@ func _on_HyperEventSource_event(data, event, id): |
| 144 | 145 | |
| 145 | 146 | func _on_HyperGateway_started_gateway(pid): |
| 146 | 147 | start_listening() |
| 148 | list_peers() |
| 147 | 149 | broadcast_identity() |
| 148 | 150 | |
| 149 | 151 | func _on_SendButton_pressed(): |