imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove threads labs flag and the ability to disable threads (#9878)

Browse source
This commit is contained in:
Germain 2023-02-20 14:46:07 +00:00 • committed by GitHub
parent a09e105c23
commit 8c22584f64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 197 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/settings/Settings.tsx
View file

@ -1,6 +1,6 @@
/*
Copyright 2017 Travis Ralston
Copyright 2018 - 2021 The Matrix.org Foundation C.I.C.
Copyright 2018 - 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -42,7 +42,6 @@ import { ImageSize } from "./enums/ImageSize";
import { MetaSpace } from "../stores/spaces";
import SdkConfig from "../SdkConfig";
import SlidingSyncController from "./controllers/SlidingSyncController";
import ThreadBetaController from "./controllers/ThreadBetaController";
import { FontWatcher } from "./watchers/FontWatcher";
import RustCryptoSdkController from "./controllers/RustCryptoSdkController";
@ -256,36 +255,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_threadenabled": {
isFeature: true,
labsGroup: LabGroup.Messaging,
controller: new ThreadBetaController(),
displayName: _td("Threaded messages"),
supportedLevels: LEVELS_FEATURE,
default: true,
betaInfo: {
title: _td("Threaded messages"),
caption: () => (
<>
<p>{_t("Keep discussions organised with threads.")}</p>
<p>
{_t(
"Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.",
{},
{
a: (sub) => (
<a href="https://element.io/help#threads" rel="noreferrer noopener" target="_blank">
{sub}
</a>
),
},
)}
</p>
</>
),
requiresRefresh: true,
},
},
"feature_wysiwyg_composer": {
isFeature: true,
labsGroup: LabGroup.Messaging,

63
src/settings/controllers/ThreadBetaController.tsx
View file

@ -1,63 +0,0 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import * as React from "react";
import { Thread } from "matrix-js-sdk/src/models/thread";
import SettingController from "./SettingController";
import PlatformPeg from "../../PlatformPeg";
import { SettingLevel } from "../SettingLevel";
import Modal from "../../Modal";
import QuestionDialog from "../../components/views/dialogs/QuestionDialog";
import { _t } from "../../languageHandler";
export default class ThreadBetaController extends SettingController {
public async beforeChange(level: SettingLevel, roomId: string, newValue: any): Promise<boolean> {
if (Thread.hasServerSideSupport || !newValue) return true; // Full support or user is disabling
const { finished } = Modal.createDialog<[boolean]>(QuestionDialog, {
title: _t("Partial Support for Threads"),
description: (
<>
<p>
{_t(
"Your homeserver does not currently support threads, so this feature may be unreliable. " +
"Some threaded messages may not be reliably available. <a>Learn more</a>.",
{},
{
a: (sub) => (
<a href="https://element.io/help#threads" target="_blank" rel="noreferrer noopener">
{sub}
</a>
),
},
)}
</p>
<p>{_t("Do you want to enable threads anyway?")}</p>
</>
),
button: _t("Yes, enable"),
});
const [enable] = await finished;
return enable;
}
public onChange(level: SettingLevel, roomId: string, newValue: any): void {
// Requires a reload as we change an option flag on the `js-sdk`
// And the entire sync history needs to be parsed again
PlatformPeg.get().reload();
}
}