diff --git a/lib/util.gd b/lib/util.gd index 1841f002..335e9409 100644 --- a/lib/util.gd +++ b/lib/util.gd @@ -2,47 +2,36 @@ extends Object class_name Util #region HTML RegEx and UnEscape HTML -static var _img_re: RegEx: - get(): - if not _img_re: _img_re = RegEx.create_from_string(r']*src=["\']([^"\']+)["\'][^>]*/?>', true) - return _img_re - -static var _h2_open_re: RegEx: - get(): - if not _h2_open_re: _h2_open_re = RegEx.create_from_string(r']*>', true) - return _h2_open_re - -static var _p_open_re: RegEx: - get(): - if not _p_open_re: _p_open_re = RegEx.create_from_string(r']*>', true) - return _p_open_re - -static var _ul_re: RegEx: - get(): - if not _ul_re: _ul_re = RegEx.create_from_string(r']*>', true) - return _ul_re - -static var _div_re: RegEx: - get(): - if not _div_re: _div_re = RegEx.create_from_string(r']*>', true) - return _div_re - -static var _any_tag_re: RegEx: - get(): - if not _any_tag_re: _any_tag_re = RegEx.create_from_string(r'<[^>]*>', true) - return _any_tag_re - -static var _html_replacements: Dictionary[String, String]: - get(): - if not _html_replacements: _html_replacements = { - "<": "<", ">": ">", "&": "&", """: "\"", - "'": "'", "'": "'", "/": "/", "`": "`", - " ": " ", "©": "©", "®": "®", "€": "€", - "£": "£", "¥": "¥", "–": "–", "—": "—", - "‘": "‘", "’": "’", "“": "“", "”": "”", - "…": "…", "•": "•" - } - return _html_replacements +static var _img_re: RegEx = RegEx.create_from_string(r']*src=["\']([^"\']+)["\'][^>]*/?>') +static var _h2_open_re: RegEx = RegEx.create_from_string(r']*>') +static var _p_open_re: RegEx = RegEx.create_from_string(r']*>') +static var _ul_re: RegEx = RegEx.create_from_string(r']*>') +static var _div_re: RegEx = RegEx.create_from_string(r']*>') +static var _any_tag_re: RegEx = RegEx.create_from_string(r'<[^>]*>') +static var _html_replacements: Dictionary[String, String] = { + "<": "<", + ">": ">", + "&": "&", + """: "\"", + "'": "'", + "'": "'", + "/": "/", + "`": "`", + " ": " ", + "©": "©", + "®": "®", + "€": "€", + "£": "£", + "¥": "¥", + "–": "–", + "—": "—", + "‘": "‘", + "’": "’", + "“": "“", + "”": "”", + "…": "…", + "•": "•" + } #endregion static func convert_html_to_bbcode(html: String) -> String: @@ -81,10 +70,9 @@ static func convert_html_to_bbcode(html: String) -> String: static func html_unescape(text: String) -> String: - var new_text: String = String(text) - for key: String in _html_replacements.keys(): - new_text = new_text.replace(key, _html_replacements[key]) - return new_text + for key in _html_replacements.keys(): + text = text.replace(key, _html_replacements[key]) + return text static func resize_img_to_max_dim(img: Image, max_dim: int) -> Image: var width: int diff --git a/project.godot b/project.godot index 4b95eb92..019fc408 100644 --- a/project.godot +++ b/project.godot @@ -72,7 +72,9 @@ editor/game_oauth_setting="res://addons/twitcher/twitch_oauth_setting.tres" editor/project_preset=&"Other" editor/show_setup_on_startup=false logs/TwitchAuth="debug" +logs/TwitchEventsubConfig="debug" logs/TwitchAPI="debug" +logs/TwitchEventsub="debug" logs/TwitchChat="debug" logs/TwitchBot="debug" logs/TwitcherExtended="debug"