mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-06 22:46:06 +02:00
fix: Auto Accept Invite Requests and adjust text
This commit is contained in:
@@ -788,7 +788,7 @@
|
|||||||
},
|
},
|
||||||
"favorites": {
|
"favorites": {
|
||||||
"header": "Favorite Groups Filter",
|
"header": "Favorite Groups Filter",
|
||||||
"header_tooltip": "Choose which favorite groups are treated as VIP for filtering in Feed, Game Log, Notifications, and VR Overlay",
|
"header_tooltip": "When the favorites filter is enabled on Feed, Game Log, Notifications Page, or VR Overlay, only entries from the selected groups will be shown",
|
||||||
"group_placeholder": "Select Groups"
|
"group_placeholder": "Select Groups"
|
||||||
},
|
},
|
||||||
"logging": {
|
"logging": {
|
||||||
@@ -813,7 +813,8 @@
|
|||||||
"auto_invite_request_accept": "Auto Accept Invite Requests",
|
"auto_invite_request_accept": "Auto Accept Invite Requests",
|
||||||
"auto_invite_request_accept_tooltip": "Automatically accept invite requests from favorite friends",
|
"auto_invite_request_accept_tooltip": "Automatically accept invite requests from favorite friends",
|
||||||
"auto_invite_request_accept_favs": "All Favorites",
|
"auto_invite_request_accept_favs": "All Favorites",
|
||||||
"auto_invite_request_accept_selected_favs": "VRCX Favorites",
|
"auto_invite_request_accept_favs_hint": "Includes local friend favorite groups",
|
||||||
|
"auto_invite_request_accept_selected_favs": "Custom Favorite Groups",
|
||||||
"change_status_description": "Override Status Description",
|
"change_status_description": "Override Status Description",
|
||||||
"status_description_placeholder": "Status description (max 32 characters)",
|
"status_description_placeholder": "Status description (max 32 characters)",
|
||||||
"auto_change_status_groups": "Only count friends from",
|
"auto_change_status_groups": "Only count friends from",
|
||||||
@@ -971,7 +972,7 @@
|
|||||||
"header": "Notifications",
|
"header": "Notifications",
|
||||||
"layout": "Notification View",
|
"layout": "Notification View",
|
||||||
"layout_notification_center": "Notification Center",
|
"layout_notification_center": "Notification Center",
|
||||||
"layout_table": "Notifications Tab",
|
"layout_table": "Notifications Page",
|
||||||
"notification_filter": "Notification Filters",
|
"notification_filter": "Notification Filters",
|
||||||
"test_notification": "Send Test Notification",
|
"test_notification": "Send Test Notification",
|
||||||
"test_message": "Test notification.",
|
"test_message": "Test notification.",
|
||||||
|
|||||||
@@ -304,7 +304,8 @@ export const useNotificationStore = defineStore('Notification', () => {
|
|||||||
generalSettingsStore.autoAcceptInviteRequests === 'All Favorites' &&
|
generalSettingsStore.autoAcceptInviteRequests === 'All Favorites' &&
|
||||||
!favoriteStore.state.favoriteFriends_.some(
|
!favoriteStore.state.favoriteFriends_.some(
|
||||||
(x) => x.id === ref.senderUserId
|
(x) => x.id === ref.senderUserId
|
||||||
)
|
) &&
|
||||||
|
!favoriteStore.isInAnyLocalFriendGroup(ref.senderUserId)
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -321,8 +322,8 @@ export const useNotificationStore = defineStore('Notification', () => {
|
|||||||
if (groupKey.startsWith('local:')) {
|
if (groupKey.startsWith('local:')) {
|
||||||
const localGroup = groupKey.slice(6);
|
const localGroup = groupKey.slice(6);
|
||||||
const localFavs =
|
const localFavs =
|
||||||
favoriteStore.localFriendFavorites.get(localGroup);
|
favoriteStore.localFriendFavorites[localGroup];
|
||||||
if (localFavs && localFavs.has(ref.senderUserId)) {
|
if (localFavs && localFavs.includes(ref.senderUserId)) {
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,21 +27,15 @@
|
|||||||
</SettingsItem>
|
</SettingsItem>
|
||||||
</SettingsGroup>
|
</SettingsGroup>
|
||||||
|
|
||||||
<SettingsGroup>
|
<SettingsGroup :title="t('view.settings.social.favorites.header')">
|
||||||
<template #description>
|
<SettingsItem
|
||||||
<div class="flex items-center gap-1.5">
|
:label="t('view.settings.general.favorites.header')"
|
||||||
<span class="text-base font-semibold text-foreground">{{ t('view.settings.general.favorites.header') }}</span>
|
:description="t('view.settings.general.favorites.header_tooltip')">
|
||||||
<TooltipWrapper side="top" :content="t('view.settings.general.favorites.header_tooltip')">
|
|
||||||
<Info class="size-3 text-muted-foreground cursor-help" />
|
|
||||||
</TooltipWrapper>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<Select
|
<Select
|
||||||
:model-value="localFavoriteFriendsGroups"
|
:model-value="localFavoriteFriendsGroups"
|
||||||
multiple
|
multiple
|
||||||
@update:modelValue="setLocalFavoriteFriendsGroups">
|
@update:modelValue="setLocalFavoriteFriendsGroups">
|
||||||
<SelectTrigger>
|
<SelectTrigger class="w-48">
|
||||||
<SelectValue :placeholder="t('view.settings.general.favorites.group_placeholder')" />
|
<SelectValue :placeholder="t('view.settings.general.favorites.group_placeholder')" />
|
||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
@@ -63,13 +57,14 @@
|
|||||||
</template>
|
</template>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
|
</SettingsItem>
|
||||||
</SettingsGroup>
|
</SettingsGroup>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { Switch } from '@/components/ui/switch';
|
import { Switch } from '@/components/ui/switch';
|
||||||
import { Info } from 'lucide-vue-next';
|
|
||||||
import {
|
import {
|
||||||
NumberField,
|
NumberField,
|
||||||
NumberFieldContent,
|
NumberFieldContent,
|
||||||
@@ -93,7 +88,7 @@
|
|||||||
|
|
||||||
import SettingsGroup from '../SettingsGroup.vue';
|
import SettingsGroup from '../SettingsGroup.vue';
|
||||||
import SettingsItem from '../SettingsItem.vue';
|
import SettingsItem from '../SettingsItem.vue';
|
||||||
import { TooltipWrapper } from '@/components/ui/tooltip';
|
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
|||||||
@@ -192,19 +192,23 @@
|
|||||||
@change="handleAutoAcceptInviteSwitch" />
|
@change="handleAutoAcceptInviteSwitch" />
|
||||||
|
|
||||||
<Field>
|
<Field>
|
||||||
<FieldLabel>{{ t('view.settings.general.automation.auto_invite_request_accept') }}</FieldLabel>
|
|
||||||
<FieldContent>
|
<FieldContent>
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
:model-value="autoAcceptInviteMode"
|
:model-value="autoAcceptInviteMode"
|
||||||
:disabled="autoAcceptInviteRequests === 'Off'"
|
:disabled="autoAcceptInviteRequests === 'Off'"
|
||||||
class="gap-2 flex"
|
class="gap-2 flex"
|
||||||
@update:modelValue="handleAutoAcceptInviteModeChange">
|
@update:modelValue="handleAutoAcceptInviteModeChange">
|
||||||
|
<div>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2">
|
||||||
<RadioGroupItem id="autoAcceptInvite-all" value="All Favorites" />
|
<RadioGroupItem id="autoAcceptInvite-all" value="All Favorites" />
|
||||||
<label for="autoAcceptInvite-all">
|
<label for="autoAcceptInvite-all">
|
||||||
{{ t('view.settings.general.automation.auto_invite_request_accept_favs') }}
|
{{ t('view.settings.general.automation.auto_invite_request_accept_favs') }}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
<p class="text-xs text-muted-foreground ml-6">
|
||||||
|
{{ t('view.settings.general.automation.auto_invite_request_accept_favs_hint') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2">
|
||||||
<RadioGroupItem id="autoAcceptInvite-selected" value="Selected Favorites" />
|
<RadioGroupItem id="autoAcceptInvite-selected" value="Selected Favorites" />
|
||||||
<label for="autoAcceptInvite-selected">
|
<label for="autoAcceptInvite-selected">
|
||||||
|
|||||||
Reference in New Issue
Block a user