Remove spurious type casts and avoid deprecated symbols (#12513)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
113299db43
commit
ed7a21a63c
3 changed files with 9 additions and 23 deletions
|
@ -17,7 +17,7 @@ import { Icon as ExternalLinkIcon } from "@vector-im/compound-design-tokens/icon
|
|||
import { Button, IconButton, Tooltip } from "@vector-im/compound-web";
|
||||
import React, { useCallback } from "react";
|
||||
import { logger } from "matrix-js-sdk/src/logger";
|
||||
import { EventType, IJoinRuleEventContent, JoinRule, Room } from "matrix-js-sdk/src/matrix";
|
||||
import { EventType, JoinRule, Room } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import Modal from "../../../../Modal";
|
||||
import ShareDialog from "../../dialogs/ShareDialog";
|
||||
|
@ -118,7 +118,7 @@ export const JoinRuleDialog: React.FC<{
|
|||
EventType.RoomJoinRules,
|
||||
{
|
||||
join_rule: newRule,
|
||||
} as IJoinRuleEventContent,
|
||||
},
|
||||
"",
|
||||
);
|
||||
// Show the dialog for a bit to give the user feedback
|
||||
|
|
|
@ -15,16 +15,8 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import React, { ChangeEvent, ReactNode } from "react";
|
||||
import {
|
||||
Room,
|
||||
RoomMember,
|
||||
EventType,
|
||||
RoomType,
|
||||
IJoinRuleEventContent,
|
||||
JoinRule,
|
||||
MatrixError,
|
||||
} from "matrix-js-sdk/src/matrix";
|
||||
import { KnownMembership } from "matrix-js-sdk/src/types";
|
||||
import { Room, RoomMember, EventType, RoomType, JoinRule, MatrixError } from "matrix-js-sdk/src/matrix";
|
||||
import { KnownMembership, RoomJoinRulesEventContent } from "matrix-js-sdk/src/types";
|
||||
import classNames from "classnames";
|
||||
import { RoomPreviewOpts, RoomViewLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
|
||||
|
||||
|
@ -257,7 +249,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
|
|||
return (
|
||||
this.props.room?.currentState
|
||||
.getStateEvents(EventType.RoomJoinRules, "")
|
||||
?.getContent<IJoinRuleEventContent>().join_rule ?? null
|
||||
?.getContent<RoomJoinRulesEventContent>().join_rule ?? null
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue