From 3d2514b517d5719773477b513a39ff6085220156 Mon Sep 17 00:00:00 2001 From: Mario Steele Date: Thu, 12 Mar 2026 01:32:34 -0500 Subject: [PATCH] Updated UserEntry Re-Enabled shoutout to full functionality --- UI/Controls/user_entry.gd | 10 +++++++++- lib/twitcher_extended.zip | Bin 5611 -> 0 bytes 2 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 lib/twitcher_extended.zip diff --git a/UI/Controls/user_entry.gd b/UI/Controls/user_entry.gd index b384ee11..2ff94519 100644 --- a/UI/Controls/user_entry.gd +++ b/UI/Controls/user_entry.gd @@ -7,6 +7,7 @@ var tw_hidden: Tween var is_expanded: bool = false var is_profile_picture_loaded: bool = false +const SHOUTOUT_ALERT_SCENE := preload("res://UI/Shoutouts/shoutout.tscn") signal user_selected(chatter: Chatter) @@ -20,11 +21,18 @@ func _ready() -> void: %ScreenNotifer.rect = get_rect() %ScreenNotifer.screen_entered.connect(check_update_profile_picture) %User.pressed.connect(user_selected.emit.bind(chatter)) - %Shoutout.pressed.connect(func(): Globals.twitcher.shoutout(chatter.user)) + %Shoutout.pressed.connect(_handle_shoutout) #func(): Globals.twitcher.shoutout(chatter.user)) %Promote.pressed.connect(func(): Globals.twitcher.send_message(chatter.promo_msg)) %ButtonMenu.pressed.connect(func(): toggle_buttons(!is_expanded)) _update_tooltips() +func _handle_shoutout() -> void: + Globals.twitcher.shoutout(chatter.user) + Globals.twitcher.send_message(Globals.settings.shoutout_message.format(chatter.user)) + var alrt = SHOUTOUT_ALERT_SCENE.instantiate() + alrt.chatter = chatter + EventManager.add_alert(alrt) + func _update_tooltips() -> void: for node: Control in [%Shoutout, %Promote, %Refresh, %Raid, %Delete]: node.tooltip_text = node.tooltip_text % chatter.user.display_name diff --git a/lib/twitcher_extended.zip b/lib/twitcher_extended.zip deleted file mode 100644 index 4e2f3b5f04ed9eecc5154f97943caf521f8f9d06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5611 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