From cf08bd1944ec07bde5a6731ba3be7b9586aab674 Mon Sep 17 00:00:00 2001 From: domi41 Date: Sun, 9 Aug 2020 15:50:50 +0200 Subject: [PATCH] fix: typo in the API of TwiCil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since godot's addons are made to be modded, let's abuse it. … Just like that. --- addons/godot-twicil/godot_twicil.gd | 22 +++++++++---------- .../helpers/api/twitch_api_wrapper.gd | 4 ++-- .../helpers/http/http_request_queue.gd | 4 ++-- .../helpers/interactive_commands.gd | 2 +- addons/godot-twicil/helpers/irc_client_ex.gd | 12 +++++----- .../godot-twicil/helpers/irc_client_scure.gd | 18 +++++++-------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/addons/godot-twicil/godot_twicil.gd b/addons/godot-twicil/godot_twicil.gd index f79d8e7..97111f7 100644 --- a/addons/godot-twicil/godot_twicil.gd +++ b/addons/godot-twicil/godot_twicil.gd @@ -1,14 +1,14 @@ extends IrcClientSecure class_name TwiCIL -signal raw_response_recieved(response) +signal raw_response_received(response) signal user_appeared(user) signal user_disappeared(user) -signal message_recieved(sender, text, emotes) +signal message_received(sender, text, emotes) -signal emote_recieved(user, emote_reference) +signal emote_received(user, emote_reference) -signal texture_recieved(texture) +signal texture_received(texture) enum IRCCommands {PING, PONG, PRIVMSG, JOIN, PART, NAMES} @@ -144,9 +144,9 @@ func __init_twitch_api() -> void: twitch_api_wrapper = TwitchApiWrapper.new(http_request_queue, '') func __connect_signals(): - connect("message_recieved", commands, "_on_message_recieved") - connect("response_recieved", self, "_on_response_recieved") - connect("http_response_recieved", self, "_on_http_response_recieved") + connect("message_received", commands, "_on_message_received") + connect("response_received", self, "_on_response_received") + connect("http_response_received", self, "_on_http_response_received") twitch_emotes_cache.connect("emote_retrieved", self, "_on_emote_retrieved") bttv_emotes_cache.connect("emote_retrieved", self, "_on_emote_retrieved") @@ -199,8 +199,8 @@ func _ready(): # Events -func _on_response_recieved(response): - emit_signal("raw_response_recieved", response) +func _on_response_received(response): + emit_signal("raw_response_received", response) for single_response in response.split('\n', false): single_response = __parse(single_response.strip_edges(false)) @@ -218,7 +218,7 @@ func _on_response_recieved(response): ) emit_signal( - "message_recieved", + "message_received", twitch_message.chat_message.name, twitch_message.chat_message.text, twitch_message.emotes @@ -240,7 +240,7 @@ func _on_emote_retrieved(emote_reference: Reference) -> void: var emote_id: String = emote_reference.id var user: String = (user_emotes_queue.get(emote_id, []) as Array).pop_front() - emit_signal("emote_recieved", user, emote_reference) + emit_signal("emote_received", user, emote_reference) func _on_twitch_api_api_user_info(data): var user_id := str(data.get('data', [{}])[0].get('id', 0)) diff --git a/addons/godot-twicil/helpers/api/twitch_api_wrapper.gd b/addons/godot-twicil/helpers/api/twitch_api_wrapper.gd index 3296b58..2c6c27d 100644 --- a/addons/godot-twicil/helpers/api/twitch_api_wrapper.gd +++ b/addons/godot-twicil/helpers/api/twitch_api_wrapper.gd @@ -2,7 +2,7 @@ extends Object class_name TwitchApiWrapper -signal api_response_recieved(rquest_id, response) +signal api_response_received(rquest_id, response) signal api_response_failed(response_code, http_headers) signal api_user_info(data) @@ -77,7 +77,7 @@ func _on_http_request_queue_request_completed(id: String, result: int, response_ if http_headers.get('Content-Type') == HttpHeaders.HTTP_CONTENT_TYPE_JSON_UTF8: var data = parse_json(body.get_string_from_utf8()) - emit_signal("api_response_recieved", id, data) + emit_signal("api_response_received", id, data) if response_code == 200: match id: diff --git a/addons/godot-twicil/helpers/http/http_request_queue.gd b/addons/godot-twicil/helpers/http/http_request_queue.gd index ed04e1a..81ce325 100644 --- a/addons/godot-twicil/helpers/http/http_request_queue.gd +++ b/addons/godot-twicil/helpers/http/http_request_queue.gd @@ -2,7 +2,7 @@ extends Node class_name HttpRequestQueue -signal http_response_recieved(content_type, body) +signal http_response_received(content_type, body) signal http_response_failed(error_code) signal request_completed(id, result, response_code, headers, body) signal request_completed_ex(id, result, response_code, http_headers, body) @@ -67,7 +67,7 @@ func _on_http_request_completed(result: int, response_code: int, headers: PoolSt var content_type := http_headers.get('Content-Type') as String - emit_signal("http_response_recieved", content_type, body) + emit_signal("http_response_received", content_type, body) else: emit_signal("http_response_failed", response_code) diff --git a/addons/godot-twicil/helpers/interactive_commands.gd b/addons/godot-twicil/helpers/interactive_commands.gd index 3d0d2a1..59c2390 100644 --- a/addons/godot-twicil/helpers/interactive_commands.gd +++ b/addons/godot-twicil/helpers/interactive_commands.gd @@ -43,7 +43,7 @@ func remove(chat_command: String) -> void: interactive_commands.erase(chat_command) # Events -func _on_message_recieved(sender: String, text: String, emotes: Array) -> void: +func _on_message_received(sender: String, text: String, emotes: Array) -> void: var input_cmd: Array = text.split(' ') for cmd in interactive_commands: diff --git a/addons/godot-twicil/helpers/irc_client_ex.gd b/addons/godot-twicil/helpers/irc_client_ex.gd index 85c092b..5c895d9 100644 --- a/addons/godot-twicil/helpers/irc_client_ex.gd +++ b/addons/godot-twicil/helpers/irc_client_ex.gd @@ -1,8 +1,8 @@ extends Node class_name IrcClientEx -signal response_recieved(response) -signal http_response_recieved(type, response) +signal response_received(response) +signal http_response_received(type, response) signal http_response_failed(error_code) export(float) var CONNECT_WAIT_TIMEOUT = 1 @@ -97,7 +97,7 @@ func __process_input() -> void: _log('>> %s' % data) - emit_signal('response_recieved', data) + emit_signal('response_received', data) func __parse_server_message(data): pass @@ -106,7 +106,7 @@ func __initialize_http_request_queue() -> void: http_request_queue = HttpRequestQueue.new() add_child(http_request_queue) -# http_request_queue.connect("http_response_recieved", self, "_on_http_response_recieved") +# http_request_queue.connect("http_response_received", self, "_on_http_response_received") # hooks @@ -131,8 +131,8 @@ func _process(delta: float) -> void: # events -func _on_http_response_recieved(content_type: String, data: PoolByteArray) -> void: - emit_signal("http_response_recieved", content_type, data) +func _on_http_response_received(content_type: String, data: PoolByteArray) -> void: + emit_signal("http_response_received", content_type, data) func _on_http_response_failed(error_code: int) -> void: emit_signal("http_response_failed", error_code) diff --git a/addons/godot-twicil/helpers/irc_client_scure.gd b/addons/godot-twicil/helpers/irc_client_scure.gd index 4b8bf81..0c9a01d 100644 --- a/addons/godot-twicil/helpers/irc_client_scure.gd +++ b/addons/godot-twicil/helpers/irc_client_scure.gd @@ -1,8 +1,8 @@ extends Node class_name IrcClientSecure -signal response_recieved(response) -signal http_response_recieved(type, response) +signal response_received(response) +signal http_response_received(type, response) signal http_response_failed(error_code) export(float) var CONNECT_WAIT_TIMEOUT = 2.0 @@ -77,17 +77,17 @@ func __process_commands() -> void: func __process_incoming_data() -> void: var available_packets_count := __websocket_peer.get_available_packet_count() - var recieved_string: String = '' + var received_string: String = '' while available_packets_count > 0: var packet = __websocket_peer.get_packet() - recieved_string += packet.get_string_from_utf8() + received_string += packet.get_string_from_utf8() available_packets_count -= 1 - if recieved_string: - _log('>> %s' % recieved_string) + if received_string: + _log('>> %s' % received_string) - emit_signal('response_recieved', recieved_string) + emit_signal('response_received', received_string) func __parse_server_message(data): pass @@ -133,8 +133,8 @@ func _process(delta: float) -> void: # events -func _on_http_response_recieved(content_type: String, data: PoolByteArray) -> void: - emit_signal("http_response_recieved", content_type, data) +func _on_http_response_received(content_type: String, data: PoolByteArray) -> void: + emit_signal("http_response_received", content_type, data) func _on_http_response_failed(error_code: int) -> void: emit_signal("http_response_failed", error_code)