gives sb user supporter for change their names

ppy-sb · Aug 19, 2023 · 285a45a · 285a45a
1 parent dd78b0a
commit 285a45a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/src/server/backend/$base/server/user.ts b/src/server/backend/$base/server/user.ts
@@ -88,6 +88,19 @@ export abstract class UserProvider<Id> extends idTransformable {
     ]: UserProvider.ComposableProperties<Id>[K];
   }
   >
+  getFullWithSettings<
+    Excludes extends Partial<
+      Record<keyof UserProvider.ComposableProperties<Id>, boolean>
+    >,
+   _Scope extends Scope = Scope.Public,
+  >(query: {
+    handle: string
+    excludes?: Excludes
+    includeHidden?: boolean
+    scope: _Scope
+  }) {
+    return this.getFull(query)
+  }
 
   abstract changeSettings(
     user: { id: Id },

diff --git a/src/server/backend/[email protected]/server/user.ts b/src/server/backend/[email protected]/server/user.ts
@@ -9,7 +9,7 @@ import { toFullUser } from '~/server/backend/bancho.py/transforms'
 import { createUserQuery } from '~/server/backend/bancho.py/db-query'
 
 import type { Scope, UserEssential, UserOldName } from '~/def/user'
-import { UserStatus } from '~/def/user'
+import { UserPrivilege, UserStatus } from '~/def/user'
 
 import { type UserProvider as Base } from '$base/server'
 
@@ -18,10 +18,6 @@ const logger = Logger.child({ label: 'user' })
 export class UserProvider extends BanchoPyUser implements Base<Id> {
   sbDb = getPrismaClient()
 
-  constructor() {
-    super()
-  }
-
   async changeUserpage(
     user: UserEssential<number>,
     input: { profile: ArticleProvider.JSONContent }
@@ -92,7 +88,7 @@ export class UserProvider extends BanchoPyUser implements Base<Id> {
       privilege: includeHidden ? BanchoPyPrivilege.Any : undefined,
     }))
 
-    const fullUser = await toFullUser(user, this.config)
+    const fullUser = toFullUser(user, this.config)
     const profile = await this.sbDb.userpage.findFirst({
       where: {
         userId: user.id,
@@ -130,4 +126,15 @@ export class UserProvider extends BanchoPyUser implements Base<Id> {
 
     return returnValue
   }
+
+  async getFullWithSettings<
+  Excludes extends Partial<Record<keyof Base.ComposableProperties<Id>, boolean>>,
+  _Scope extends Scope = Scope.Public,
+  >(query: { handle: string; excludes?: Excludes; includeHidden?: boolean; scope: _Scope }) {
+    const fullUser = await this.getFull(query)
+    if (!fullUser.roles.includes(UserPrivilege.Supporter)) {
+      fullUser.roles.push(UserPrivilege.Supporter)
+    }
+    return fullUser
+  }
 }
diff --git a/src/server/trpc/routers/me.ts b/src/server/trpc/routers/me.ts
@@ -27,7 +27,7 @@ const relations = new UserRelationProvider()
 const session = new SessionProvider()
 export const router = _router({
   settings: pUser.query(async ({ ctx }) => {
-    return await users.getFull({
+    return await users.getFullWithSettings({
       handle: UserProvider.idToString(ctx.user.id),
       includeHidden: true,
       excludes: { statistics: true, relationships: true, secrets: false },

diff --git a/src/server/trpc/routers/user.ts b/src/server/trpc/routers/user.ts
@@ -43,7 +43,7 @@ export const router = _router({
     .query(async ({ input: { handle }, ctx }) => {
       const user = await userProvider.getFull({
         handle,
-        excludes: { relationships: true, secrets: true },
+        excludes: { relationships: true, secrets: true, email: true },
         includeHidden: true,
         scope: Scope.Public,
       })
@@ -54,20 +54,6 @@ export const router = _router({
       }
       return mapId(user, UserProvider.idToString)
     }),
-  full: p
-    .input(
-      object({
-        handle: zodHandle,
-      })
-    )
-    .query(async ({ input: { handle } }) => {
-      const user = await userProvider.getFull({
-        handle,
-        excludes: { email: true },
-        scope: Scope.Public,
-      })
-      return mapId(user, UserProvider.idToString)
-    }),
   best: p
     .input(
       object({