From ba826f63b4f73a9b08eff3ba7c96ad96fffa0078 Mon Sep 17 00:00:00 2001 From: TzeMingHo Date: Thu, 2 Jul 2026 14:50:07 +0100 Subject: [PATCH] implemented a button to unfollow user --- backend/data/follows.py | 10 ++++++++++ backend/endpoints.py | 18 +++++++++++++++++- backend/main.py | 2 ++ front-end/components/profile.mjs | 19 ++++++++++++++++++- front-end/index.html | 3 +++ 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/backend/data/follows.py b/backend/data/follows.py index a4b6314e..ec894bbf 100644 --- a/backend/data/follows.py +++ b/backend/data/follows.py @@ -20,6 +20,16 @@ def follow(follower: User, followee: User): # Already following - treat as idempotent request. pass +def unfollow(follower: User, unfollowee: User): + with db_cursor() as cur: + cur.execute( + "DELETE FROM follows WHERE follower = %(follower_id)s AND followee = %(unfollowee_id)s", + dict( + follower_id=follower.id, + unfollowee_id=unfollowee.id, + ), + ) + def get_followed_usernames(follower: User) -> List[str]: """get_followed_usernames returns a list of usernames followee follows.""" diff --git a/backend/endpoints.py b/backend/endpoints.py index 0e177a07..e8fc2620 100644 --- a/backend/endpoints.py +++ b/backend/endpoints.py @@ -1,6 +1,6 @@ from typing import Dict, Union from data import blooms -from data.follows import follow, get_followed_usernames, get_inverse_followed_usernames +from data.follows import follow, unfollow, get_followed_usernames, get_inverse_followed_usernames from data.users import ( UserRegistrationError, get_suggested_follows, @@ -149,6 +149,22 @@ def do_follow(): } ) +@jwt_required() +def do_unfollow(username): + unfollowee = get_user(username) + if unfollowee is None: + return make_response( + jsonify( + {"success": False, "message": f"Cannot unfollow {username} - User {username} not found"} + ), + 404, + ) + current_user = get_current_user() + unfollow(current_user, unfollowee) + return jsonify({ + "success": True + }) + @jwt_required() def send_bloom(): diff --git a/backend/main.py b/backend/main.py index 7ba155fa..9bb96217 100644 --- a/backend/main.py +++ b/backend/main.py @@ -4,6 +4,7 @@ from data.users import lookup_user from endpoints import ( do_follow, + do_unfollow, get_bloom, hashtag, home_timeline, @@ -54,6 +55,7 @@ def main(): app.add_url_rule("/profile", view_func=self_profile) app.add_url_rule("/profile/", view_func=other_profile) app.add_url_rule("/follow", methods=["POST"], view_func=do_follow) + app.add_url_rule("/unfollow/", methods=["POST"], view_func=do_unfollow) app.add_url_rule("/suggested-follows/", view_func=suggested_follows) app.add_url_rule("/bloom", methods=["POST"], view_func=send_bloom) diff --git a/front-end/components/profile.mjs b/front-end/components/profile.mjs index ec4f2009..03422eb4 100644 --- a/front-end/components/profile.mjs +++ b/front-end/components/profile.mjs @@ -19,6 +19,7 @@ function createProfile(template, {profileData, whoToFollow, isLoggedIn}) { ); const followerCountEl = profileElement.querySelector("[data-follower-count]"); const followButtonEl = profileElement.querySelector("[data-action='follow']"); + const unfollowButtonEl = profileElement.querySelector("[data-action=unfollow]"); const whoToFollowContainer = profileElement.querySelector(".profile__who-to-follow"); // Populate with data usernameEl.querySelector("h2").textContent = profileData.username || ""; @@ -29,8 +30,14 @@ function createProfile(template, {profileData, whoToFollow, isLoggedIn}) { followButtonEl.setAttribute("data-username", profileData.username || ""); followButtonEl.hidden = profileData.is_self || profileData.is_following; followButtonEl.addEventListener("click", handleFollow); + + unfollowButtonEl.setAttribute("data-username", profileData.username || ""); + unfollowButtonEl.hidden = profileData.is_self || !profileData.is_following; + unfollowButtonEl.addEventListener("click", handleUnfollow); + if (!isLoggedIn) { followButtonEl.style.display = "none"; + unfollowButtonEl.style.display = "none"; } if (whoToFollow.length > 0) { @@ -66,4 +73,14 @@ async function handleFollow(event) { await apiService.getWhoToFollow(); } -export {createProfile, handleFollow}; +async function handleUnfollow(event) { + const button = event.target; + const username = button.getAttribute("data-username"); + if (!username) return; + + console.log(username); + await apiService.unfollowUser(username); + await apiService.getWhoToFollow(); +} + +export {createProfile, handleFollow, handleUnfollow}; diff --git a/front-end/index.html b/front-end/index.html index 89d6b130..7c7ff625 100644 --- a/front-end/index.html +++ b/front-end/index.html @@ -187,6 +187,9 @@

Create your account

+
+ +

Who to follow