@@ -1368,7 +1377,8 @@
sortUserDialogAvatars,
refreshUserDialogAvatars,
showSendBoopDialog,
- toggleSharedConnectionsOptOut
+ toggleSharedConnectionsOptOut,
+ toggleDiscordFriendsOptOut
} = useUserStore();
const { favoriteLimits } = storeToRefs(useFavoriteStore());
const { showFavoriteDialog, handleFavoriteWorldList } = useFavoriteStore();
diff --git a/src/localization/en.json b/src/localization/en.json
index b9b93e20..b2ea0f28 100644
--- a/src/localization/en.json
+++ b/src/localization/en.json
@@ -312,7 +312,8 @@
"economy": {
"received": {
"gift": "Gift Received"
- }
+ },
+ "alert": "Economy Alert"
}
}
},
@@ -1124,7 +1125,8 @@
"close_instance": "Close Instance",
"instance_age_gated": "age gated",
"open_previous_instance": "Open Previous Instances",
- "show_mutual_friends": "Show Mutual Friends"
+ "show_mutual_friends": "Show Mutual Friends",
+ "show_discord_connections": "Show Discord Connections"
},
"groups": {
"header": "Groups",
diff --git a/src/stores/user.js b/src/stores/user.js
index 3c0e6df0..9d9f214d 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -100,6 +100,7 @@ export const useUserStore = defineStore('User', () => {
friends: [],
googleId: '',
hasBirthday: false,
+ hasDiscordFriendsOptOut: false,
hasEmail: false,
hasLoggedInFromClient: false,
hasPendingEmail: false,
@@ -2054,6 +2055,12 @@ export const useUserStore = defineStore('User', () => {
});
}
+ function toggleDiscordFriendsOptOut() {
+ userRequest.saveCurrentUser({
+ hasDiscordFriendsOptOut: !currentUser.value.hasDiscordFriendsOptOut
+ });
+ }
+
return {
state,
@@ -2081,6 +2088,7 @@ export const useUserStore = defineStore('User', () => {
handleConfig,
showSendBoopDialog,
checkNote,
- toggleSharedConnectionsOptOut
+ toggleSharedConnectionsOptOut,
+ toggleDiscordFriendsOptOut
};
});
diff --git a/src/views/Notifications/Notification.vue b/src/views/Notifications/Notification.vue
index 1099fbd5..ec3a6b34 100644
--- a/src/views/Notifications/Notification.vue
+++ b/src/views/Notifications/Notification.vue
@@ -318,6 +318,10 @@
showGroupDialog(ids[0]);
// ids[1] cal_ is the event id
break;
+ case 'openNotificationLink':
+ default:
+ toast.error('Unsupported notification link type');
+ break;
}
}
diff --git a/src/views/Notifications/columns.jsx b/src/views/Notifications/columns.jsx
index 8140f4d8..d7011853 100644
--- a/src/views/Notifications/columns.jsx
+++ b/src/views/Notifications/columns.jsx
@@ -524,12 +524,15 @@ export const createColumns = ({
original.type !== 'groupChange' &&
!original.type?.includes('group.') &&
!original.type?.includes('moderation.') &&
- !original.type?.includes('instance.');
+ !original.type?.includes('instance.') &&
+ !original.link?.startsWith('economy.');
const showDeleteLog =
original.type !== 'friendRequest' &&
original.type !== 'ignoredFriendRequest' &&
!original.type?.includes('group.') &&
- !original.type?.includes('moderation.');
+ !original.type?.includes('moderation.') &&
+ !original.type?.includes('instance.') &&
+ !original.link?.startsWith('economy.');
return (