fix: username badge

ONEARMY · Nov 26, 2024 · 922a06c · 922a06c
1 parent 1025b86
commit 922a06c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/functions/src/supabaseSync/index.ts b/functions/src/supabaseSync/index.ts
@@ -61,13 +61,18 @@ async function insertOrUpdateProfile(
   const { client } = createSupabaseServerClient()
   const user = docSnapshot.data() as IUser
 
-  const { data } = await client
+  const profileRequest = await client
     .from('profiles')
     .select()
     .eq('firebase_auth_id', user._authID)
     .single()
 
-  if (data) {
+  if (profileRequest.error) {
+    functions.logger.log(profileRequest.error)
+    return
+  }
+
+  if (profileRequest.data) {
     // Update
     const { error } = await client
       .from('profiles')
@@ -81,7 +86,7 @@ async function insertOrUpdateProfile(
       .eq('firebase_auth_id', user._authID)
 
     if (error) {
-      console.log({ ...error })
+      functions.logger.log({ ...error })
     }
   } else {
     // Insert
@@ -99,7 +104,7 @@ async function insertOrUpdateProfile(
       .eq('firebase_auth_id', user._authID)
 
     if (error) {
-      console.log({ ...error })
+      functions.logger.log({ ...error })
     }
   }
 }

diff --git a/src/models/comment.model.ts b/src/models/comment.model.ts
@@ -2,6 +2,7 @@ export class DBCommentAuthor {
   id: number
   firebase_auth_id: string
   display_name: string
+  username: string
   photo_url: string
   country: string
   is_verified: boolean
@@ -14,6 +15,7 @@ export class DBCommentAuthor {
     return new DBCommentAuthor({
       id: obj.id,
       display_name: obj.name,
+      username: obj.username,
       firebase_auth_id: obj.firebaseAuthId,
       photo_url: obj.photoUrl,
       is_verified: obj.isVerified,
@@ -25,6 +27,7 @@ export class DBCommentAuthor {
 export class CommentAuthor {
   id: number
   name: string
+  username: string
   firebaseAuthId: string
   photoUrl: string
   country: string
@@ -38,6 +41,7 @@ export class CommentAuthor {
     return new CommentAuthor({
       id: obj.id,
       name: obj.display_name,
+      username: obj.username,
       firebaseAuthId: obj.firebase_auth_id,
       photoUrl: obj.photo_url,
       isVerified: obj.is_verified,

diff --git a/src/pages/common/CommentsV2/CommentItemV2.tsx b/src/pages/common/CommentsV2/CommentItemV2.tsx
@@ -120,7 +120,7 @@ export const CommentItemV2 = observer(
                   >
                     <Username
                       user={{
-                        userName: comment.createdBy?.name || '',
+                        userName: comment.createdBy?.username || '',
                         countryCode: comment.createdBy?.country,
                         isVerified: comment.createdBy?.isVerified,
                         // TODO: isSupporter

diff --git a/src/pages/common/CommentsV2/CommentReply.tsx b/src/pages/common/CommentsV2/CommentReply.tsx
@@ -110,7 +110,7 @@ export const CommentReply = observer(
                     >
                       <Username
                         user={{
-                          userName: comment.createdBy?.name || '',
+                          userName: comment.createdBy?.username || '',
                           countryCode: comment.createdBy?.country,
                           isVerified: comment.createdBy?.isVerified,
                           // TODO: isSupporter

diff --git a/src/routes/api.discussions.$sourceId.comments.ts b/src/routes/api.discussions.$sourceId.comments.ts
@@ -31,7 +31,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
       source_type,
       parent_id,
       created_by,
-      profiles(id, firebase_auth_id, display_name, is_verified, photo_url, country)
+      profiles(id, firebase_auth_id, display_name, username, is_verified, photo_url, country)
     `,
     )
     .eq(sourceParam, sourceId)
@@ -140,7 +140,7 @@ export async function action({ params, request }: LoaderFunctionArgs) {
       parent_id,
       source_type,
       created_by,
-      profiles(id, firebase_auth_id, display_name, is_verified, photo_url, country)
+      profiles(id, firebase_auth_id, display_name, username, is_verified, photo_url, country)
     `,
     )
     .single()

diff --git a/supabase/config.toml b/supabase/config.toml
@@ -199,7 +199,7 @@ verify_enabled = true
 # Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`,
 # `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin_oidc`, `notion`, `twitch`,
 # `twitter`, `slack`, `spotify`, `workos`, `zoom`.
-[auth.external.apple]
+# [auth.external.apple]
 enabled = false
 client_id = ""
 # DO NOT commit your OAuth provider secret to git. Use environment variable substitution instead: