Rename lovers -> profiles

Author: MartinBraquet

backend/api/src/app.ts

@@ -9,7 +9,7 @@ import {log} from 'shared/monitoring/log'
 import {metrics} from 'shared/monitoring/metrics'
 import {banUser} from './ban-user'
 import {blockUser, unblockUser} from './block-user'
-import {getCompatibleLoversHandler} from './compatible-lovers'
+import {getCompatibleLoversHandler} from './compatible-profiles'
 import {createComment} from './create-comment'
 import {createCompatibilityQuestion} from './create-compatibility-question'
 import {createLover} from './create-lover'
@@ -31,7 +31,7 @@ import {removePinnedPhoto} from './remove-pinned-photo'
 import {report} from './report'
 import {searchLocation} from './search-location'
 import {searchNearCity} from './search-near-city'
-import {shipLovers} from './ship-lovers'
+import {shipLovers} from './ship-profiles'
 import {starLover} from './star-lover'
 import {updateLover} from './update-lover'
 import {updateMe} from './update-me'
@@ -142,7 +142,7 @@ const handlers: { [k in APIPath]: APIHandler<k> } = {
   'me/delete': deleteMe,
   'update-lover': updateLover,
   'like-lover': likeLover,
-  'ship-lovers': shipLovers,
+  'ship-profiles': shipLovers,
   'get-likes-and-ships': getLikesAndShips,
   'has-free-like': hasFreeLike,
   'star-lover': starLover,
@@ -153,7 +153,7 @@ const handlers: { [k in APIPath]: APIHandler<k> } = {
   'create-comment': createComment,
   'hide-comment': hideComment,
   'create-compatibility-question': createCompatibilityQuestion,
-  'compatible-lovers': getCompatibleLoversHandler,
+  'compatible-profiles': getCompatibleLoversHandler,
   'search-location': searchLocation,
   'search-near-city': searchNearCity,
   'create-private-user-message': createPrivateUserMessage,

backend/api/src/compatible-lovers.ts backend/api/src/compatible-profiles.tsbackend/api/src/compatible-lovers.ts renamed to backend/api/src/compatible-profiles.ts

@@ -9,7 +9,7 @@ import {
 import { log } from 'shared/utils'
 
 export const getCompatibleLoversHandler: APIHandler<
-  'compatible-lovers'
+  'compatible-profiles'
 > = async (props) => {
   return getCompatibleLovers(props.userId)
 }
@@ -25,17 +25,17 @@ export const getCompatibleLovers = async (userId: string) => {
 
   if (!lover) throw new APIError(404, 'Lover not found')
 
-  const lovers = await getGenderCompatibleLovers(lover)
+  const profiles = await getGenderCompatibleLovers(lover)
 
   const loverAnswers = await getCompatibilityAnswers([
     userId,
-    ...lovers.map((l) => l.user_id),
+    ...profiles.map((l) => l.user_id),
   ])
   log('got lover answers ' + loverAnswers.length)
 
   const answersByUserId = groupBy(loverAnswers, 'creator_id')
   const loverCompatibilityScores = Object.fromEntries(
-    lovers.map(
+    profiles.map(
       (l) =>
         [
           l.user_id,
@@ -48,7 +48,7 @@ export const getCompatibleLovers = async (userId: string) => {
   )
 
   const sortedCompatibleLovers = sortBy(
-    lovers,
+    profiles,
     (l) => loverCompatibilityScores[l.user_id].score
   ).reverse()
 

backend/api/src/create-lover.ts

@@ -12,7 +12,7 @@ export const createLover: APIHandler<'create-lover'> = async (body, auth) => {
   const pg = createSupabaseDirectClient()
 
   const { data: existingUser } = await tryCatch(
-    pg.oneOrNone<{ id: string }>('select id from lovers where user_id = $1', [
+    pg.oneOrNone<{ id: string }>('select id from profiles where user_id = $1', [
       auth.uid,
     ])
   )
@@ -31,7 +31,7 @@ export const createLover: APIHandler<'create-lover'> = async (body, auth) => {
   console.log('body', body)
 
   const { data, error } = await tryCatch(
-    insert(pg, 'lovers', { user_id: auth.uid, ...body })
+    insert(pg, 'profiles', { user_id: auth.uid, ...body })
   )
 
   if (error) {

backend/api/src/get-likes-and-ships.ts

@@ -22,11 +22,11 @@ export const getLikesAndShipsMain = async (userId: string) => {
     `
       select target_id, love_likes.created_time
       from love_likes
-      join lovers on lovers.user_id = love_likes.target_id
+      join profiles on profiles.user_id = love_likes.target_id
       join users on users.id = love_likes.target_id
       where creator_id = $1
         and looking_for_matches
-        and lovers.pinned_url is not null
+        and profiles.pinned_url is not null
         and (data->>'isBannedFromPosting' != 'true' or data->>'isBannedFromPosting' is null)
       order by created_time desc
     `,
@@ -44,11 +44,11 @@ export const getLikesAndShipsMain = async (userId: string) => {
     `
       select creator_id, love_likes.created_time
       from love_likes
-      join lovers on lovers.user_id = love_likes.creator_id
+      join profiles on profiles.user_id = love_likes.creator_id
       join users on users.id = love_likes.creator_id
       where target_id = $1
         and looking_for_matches
-        and lovers.pinned_url is not null
+        and profiles.pinned_url is not null
         and (data->>'isBannedFromPosting' != 'true' or data->>'isBannedFromPosting' is null)
       order by created_time desc
     `,
@@ -71,11 +71,11 @@ export const getLikesAndShipsMain = async (userId: string) => {
       target1_id, target2_id, creator_id, love_ships.created_time,
       target1_id as target_id
     from love_ships
-    join lovers on lovers.user_id = love_ships.target1_id
+    join profiles on profiles.user_id = love_ships.target1_id
     join users on users.id = love_ships.target1_id
     where target2_id = $1
-      and lovers.looking_for_matches
-      and lovers.pinned_url is not null
+      and profiles.looking_for_matches
+      and profiles.pinned_url is not null
       and (users.data->>'isBannedFromPosting' != 'true' or users.data->>'isBannedFromPosting' is null)
 
     union all
@@ -84,11 +84,11 @@ export const getLikesAndShipsMain = async (userId: string) => {
       target1_id, target2_id, creator_id, love_ships.created_time,
       target2_id as target_id
     from love_ships
-    join lovers on lovers.user_id = love_ships.target2_id
+    join profiles on profiles.user_id = love_ships.target2_id
     join users on users.id = love_ships.target2_id
     where target1_id = $1
-      and lovers.looking_for_matches
-      and lovers.pinned_url is not null
+      and profiles.looking_for_matches
+      and profiles.pinned_url is not null
       and (users.data->>'isBannedFromPosting' != 'true' or users.data->>'isBannedFromPosting' is null)
     `,
     [userId],

backend/api/src/get-profiles.ts

@@ -2,7 +2,7 @@ import {type APIHandler} from 'api/helpers/endpoint'
 import {convertRow} from 'shared/love/supabase'
 import {createSupabaseDirectClient} from 'shared/supabase/init'
 import {from, join, limit, orderBy, renderSql, select, where,} from 'shared/supabase/sql-builder'
-import {getCompatibleLovers} from 'api/compatible-lovers'
+import {getCompatibleLovers} from 'api/compatible-profiles'
 import {intersection} from 'lodash'
 import {MAX_INT, MIN_INT} from "common/constants";
 
@@ -60,7 +60,7 @@ export const loadProfiles = async (props: profileQueryType) => {
     }
 
     const {compatibleLovers} = await getCompatibleLovers(compatibleWithUserId)
-    const lovers = compatibleLovers.filter(
+    const profiles = compatibleLovers.filter(
       (l) =>
         (!name || l.user.name.toLowerCase().includes(name.toLowerCase())) &&
         (!genders || genders.includes(l.gender)) &&
@@ -85,19 +85,19 @@ export const loadProfiles = async (props: profileQueryType) => {
     )
 
     const cursor = after
-      ? lovers.findIndex((l) => l.id.toString() === after) + 1
+      ? profiles.findIndex((l) => l.id.toString() === after) + 1
       : 0
     console.log(cursor)
 
-    if (limitParam) return lovers.slice(cursor, cursor + limitParam)
+    if (limitParam) return profiles.slice(cursor, cursor + limitParam)
 
-    return lovers
+    return profiles
   }
 
   const query = renderSql(
-    select('lovers.*, name, username, users.data as user'),
-    from('lovers'),
-    join('users on users.id = lovers.user_id'),
+    select('profiles.*, name, username, users.data as user'),
+    from('profiles'),
+    join('users on users.id = profiles.user_id'),
     where('looking_for_matches = true'),
     // where(`pinned_url is not null and pinned_url != ''`),
     where(
@@ -149,7 +149,7 @@ export const loadProfiles = async (props: profileQueryType) => {
     orderBy(`${orderByParam} desc`),
     after &&
     where(
-      `lovers.${orderByParam} < (select lovers.${orderByParam} from lovers where id = $(after))`,
+      `profiles.${orderByParam} < (select profiles.${orderByParam} from profiles where id = $(after))`,
       {after}
     ),
 
@@ -165,9 +165,9 @@ export const loadProfiles = async (props: profileQueryType) => {
 
 export const getProfiles: APIHandler<'get-profiles'> = async (props, _auth) => {
   try {
-    const lovers = await loadProfiles(props)
-    return {status: 'success', lovers: lovers}
+    const profiles = await loadProfiles(props)
+    return {status: 'success', profiles: profiles}
   } catch {
-    return {status: 'fail', lovers: []}
+    return {status: 'fail', profiles: []}
   }
 }

backend/api/src/remove-pinned-photo.ts

@@ -17,7 +17,7 @@ export const removePinnedPhoto: APIHandler<'remove-pinned-photo'> = async (
 
   const pg = createSupabaseDirectClient()
   const { error } = await tryCatch(
-    pg.none('update lovers set pinned_url = null where user_id = $1', [userId])
+    pg.none('update profiles set pinned_url = null where user_id = $1', [userId])
   )
 
   if (error) {

backend/api/src/ship-lovers.ts backend/api/src/ship-profiles.tsbackend/api/src/ship-lovers.ts renamed to backend/api/src/ship-profiles.ts

@@ -5,7 +5,7 @@ import { log } from 'shared/utils'
 import { tryCatch } from 'common/util/try-catch'
 import { insert } from 'shared/supabase/utils'
 
-export const shipLovers: APIHandler<'ship-lovers'> = async (props, auth) => {
+export const shipLovers: APIHandler<'ship-profiles'> = async (props, auth) => {
   const { targetUserId1, targetUserId2, remove } = props
   const creatorId = auth.uid
 

backend/api/src/update-lover.ts

@@ -15,7 +15,7 @@ export const updateLover: APIHandler<'update-lover'> = async (
   const pg = createSupabaseDirectClient()
 
   const { data: existingLover } = await tryCatch(
-    pg.oneOrNone<Row<'lovers'>>('select * from lovers where user_id = $1', [
+    pg.oneOrNone<Row<'profiles'>>('select * from profiles where user_id = $1', [
       auth.uid,
     ])
   )
@@ -33,7 +33,7 @@ export const updateLover: APIHandler<'update-lover'> = async (
   }
 
   const { data, error } = await tryCatch(
-    update(pg, 'lovers', 'user_id', { user_id: auth.uid, ...parsedBody })
+    update(pg, 'profiles', 'user_id', { user_id: auth.uid, ...parsedBody })
   )
 
   if (error) {

backend/email/emails/functions/mock.ts

@@ -33,7 +33,6 @@ export const sinclairLover: LoverRow = {
   created_time: '2023-10-27T00:41:59.851776+00:00',
   last_online_time: '2024-05-17T02:11:48.83+00:00',
   last_modification_time: '2024-05-17T02:11:48.83+00:00',
-  bio_text: 'Hello',
   city: 'San Francisco',
   gender: 'trans-female',
   pref_gender: ['female', 'trans-female'],
@@ -132,7 +131,6 @@ export const jamesLover: LoverRow = {
   created_time: '2023-10-21T21:18:26.691211+00:00',
   last_online_time: '2024-07-06T17:29:16.833+00:00',
   last_modification_time: '2024-05-17T02:11:48.83+00:00',
-  bio_text: 'Hello',
   city: 'San Francisco',
   gender: 'male',
   pref_gender: ['female'],

backend/scripts/2025-04-23-migrate-social-links.ts

@@ -8,11 +8,11 @@ import { chunk } from 'lodash'
 runScript(async ({ pg }) => {
   const directClient = createSupabaseDirectClient()
 
-  // Get all users and their corresponding lovers
+  // Get all users and their corresponding profiles
   const users = await directClient.manyOrNone(`
     select u.id, u.data, l.twitter
     from users u
-    left join lovers l on l.user_id = u.id
+    left join profiles l on l.user_id = u.id
   `)
 
   log('Found', users.length, 'users to migrate')