From c3340b91bf4d088a5c6db1b6d927e9ba83885487 Mon Sep 17 00:00:00 2001 From: Ma-Golden <125670894+Ma-Golden@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:10:43 +0100 Subject: [PATCH 1/5] fix friends list --- server/src/networking.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/networking.py b/server/src/networking.py index 27f4fbe..e2fb9cb 100644 --- a/server/src/networking.py +++ b/server/src/networking.py @@ -48,6 +48,10 @@ def db_handle_friend_request(self, sender: str, receiver: str): request_list = db.search_entry( table_name, receiver, "pending_friends" ) + + if request_list is None: + request_list = [] + if sender not in request_list: # print(f"Sender: {sender} Receiver: {receiver}") db.append_entry( From 2e6cbb98f570e6f4fe967c7d731411cff6df8392 Mon Sep 17 00:00:00 2001 From: Ma-Golden <125670894+Ma-Golden@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:12:51 +0100 Subject: [PATCH 2/5] nit --- server/src/sustainability.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/sustainability.py b/server/src/sustainability.py index 5d5e200..287a6f0 100644 --- a/server/src/sustainability.py +++ b/server/src/sustainability.py @@ -329,7 +329,6 @@ def calc_scores_from_route(self, journey_data): ) return transport_score - def update_user_sus_score(self, user: str) -> float: db = DataBase() db.connect_db() From 2bd7ed40a71c709df765b6ab148dff508019961b Mon Sep 17 00:00:00 2001 From: Ma-Golden <125670894+Ma-Golden@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:21:21 +0100 Subject: [PATCH 3/5] fix: init user values to non null --- server/src/signup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/signup.py b/server/src/signup.py index e4fa994..7922b7f 100644 --- a/server/src/signup.py +++ b/server/src/signup.py @@ -59,7 +59,7 @@ def signup_user(self, username: str, password: str): self.logger.info(f"User {username} available") - signup_data = {"username": username, "password": password} + signup_data = {"username": username, "password": password, "friends_list": [], "pending_friends": [], "sus_score": [], "ip": None, "sent_firneds": []} # noqa: E501 db.add_entry(table_name, signup_data) From b2ffc21e91e4786be978e01827cbb27a2053e937 Mon Sep 17 00:00:00 2001 From: kahern7 Date: Mon, 14 Apr 2025 10:36:17 +0100 Subject: [PATCH 4/5] update --- server/src/signup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/signup.py b/server/src/signup.py index 7922b7f..ed20d69 100644 --- a/server/src/signup.py +++ b/server/src/signup.py @@ -59,7 +59,7 @@ def signup_user(self, username: str, password: str): self.logger.info(f"User {username} available") - signup_data = {"username": username, "password": password, "friends_list": [], "pending_friends": [], "sus_score": [], "ip": None, "sent_firneds": []} # noqa: E501 + signup_data = {"username": username, "password": password, "friends_list": [], "pending_friends": [], "sus_score": 0, "ip": None, "sent_friends": []} # noqa: E501 db.add_entry(table_name, signup_data) From 7c6ff32c7dde13521cb8bc5e6acc3bd8bea5d223 Mon Sep 17 00:00:00 2001 From: kahern7 Date: Mon, 14 Apr 2025 10:45:36 +0100 Subject: [PATCH 5/5] signup works --- server/src/signup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/signup.py b/server/src/signup.py index ed20d69..e002351 100644 --- a/server/src/signup.py +++ b/server/src/signup.py @@ -59,7 +59,7 @@ def signup_user(self, username: str, password: str): self.logger.info(f"User {username} available") - signup_data = {"username": username, "password": password, "friends_list": [], "pending_friends": [], "sus_score": 0, "ip": None, "sent_friends": []} # noqa: E501 + signup_data = {"username": username, "password": password, "friends_list": {}, "pending_friends": {}, "sus_score": 0, "ip": None, "sent_friends": {}} # noqa: E501 db.add_entry(table_name, signup_data)