fix user pictures and connections

Author: fenix-hub

main/scn/app/main.gd

@@ -1,6 +1,6 @@
 extends Control
 
-const version : String = "1.1"
+const version : String = "1.2"
 
 onready var activities : Control = $Main/Activities
 onready var topbar : HBoxContainer = $TopBar

main/scn/header/header.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://main/res/shaders/round_avatar.tres" type="Material" id=2]
 
 [node name="Header" type="HBoxContainer"]
-margin_right = 116.0
+margin_right = 168.0
 margin_bottom = 60.0
 size_flags_vertical = 4
 __meta__ = {
@@ -24,6 +24,8 @@ stretch_mode = 1
 [node name="Name" type="Label" parent="."]
 margin_left = 68.0
 margin_top = 17.0
-margin_right = 116.0
+margin_right = 168.0
 margin_bottom = 42.0
+rect_min_size = Vector2( 100, 0 )
 text = "user"
+autowrap = true

main/scn/header/interactive/interactive_header.gd

@@ -27,14 +27,16 @@ func load_from_user(user_obj : UsersManager.User):
     user_document = user_obj.document
     if not user_obj.is_connected("update_picture", self, "set_picture"):
         user_obj.connect("update_picture", self, "set_picture")
+    set_user_id(user_obj.id)
     set_picture(user_obj.picture)
     set_user_name(user_obj.username)
-    check_friend(user_obj.id)
+    check_friend()
 
 func load_from_document(document : FirestoreDocument):
     user_document = document
+    set_user_id(document.doc_name)
     set_user_name(document.doc_fields.username)
-    check_friend(document.doc_name)
+    check_friend()
 
 func set_picture(picture : ImageTexture):
     user_picture = picture
@@ -46,8 +48,10 @@ func set_user_name(_name : String):
     user_name = _name
     $Name.set_text(_name)
 
-func check_friend(user_id : String) -> bool:
-    self.user_id = user_id
+func set_user_id(_id : String):
+    user_id = _id
+
+func check_friend() -> bool:
     $ConnecBtn.visible = not (user_id == UserData.user_id)
     $ConnecBtn.activated = (user_id in UserData.friend_list)
     $ConnecBtn.set_text("Connected" if (user_id in UserData.friend_list) else "Conect")
@@ -56,7 +60,7 @@ func check_friend(user_id : String) -> bool:
 func _on_ConnecBtn_pressed():
     var friend_task : FirestoreTask = RequestsManager.update_friend_list(user_id)
     yield(friend_task, "update_document")
-    if check_friend(user_id):
+    if check_friend():
         emit_signal("connected", user, $ConnecBtn)
     else:
         emit_signal("disconnect", user)

main/scn/header/interactive/interactive_header.tscn

@@ -30,8 +30,9 @@ stretch_mode = 1
 [node name="Name" type="LinkButton" parent="."]
 margin_left = 70.0
 margin_top = 17.0
-margin_right = 118.0
+margin_right = 420.0
 margin_bottom = 42.0
+size_flags_horizontal = 3
 size_flags_vertical = 4
 text = "user"
 underline = 1
@@ -42,7 +43,7 @@ margin_top = 11.0
 margin_right = 550.0
 margin_bottom = 48.0
 rect_min_size = Vector2( 120, 30 )
-size_flags_horizontal = 14
+size_flags_horizontal = 8
 size_flags_vertical = 4
 text = "Connect"
 icon = ExtResource( 5 )

main/scn/home/home.gd

@@ -53,8 +53,9 @@ func _ready():
     friend_list.load_friend_list()
 
 func load_user():
-    $HomeContainer/Menu/Header/Picture.set_texture(UserData.user_picture)
     $HomeContainer/Menu/Header/Name.set_text(UserData.user_name)
+    if UserData.user_picture != null :
+        $HomeContainer/Menu/Header/Picture.set_texture(UserData.user_picture)
 
 
 func animate_Home(display : bool):

main/scn/signin/signin.gd

@@ -72,15 +72,17 @@ func _on_SignContainer_logged(login):
         Firebase.Auth.save_auth(login)
         UserData.user_id = login.localid
         UserData.user_email = login.email
-        Activities.loading( false)
+        Activities.loading(false)
         animate_SignContainer(false)
         animate_UpdateProfile(true)
         $UpdateProfile.show()
         return
     var picture_task : StorageTask = RequestsManager.get_profile_picture(user_doc.doc_name)
     yield(picture_task,"task_finished")
-    var user_picture : ImageTexture = Utilities.task2image(picture_task)
-    Activities.loading( false)
+    var user_picture : ImageTexture = null
+    if picture_task.data.size() > 0:
+        user_picture = Utilities.task2image(picture_task)
+    Activities.loading(false)
     UserData.map_user(user_doc, user_picture)
     emit_signal("sign_in")
 

main/scn/signin/signin.tscn

@@ -112,15 +112,12 @@ margin_bottom = 372.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_styles/panel = SubResource( 3 )
-automatic_signup = true
-anonymous_signup = false
 
 [node name="UpdateProfile" type="PanelContainer" parent="."]
-visible = false
 margin_left = 377.0
-margin_top = 286.0
+margin_top = 133.0
 margin_right = 647.0
-margin_bottom = 314.0
+margin_bottom = 466.0
 rect_min_size = Vector2( 270, 0 )
 size_flags_horizontal = 4
 size_flags_vertical = 4

main/scn/users_list/users_list.gd

@@ -21,6 +21,9 @@ func load_users_list():
         if user_document.doc_name == UserData.user_id:
             continue
         if user_document.doc_name in users_list:
+            var user_header : InteractiveHeader = find_user(user_document.doc_name)
+            if user_header != null:
+                user_header.check_friend()
             continue
         if UsersManager.has_user(user_document.doc_name):
             var user_header : InteractiveHeader = user_header_scene.instance()
@@ -35,6 +38,12 @@ func load_users_list():
             user_header.connect("show_user_profile", self, "_on_show_user_profile")
         users_list.append(user_document.doc_name)
     list_container.show()
+        
+func find_user(user_id : String) -> InteractiveHeader:
+    for header in list_container.get_children():
+        if header.user_id == user_id :
+            return header
+    return null
 
 func _on_show_user_profile(user_id : String, user_name : String):
     emit_signal("show_user_profile", user_id, user_name)

main/scripts/posts_manager.gd

@@ -71,7 +71,7 @@ func add_post(id : String, document_task : FirestoreTask = null, image_task : St
 func add_post_from_doc(id : String, doc : FirestoreDocument, image_task : StorageTask = null) -> Post:
     var post : Post
     if image_task == null:
-        if doc.doc_fields.image != "":
+        if not doc.doc_fields.image in ["", " "]:
             image_task = RequestsManager.get_post_image(doc.doc_fields.user_id, id, doc.doc_fields.image)
             post = Post.new(id, null, image_task)
         else:

main/scripts/users_manager.gd

@@ -38,8 +38,9 @@ class User:
         emit_signal("update_user", self)
 
     func _on_picture_received():
-        picture = Utilities.task2image(picture_task)
-        emit_signal("update_picture", picture)
+        if picture_task.data.size() > 0 :
+            picture = Utilities.task2image(picture_task)
+            emit_signal("update_picture", picture)
 
 var users : Array = []