Merge branch 'staging' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo into staging
This commit is contained in:
@@ -34,7 +34,7 @@ router.patch("/:id", async (req, res) => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (discordAccount?.id) {
|
if (discordAccount?.id && !disaptcherUpdate.ghostMode) {
|
||||||
await renameMember(
|
await renameMember(
|
||||||
discordAccount.discordId.toString(),
|
discordAccount.discordId.toString(),
|
||||||
`${getPublicUser(newDispatcher.user).fullName} • ${newDispatcher.zone}`,
|
`${getPublicUser(newDispatcher.user).fullName} • ${newDispatcher.zone}`,
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ export const handleConnectDispatch =
|
|||||||
userId: user.id,
|
userId: user.id,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (discordAccount?.id) {
|
if (discordAccount?.id && !ghostMode) {
|
||||||
await renameMember(
|
await renameMember(
|
||||||
discordAccount.discordId.toString(),
|
discordAccount.discordId.toString(),
|
||||||
`${getPublicUser(user).fullName} • ${selectedZone}`,
|
`${getPublicUser(user).fullName} • ${selectedZone}`,
|
||||||
|
|||||||
@@ -253,7 +253,7 @@ const MissionMarker = ({
|
|||||||
tab: "home",
|
tab: "home",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
close: openMissionMarker?.map((m) => m.id) || [],
|
close: [],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ const PopupContent = ({
|
|||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
{aircraft.Station.bosCallsign.length > 15
|
{aircraft.Station.bosCallsign.length > 15
|
||||||
? aircraft.Station.locationStateShort
|
? aircraft.Station.bosCallsignShort
|
||||||
: aircraft.Station.bosCallsign}
|
: aircraft.Station.bosCallsign}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -177,6 +177,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
|
|||||||
if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
|
if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
|
||||||
changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
|
changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
|
||||||
zone: roomName,
|
zone: roomName,
|
||||||
|
ghostMode: dispatchState.ghostMode,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user