Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Move widget screenshots labs flag to devtools #8522

Merged
merged 3 commits into from
May 6, 2022
Merged

Move widget screenshots labs flag to devtools #8522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
485f42e
Move widget screenshots to devtools dialog instead of labs
turt2live May 6, 2022
e52c7fe
Remove dead function in WidgetUtils relating to screenshots/capabilities
turt2live May 6, 2022
b2bf5aa
Add a settings store check to make the menu code easy to find again
turt2live May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/views/context_menus/WidgetContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ const WidgetContextMenu: React.FC<IProps> = ({
}

let snapshotButton;
if (widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)) {
const screenshotsEnabled = SettingsStore.getValue("enableWidgetScreenshots");
if (screenshotsEnabled && widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)) {
const onSnapshotClick = () => {
widgetMessaging?.takeScreenshot().then(data => {
dis.dispatch({
Expand Down
1 change: 1 addition & 0 deletions src/components/views/dialogs/DevtoolsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const DevtoolsDialog: React.FC<IProps> = ({ roomId, onFinished }) => {
<h3>{ _t("Options") }</h3>
<SettingsFlag name="developerMode" level={SettingLevel.ACCOUNT} />
<SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
<SettingsFlag name="enableWidgetScreenshots" level={SettingLevel.ACCOUNT} />
</div>
</BaseTool>;
}
Expand Down
8 changes: 0 additions & 8 deletions src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,6 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
);
});

groups.getOrCreate(LabGroup.Widgets, []).push(
<SettingsFlag
key="enableWidgetScreenshots"
name="enableWidgetScreenshots"
level={SettingLevel.ACCOUNT}
/>,
);

groups.getOrCreate(LabGroup.Experimental, []).push(
<SettingsFlag
key="lowBandwidth"
Expand Down
17 changes: 1 addition & 16 deletions src/utils/WidgetUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.

import * as url from "url";
import { base32 } from "rfc4648";
import { Capability, IWidget, IWidgetData, MatrixCapabilities } from "matrix-widget-api";
import { IWidget, IWidgetData } from "matrix-widget-api";
import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { logger } from "matrix-js-sdk/src/logger";
Expand Down Expand Up @@ -496,21 +496,6 @@ export default class WidgetUtils {
return app as IApp;
}

static getCapWhitelistForAppTypeInRoomId(appType: string, roomId: string): Capability[] {
const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", roomId);

const capWhitelist = enableScreenshots ? [MatrixCapabilities.Screenshots] : [];

// Obviously anyone that can add a widget can claim it's a jitsi widget,
// so this doesn't really offer much over the set of domains we load
// widgets from at all, but it probably makes sense for sanity.
if (WidgetType.JITSI.matches(appType)) {
capWhitelist.push(MatrixCapabilities.AlwaysOnScreen);
}

return capWhitelist;
}

static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean, auth?: string} = {}) {
// NB. we can't just encodeURIComponent all of these because the $ signs need to be there
const queryStringParts = [
Expand Down