From 4d8e9470f47c84d13a44b041670a4be6599fd2c0 Mon Sep 17 00:00:00 2001
From: Nathan Lovato <nathan@gdquest.com>
Date: Wed, 1 Jul 2020 09:56:18 -0600
Subject: [PATCH] Tutorial: Fix notification showing up when user logs in

---
 tutorial/godot/src/Main/Demo.gd             | 21 +++++++++++++--------
 tutorial/godot/src/Main/ServerConnection.gd | 12 ++++++------
 tutorial/godot/src/UI/ChatBox.gd            |  1 -
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tutorial/godot/src/Main/Demo.gd b/tutorial/godot/src/Main/Demo.gd
index 4d83230..3d21b2f 100644
--- a/tutorial/godot/src/Main/Demo.gd
+++ b/tutorial/godot/src/Main/Demo.gd
@@ -7,10 +7,11 @@ onready var debug_panel := $CanvasLayer/DebugPanel
 onready var chat_box := $CanvasLayer/ChatBox
 onready var notification_list := $CanvasLayer/NotificationList
 
+var email := "hello@test.com"
+var password := "password"
+
 
 func _ready() -> void:
-	var email := "test99@test.com"
-	var password := "password"
 
 	var result: int = yield(request_authentication(email, password), "completed")
 	if result != OK:
@@ -65,13 +66,17 @@ func _on_ChatBox_text_sent(text) -> void:
 	yield(server_connection.send_text_async(text), "completed")
 
 
-func _on_ServerConnection_chat_message_received(sender_id, text) -> void:
-	chat_box.add_reply(text, "User", user_color)
+func _on_ServerConnection_chat_message_received(username, text) -> void:
+	chat_box.add_reply(text, username, user_color)
 
 
-func _on_ServerConnection_user_joined(user) -> void:
-	notification_list.add_notification(user.username, Color.white, false)
+func _on_ServerConnection_user_joined(username) -> void:
+	if email == username:
+		return
+	notification_list.add_notification(username, Color.white, false)
 
 
-func _on_ServerConnection_user_left(user) -> void:
-	notification_list.add_notification(user.username, Color.white, true)
+func _on_ServerConnection_user_left(username) -> void:
+	if email == username:
+		return
+	notification_list.add_notification(username, Color.white, true)
diff --git a/tutorial/godot/src/Main/ServerConnection.gd b/tutorial/godot/src/Main/ServerConnection.gd
index 15c8ff8..7fe1cbf 100644
--- a/tutorial/godot/src/Main/ServerConnection.gd
+++ b/tutorial/godot/src/Main/ServerConnection.gd
@@ -1,8 +1,8 @@
 extends Node
 
-signal chat_message_received(sender_id, text)
-signal user_joined(user)
-signal user_left(user)
+signal chat_message_received(username, text)
+signal user_joined(username)
+signal user_left(username)
 
 # Nakama read permissions
 enum ReadPermissions { NO_READ, OWNER_READ, PUBLIC_READ }
@@ -148,16 +148,16 @@ func _on_NamakaSocket_received_channel_message(message: NakamaAPI.ApiChannelMess
 		return
 
 	var content: Dictionary = JSON.parse(message.content).result
-	emit_signal("chat_message_received", message.sender_id, content.msg)
+	emit_signal("chat_message_received", message.username, content.msg)
 
 
 func _on_NakamaSocket_received_match_presence(new_presences: NakamaRTAPI.MatchPresenceEvent) -> void:
 	for user in new_presences.leaves:
 		#warning-ignore: return_value_discarded
 		_presences.erase(user.user_id)
-		emit_signal("user_left", user)
+		emit_signal("user_left", user.username)
 
 	for user in new_presences.joins:
 		_presences[user.user_id] = user
-		emit_signal("user_joined", user)
+		emit_signal("user_joined", user.username)
 
diff --git a/tutorial/godot/src/UI/ChatBox.gd b/tutorial/godot/src/UI/ChatBox.gd
index 9093bd5..fbe4d99 100644
--- a/tutorial/godot/src/UI/ChatBox.gd
+++ b/tutorial/godot/src/UI/ChatBox.gd
@@ -57,4 +57,3 @@ func _on_LineEdit_focus_exited() -> void:
 
 func _on_ToggleChatButton_toggled(button_pressed: bool) -> void:
 	visible = button_pressed
-