Merge pull request #605 from 1ifeworld/jawn/edits_for_type

types
1ifeworld · Apr 30, 2024 · 71dd24c · 71dd24c
2 parents 95c1de9 + 4878d0a
commit 71dd24c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/apps/site/components/client/ItemDropdown.tsx b/apps/site/components/client/ItemDropdown.tsx
@@ -40,12 +40,12 @@ function isAdminOrAdder({
   channelRoleData,
   itemAddedBy,
 }: {
-  userRid: bigint
+  userRid: string
   channelRoleData: ChannelRoles[]
   itemAddedBy: bigint
 }) {
   // if targetRid was itemAdder, they have remove access
-  if (userRid === itemAddedBy) {
+  if (BigInt(userRid) === itemAddedBy) {
     return true
   }
   // if targetRid wasnt itemAdder, loop through channel roles
@@ -88,7 +88,7 @@ export function ItemDropdown({
     !add?.addedById
       ? false
       : isAdminOrAdder({
-          userRid: targetUserId,
+          userRid: targetUserId.toString(),
           channelRoleData: channel.roles.items,
           itemAddedBy: add.addedById,
         })

diff --git a/apps/site/components/client/ItemDropzone.tsx b/apps/site/components/client/ItemDropzone.tsx
@@ -26,7 +26,7 @@ function hasAddAccess({
   targetRid,
 }: {
   roleData: ChannelRoles[]
-  targetRid: bigint
+  targetRid: string
 }) {
   for (let i = 0; i < roleData.length; ++i) {
     const rid = roleData[i].rid
@@ -53,7 +53,7 @@ export function ItemDropzone({ channel }: { channel: Channel }) {
       ? false
       : hasAddAccess({
           roleData: channel.roles.items,
-          targetRid: targetUserId,
+          targetRid: targetUserId.toString(),
         })
 
   const onDrop = async (acceptedFiles: File[]) => {

diff --git a/apps/site/context/UserContext.tsx b/apps/site/context/UserContext.tsx
@@ -50,7 +50,7 @@ export function UserContextComponent({ children }: { children: ReactNode }) {
 
     if (!data) return
 
-    setUserId(data.records.id)
+    setUserId(BigInt(data.records.id))
     setUsername(data.records.name)
 
     const userChannels = await getUserChannels(data.records.id)