mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-22 04:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: external actions were assuming all actions are urls. Fixes #3213

Browse source
This commit is contained in:
Gabe Kangas 2023-07-26 11:15:23 -07:00
parent 7575c64d14
commit 16db7825c9
No known key found for this signature in database
GPG key ID: 4345B2060657F330
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
web/components/ui/Content/Content.tsx
View file

@ -138,27 +138,32 @@ export const Content: FC = () => {
const externalActionSelected = (action: ExternalAction) => {
const { openExternally, url } = action;
const updatedUrl = new URL(url);
updatedUrl.searchParams.append('instance', currentBrowserWindowUrl);
if (currentUser) {
const { displayName } = currentUser;
if (url) {
const updatedUrl = new URL(url);
updatedUrl.searchParams.append('instance', currentBrowserWindowUrl);
// Append url and username to params so the link knows where we came from and who we are.
updatedUrl.searchParams.append('username', displayName);
}
const fullUrl = updatedUrl.toString();
// Overwrite URL with the updated one that includes the params.
const updatedAction = {
...action,
url: fullUrl,
};
if (currentUser) {
const { displayName } = currentUser;
// apply openExternally only if we don't have an HTML embed
if (openExternally) {
window.open(fullUrl, '_blank');
// Append url and username to params so the link knows where we came from and who we are.
updatedUrl.searchParams.append('username', displayName);
}
const fullUrl = updatedUrl.toString();
// Overwrite URL with the updated one that includes the params.
const updatedAction = {
...action,
url: fullUrl,
};
// apply openExternally only if we don't have an HTML embed
if (openExternally) {
window.open(fullUrl, '_blank');
} else {
setExternalActionToDisplay(updatedAction);
}
} else {
setExternalActionToDisplay(updatedAction);
setExternalActionToDisplay(action);
}
};