Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions backend/data/follows.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ def follow(follower: User, followee: User):
# Already following - treat as idempotent request.
pass

def unfollow(follower: User, followee: User):
with db_cursor() as cur:
cur.execute(
"""
DELETE FROM follows
WHERE follower = %(follower_id)s
AND followee = %(followee_id)s
""",
dict(
follower_id=follower.id,
followee_id=followee.id,
),
)


def get_followed_usernames(follower: User) -> List[str]:
"""get_followed_usernames returns a list of usernames followee follows."""
Expand Down
25 changes: 24 additions & 1 deletion backend/endpoints.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
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,
Expand Down Expand Up @@ -150,6 +155,24 @@ def do_follow():
)


@jwt_required()
def do_unfollow(profile_username):
current_user = get_current_user()

follow_user = get_user(profile_username)
if follow_user is None:
return make_response(
(f"Cannot unfollow {profile_username} - user does not exist", 404)
)

unfollow(current_user, follow_user)

return jsonify(
{
"success": True,
}
)

@jwt_required()
def send_bloom():
type_check_error = verify_request_fields({"content": str})
Expand Down
6 changes: 6 additions & 0 deletions backend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from data.users import lookup_user
from endpoints import (
do_follow,
do_unfollow,
get_bloom,
hashtag,
home_timeline,
Expand Down Expand Up @@ -54,6 +55,11 @@ def main():
app.add_url_rule("/profile", view_func=self_profile)
app.add_url_rule("/profile/<profile_username>", view_func=other_profile)
app.add_url_rule("/follow", methods=["POST"], view_func=do_follow)
app.add_url_rule(
"/unfollow/<profile_username>",
methods=["POST"],
view_func=do_unfollow,
)
app.add_url_rule("/suggested-follows/<limit_str>", view_func=suggested_follows)

app.add_url_rule("/bloom", methods=["POST"], view_func=send_bloom)
Expand Down
97 changes: 54 additions & 43 deletions front-end/components/profile.mjs
Original file line number Diff line number Diff line change
@@ -1,69 +1,80 @@
import {apiService} from "../index.mjs";
import { apiService } from '../index.mjs'

/**
* Create a profile component
* @param {string} template - The ID of the template to clone
* @param {Object} profileData - The profile data to display
* @returns {DocumentFragment} - The profile UI
*/
function createProfile(template, {profileData, whoToFollow, isLoggedIn}) {
if (!template || !profileData) return;
const profileElement = document
.getElementById(template)
.content.cloneNode(true);
function createProfile(template, { profileData, whoToFollow, isLoggedIn }) {
if (!template || !profileData) return
const profileElement = document.getElementById(template).content.cloneNode(true)

const usernameEl = profileElement.querySelector("[data-username]");
const bloomCountEl = profileElement.querySelector("[data-bloom-count]");
const followingCountEl = profileElement.querySelector(
"[data-following-count]"
);
const followerCountEl = profileElement.querySelector("[data-follower-count]");
const followButtonEl = profileElement.querySelector("[data-action='follow']");
const whoToFollowContainer = profileElement.querySelector(".profile__who-to-follow");
const usernameEl = profileElement.querySelector('[data-username]')
const bloomCountEl = profileElement.querySelector('[data-bloom-count]')
const followingCountEl = profileElement.querySelector('[data-following-count]')
const followerCountEl = profileElement.querySelector('[data-follower-count]')
const followButtonEl = profileElement.querySelector("[data-action='follow']")
const whoToFollowContainer = profileElement.querySelector('.profile__who-to-follow')
// Populate with data
usernameEl.querySelector("h2").textContent = profileData.username || "";
usernameEl.setAttribute("href", `/profile/${profileData.username}`);
bloomCountEl.textContent = profileData.total_blooms || 0;
followerCountEl.textContent = profileData.followers?.length || 0;
followingCountEl.textContent = profileData.follows?.length || 0;
followButtonEl.setAttribute("data-username", profileData.username || "");
followButtonEl.hidden = profileData.is_self || profileData.is_following;
followButtonEl.addEventListener("click", handleFollow);
if (!isLoggedIn) {
followButtonEl.style.display = "none";
usernameEl.querySelector('h2').textContent = profileData.username || ''
usernameEl.setAttribute('href', `/profile/${profileData.username}`)
bloomCountEl.textContent = profileData.total_blooms || 0
followerCountEl.textContent = profileData.followers?.length || 0
followingCountEl.textContent = profileData.follows?.length || 0
followButtonEl.setAttribute('data-username', profileData.username || '')
if (profileData.is_following) {
followButtonEl.textContent = 'Unfollow'
} else {
followButtonEl.textContent = 'Follow'
}
followButtonEl.hidden = profileData.is_self
if (profileData.is_following) {
followButtonEl.addEventListener('click', handleUnfollow)
} else {
followButtonEl.addEventListener('click', handleFollow)
}

if (whoToFollow.length > 0) {
const whoToFollowList = whoToFollowContainer.querySelector("[data-who-to-follow]");
const whoToFollowTemplate = document.querySelector("#who-to-follow-chip");
const whoToFollowList = whoToFollowContainer.querySelector('[data-who-to-follow]')
const whoToFollowTemplate = document.querySelector('#who-to-follow-chip')
for (const userToFollow of whoToFollow) {
const wtfElement = whoToFollowTemplate.content.cloneNode(true);
const usernameLink = wtfElement.querySelector("a[data-username]");
usernameLink.innerText = userToFollow.username;
usernameLink.setAttribute("href", `/profile/${userToFollow.username}`);
const followButton = wtfElement.querySelector("button");
followButton.setAttribute("data-username", userToFollow.username);
followButton.addEventListener("click", handleFollow);
const wtfElement = whoToFollowTemplate.content.cloneNode(true)
const usernameLink = wtfElement.querySelector('a[data-username]')
usernameLink.innerText = userToFollow.username
usernameLink.setAttribute('href', `/profile/${userToFollow.username}`)
const followButton = wtfElement.querySelector('button')
followButton.setAttribute('data-username', userToFollow.username)
followButton.addEventListener('click', handleFollow)
if (!isLoggedIn) {
followButton.style.display = "none";
followButton.style.display = 'none'
}

whoToFollowList.appendChild(wtfElement);
whoToFollowList.appendChild(wtfElement)
}
} else {
whoToFollowContainer.innerText = "";
whoToFollowContainer.innerText = ''
}

return profileElement;
return profileElement
}

async function handleFollow(event) {
const button = event.target;
const username = button.getAttribute("data-username");
if (!username) return;
const button = event.target
const username = button.getAttribute('data-username')
if (!username) return

await apiService.followUser(username)
await apiService.getWhoToFollow()
}

async function handleUnfollow(event) {
const button = event.target
const username = button.getAttribute('data-username')
if (!username) return

await apiService.followUser(username);
await apiService.getWhoToFollow();
await apiService.unfollowUser(username)
await apiService.getWhoToFollow()
}

export {createProfile, handleFollow};
export { createProfile, handleFollow, handleUnfollow }