Skip to content

Commit eb643ac

Browse files
committed
add readme
1 parent eecb7e7 commit eb643ac

File tree

4 files changed

+15
-53
lines changed

4 files changed

+15
-53
lines changed

main/scn/home/home.gd

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,6 @@ func sort_posts(post_a : FirestoreDocument, post_b : FirestoreDocument):
6565
func load_posts():
6666
if not UserData.friend_list.empty():
6767
posts_section.get_node("NoFriends").hide()
68-
# Get a list of all user's friends' posts
69-
# var temp_post_list : Array = yield(Utilities.get_friends_posts(), "result_query")
70-
# if temp_post_list[0].has("error"):
71-
# Activities.show_error(JSON.print(temp_post_list[0].error))
72-
73-
# for friend in UserData.friend_list:
74-
# var post_task : FirestoreTask = Utilities.get_user_posts(friend)
75-
# var posts : Array = yield(post_task, "result_query")
76-
# if posts.empty():
77-
# continue
78-
# for post in posts:
79-
# if not post.has("document"):
80-
# continue
81-
# friend_posts.append(FirestoreDocument.new(post.document))
82-
8368
var posts : Array = yield(Utilities.get_all_posts(), "listed_documents")
8469
for post in posts:
8570
if post.has("fields"):
@@ -92,26 +77,19 @@ func load_posts():
9277
if friend_posts.empty():
9378
pass
9479
else:
95-
# For each post in the list (which is a document)
9680
for post in friend_posts.slice(0, 10):
97-
# Create the actual FirestoreDocument
98-
# var post_info : FirestoreDocument = FirestoreDocument.new(post.document)
99-
# Make sure that the post is not already present in the dynamic DB PostsManager,
100-
10181
if PostsManager.has_post(post.doc_name):
102-
# If this happens, check if a PostContainer linked to this post is already present in DB,
103-
# and eventually add it if not already added to the PostBox
10482
if PostsManager.has_post_container(post.doc_name):
10583
var post_container : PostContainer = PostsManager.get_post_container_by_id(post.doc_name)
10684
add_post(post_container)
10785
else:
108-
# Create a PostContainer object, and populate it
109-
# the PostContainer object will automatically add itself to the list in PostsManager
11086
var post_container : PostContainer = Activities.post_container_scene.instance()
11187
var post_obj : PostsManager.Post = PostsManager.add_post_from_doc(post.doc_name, post)
11288
post_container.load_post(post_obj)
11389
add_post(post_container)
11490
else:
91+
for post in post_box.get_children():
92+
if post is PostContainer: post.queue_free()
11593
posts_section.get_node("NoFriends").show()
11694

11795

@@ -128,8 +106,7 @@ func add_post(post : PostContainer):
128106
func add_shared_post(post_id : String, document : FirestoreDocument, image : ImageTexture):
129107
var post : PostContainer = Activities.post_container_scene.instance()
130108
add_post(post)
131-
PostsManager.add_shared_post(post_id, document, image)
132-
post.load_shared_post(post_id, document, image)
109+
post.load_post(PostsManager.add_shared_post(post_id, document, image))
133110
post_box.move_child(post, 0)
134111

135112

main/scn/post/post.gd

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var image : ImageTexture setget set_image # id + extension
1515
var timestamp : int setget set_timestamp
1616
var likes : Array = [] setget set_likes
1717
var comments : Dictionary = {} setget set_comments
18-
var post : PostsManager.Post
18+
var post : PostsManager.Post setget set_post
1919

2020
var db_reference : FirebaseDatabaseReference
2121

@@ -25,11 +25,12 @@ func _ready():
2525
$PostContainer/ActionButtons/CommentsBtn.connect("pressed", self, "_on_CommentsBtn_pressed")
2626
connect("open_post", Activities.home, "_on_open_post")
2727

28-
28+
func set_post(p) -> void:
29+
post = p
30+
post.connect("update_image", self, "set_image")
2931

3032
func load_post(post) -> void:
31-
self.post = post
32-
post.connect("update_image", self, "set_image")
33+
set_post(post)
3334
load_user_image(post.user_id)
3435
set_post_id(post.id)
3536
set_user(post.user)
@@ -39,27 +40,6 @@ func load_post(post) -> void:
3940
set_image(post.image)
4041
PostsManager.add_post_scene(self)
4142

42-
func load_post_from_doc(id : String, doc : Dictionary):
43-
set_post_id(id)
44-
set_user(doc.user)
45-
load_image(doc.image)
46-
load_user_image(doc.user_id)
47-
set_user_id(doc.user_id)
48-
set_description(doc.description)
49-
set_timestamp(doc.timestamp)
50-
PostsManager.add_post_scene(self)
51-
52-
53-
func load_shared_post(id : String, document : FirestoreDocument, image : ImageTexture):
54-
set_post_id(id)
55-
set_user(UserData.user_name)
56-
set_user_id(UserData.user_id)
57-
set_user_picture(UserData.user_picture)
58-
set_description(document.doc_fields.description)
59-
set_image(image)
60-
set_timestamp(document.doc_fields.timestamp)
61-
PostsManager.add_post_scene(self)
62-
6343
func set_post_id(p : String):
6444
id = p
6545
name = id

main/scn/profile/profile.gd

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ func load_profile(_id : String, user_name : String):
1616
if UsersManager.has_user(_id):
1717
var user : UsersManager.User = UsersManager.get_user_by_id(_id)
1818
self.user = user
19-
user.connect("update_picture", self, "set_user_avatar")
19+
if not user.is_connected("update_picture", self, "set_user_avatar"):
20+
user.connect("update_picture", self, "set_user_avatar")
2021
set_user_avatar(user.picture)
2122
set_user_name(user.username)
2223
var result = yield(Utilities.get_user_posts(user.id), "task_finished")
@@ -64,7 +65,9 @@ func load_user_posts(user_posts : Array):
6465
var post_info : FirestoreDocument = FirestoreDocument.new(post.document)
6566
if PostsManager.has_post(post_info.doc_name):
6667
if PostsManager.has_post_container(post_info.doc_name):
67-
post_container_box.add_child(PostsManager.get_post_container_by_id(post_info.doc_name).duplicate())
68+
var post_container : PostContainer = PostsManager.get_post_container_by_id(post_info.doc_name).duplicate()
69+
post_container.set_post(PostsManager.get_post_by_id(post_info.doc_name))
70+
post_container_box.add_child(post_container)
6871
else:
6972
var post_container : PostContainer = Activities.post_container_scene.instance()
7073
post_container.load_post(PostsManager.add_post_from_doc(post_info.doc_name, post_info))
@@ -77,6 +80,7 @@ func load_user_posts(user_posts : Array):
7780
var post_container : PostContainer = Activities.post_container_scene.instance()
7881
post_container.load_post(post_obj)
7982
post_container_box.add_child(post_container)
83+
8084
$ScrollPost.show()
8185

8286
func _on_ConnecBtn_pressed():

main/scn/signin/signin.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func _ready():
1818
$UpdateProfile.hide()
1919
animate_SignContainer(true)
2020
yield(get_tree(), "idle_frame")
21+
return
2122
Firebase.Auth.load_auth()
2223
if not Firebase.Auth.auth.empty():
2324
Activities.loading( true)

0 commit comments

Comments
 (0)