mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-25 17:53:48 +02:00
notifications v2 table
This commit is contained in:
@@ -29,7 +29,8 @@ import {
|
||||
useLocationStore,
|
||||
useUiStore,
|
||||
useUserStore,
|
||||
useWorldStore
|
||||
useWorldStore,
|
||||
useNotificationStore
|
||||
} from '../../stores';
|
||||
|
||||
import Emoji from '../../components/Emoji.vue';
|
||||
@@ -61,6 +62,7 @@ export const createColumns = ({
|
||||
const { currentUser } = storeToRefs(useUserStore());
|
||||
const { lastLocation } = storeToRefs(useLocationStore());
|
||||
const { isGameRunning } = storeToRefs(useGameStore());
|
||||
const { isNotificationExpired } = useNotificationStore();
|
||||
|
||||
const canInvite = () => {
|
||||
const location = lastLocation.value?.location;
|
||||
@@ -385,7 +387,8 @@ export const createColumns = ({
|
||||
cell: ({ row }) => {
|
||||
const original = row.original;
|
||||
if (original.type === 'boop') {
|
||||
const imageUrl = original.details?.imageUrl;
|
||||
const imageUrl =
|
||||
original.details?.imageUrl || original.imageUrl;
|
||||
if (!imageUrl || imageUrl.startsWith('default_')) {
|
||||
return null;
|
||||
}
|
||||
@@ -455,7 +458,28 @@ export const createColumns = ({
|
||||
/>
|
||||
</div>
|
||||
) : null}
|
||||
{original.message && original.title ? (
|
||||
<TooltipWrapper
|
||||
content={`${original.title}, ${original.message}`}
|
||||
delayDuration={500}
|
||||
>
|
||||
<span class="block w-full min-w-0 truncate">
|
||||
{`${original.title}, ${original.message}`}
|
||||
</span>
|
||||
</TooltipWrapper>
|
||||
) : null}
|
||||
{!original.message && original.title ? (
|
||||
<TooltipWrapper
|
||||
content={original.title}
|
||||
delayDuration={500}
|
||||
>
|
||||
<span class="block w-full min-w-0 truncate">
|
||||
{original.title}
|
||||
</span>
|
||||
</TooltipWrapper>
|
||||
) : null}
|
||||
{original.message &&
|
||||
!original.title &&
|
||||
original.message !==
|
||||
`This is a generated invite to ${original.details?.worldName}` ? (
|
||||
<TooltipWrapper
|
||||
@@ -529,16 +553,12 @@ export const createColumns = ({
|
||||
!original.link?.startsWith('economy.');
|
||||
const showDeleteLog =
|
||||
original.type !== 'friendRequest' &&
|
||||
original.type !== 'ignoredFriendRequest' &&
|
||||
!original.type?.includes('group.') &&
|
||||
!original.type?.includes('moderation.') &&
|
||||
!original.type?.includes('instance.') &&
|
||||
!original.link?.startsWith('economy.');
|
||||
original.type !== 'ignoredFriendRequest';
|
||||
|
||||
return (
|
||||
<div class="flex items-center justify-end gap-2">
|
||||
{original.senderUserId !== currentUser.value?.id &&
|
||||
!original.$isExpired ? (
|
||||
!isNotificationExpired(original) ? (
|
||||
<span class="inline-flex items-center gap-2">
|
||||
{original.type === 'friendRequest' ? (
|
||||
<Tooltip>
|
||||
|
||||
Reference in New Issue
Block a user