From 8082b6c3d800c08f7b7ae20fd68fd8a528f79c56 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Jun 2021 16:08:31 +0200
Subject: [PATCH 1/2] Fix WebUI crash when a toot with a playing video gets
deleted
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
.../glitch/actions/picture_in_picture.js | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/app/javascript/flavours/glitch/actions/picture_in_picture.js b/app/javascript/flavours/glitch/actions/picture_in_picture.js
index 4085cb59e0..33d8d57d47 100644
--- a/app/javascript/flavours/glitch/actions/picture_in_picture.js
+++ b/app/javascript/flavours/glitch/actions/picture_in_picture.js
@@ -22,13 +22,20 @@ export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
* @param {MediaProps} props
* @return {object}
*/
-export const deployPictureInPicture = (statusId, accountId, playerType, props) => ({
- type: PICTURE_IN_PICTURE_DEPLOY,
- statusId,
- accountId,
- playerType,
- props,
-});
+export const deployPictureInPicture = (statusId, accountId, playerType, props) => {
+ return (dispatch, getState) => {
+ // Do not open a player for a toot that does not exist
+ if (getState().hasIn(['statuses', statusId])) {
+ dispatch({
+ type: PICTURE_IN_PICTURE_DEPLOY,
+ statusId,
+ accountId,
+ playerType,
+ props,
+ });
+ }
+ };
+};
/*
* @return {object}
From b1af97fcb31df3dddaa26845cd1114fcaaa9e605 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Jun 2021 15:51:20 +0200
Subject: [PATCH 2/2] Fix pop-up player not closing the moment a status is
deleted
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
app/javascript/flavours/glitch/reducers/picture_in_picture.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/javascript/flavours/glitch/reducers/picture_in_picture.js b/app/javascript/flavours/glitch/reducers/picture_in_picture.js
index f552a59c21..13a3d1aa2a 100644
--- a/app/javascript/flavours/glitch/reducers/picture_in_picture.js
+++ b/app/javascript/flavours/glitch/reducers/picture_in_picture.js
@@ -1,4 +1,5 @@
import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'flavours/glitch/actions/picture_in_picture';
+import { TIMELINE_DELETE } from 'flavours/glitch/actions/timelines';
const initialState = {
statusId: null,
@@ -16,6 +17,8 @@ export default function pictureInPicture(state = initialState, action) {
return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
case PICTURE_IN_PICTURE_REMOVE:
return { ...initialState };
+ case TIMELINE_DELETE:
+ return (state.statusId === action.id) ? { ...initialState } : state;
default:
return state;
}