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

linting

Browse source
This commit is contained in:
Will Hunt 2020-11-30 13:07:12 +00:00
parent 3466813c23
commit c5e578a502
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/settings/BridgeTile.tsx
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, { ReactNode } from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo"; import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
import {_t} from "../../../languageHandler"; import {_t} from "../../../languageHandler";
@ -22,7 +22,6 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
import Pill from "../elements/Pill"; import Pill from "../elements/Pill";
import {makeUserPermalink} from "../../../utils/permalinks/Permalinks"; import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
import BaseAvatar from "../avatars/BaseAvatar"; import BaseAvatar from "../avatars/BaseAvatar";
import AccessibleButton from "../elements/AccessibleButton";
import {replaceableComponentTs} from "../../../utils/replaceableComponent"; import {replaceableComponentTs} from "../../../utils/replaceableComponent";
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import {MatrixEvent} from "matrix-js-sdk/src/models/event"; import {MatrixEvent} from "matrix-js-sdk/src/models/event";
@ -43,19 +42,25 @@ interface IBridgeStateEvent {
protocol: { protocol: {
id: string; id: string;
displayname?: string; displayname?: string;
// eslint-disable-next-line camelcase
avatar_url?: string; avatar_url?: string;
// eslint-disable-next-line camelcase
external_url?: string; external_url?: string;
}; };
network?: { network?: {
id: string; id: string;
displayname?: string; displayname?: string;
// eslint-disable-next-line camelcase
avatar_url?: string; avatar_url?: string;
// eslint-disable-next-line camelcase
external_url?: string; external_url?: string;
}; };
channel: { channel: {
id: string; id: string;
displayname?: string; displayname?: string;
// eslint-disable-next-line camelcase
avatar_url?: string; avatar_url?: string;
// eslint-disable-next-line camelcase
external_url?: string; external_url?: string;
}; };
} }
@ -77,7 +82,8 @@ export default class BridgeTile extends React.PureComponent<IProps> {
if (!content.bridgebot) { if (!content.bridgebot) {
// Bridgebot was not required previously, so in order to not break rooms we are allowing // Bridgebot was not required previously, so in order to not break rooms we are allowing
// the sender to be used in place. When the proposal is merged, this should be removed. // the sender to be used in place. When the proposal is merged, this should be removed.
console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which is deprecated behaviour. Using sender for now.`); console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which`
+ "is deprecated behaviour. Using sender for now.");
content.bridgebot = this.props.ev.getSender(); content.bridgebot = this.props.ev.getSender();
} }
const { channel, network, protocol } = content; const { channel, network, protocol } = content;
@ -151,7 +157,7 @@ export default class BridgeTile extends React.PureComponent<IProps> {
<p className="workspace-channel-details"> <p className="workspace-channel-details">
{networkItem} {networkItem}
<span className="channel">{_t("Channel: <channelLink/>", {}, { <span className="channel">{_t("Channel: <channelLink/>", {}, {
channelLink: () => channelLink channelLink: () => channelLink,
})}</span> })}</span>
</p> </p>
<ul className="metadata"> <ul className="metadata">

3
src/utils/replaceableComponent.ts
View file

@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { func } from 'prop-types';
import * as React from 'react'; import * as React from 'react';
import * as sdk from '../index'; import * as sdk from '../index';
@ -47,4 +46,4 @@ export function replaceableComponent(name: string, origComponent: React.Componen
*/ */
export function replaceableComponentTs(name: string) { export function replaceableComponentTs(name: string) {
return (origComponent: typeof React.Component) => sdk.getComponent(name) || origComponent; return (origComponent: typeof React.Component) => sdk.getComponent(name) || origComponent;
} }