Apply prettier formatting

2022-12-12 12:24:14 +01:00 · 2022-12-12 12:24:14 +01:00 · 526645c791
commit 526645c791
parent 1cac306093
1576 changed files with 65385 additions and 62478 deletions
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@ -17,19 +17,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { useCallback, useContext, useEffect, useState } from 'react';
-import classNames from 'classnames';
-import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
+import React, { useCallback, useContext, useEffect, useState } from "react";
+import classNames from "classnames";
+import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
 import { ClientEvent } from "matrix-js-sdk/src/client";

-import * as AvatarLogic from '../../../Avatar';
+import * as AvatarLogic from "../../../Avatar";
 import SettingsStore from "../../../settings/SettingsStore";
-import AccessibleButton from '../elements/AccessibleButton';
+import AccessibleButton from "../elements/AccessibleButton";
 import RoomContext from "../../../contexts/RoomContext";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
 import { toPx } from "../../../utils/units";
-import { _t } from '../../../languageHandler';
+import { _t } from "../../../languageHandler";

 interface IProps {
    name: string; // The name (first initial used as default)
@ -70,14 +70,13 @@ const useImageUrl = ({ url, urls }): [string, () => void] => {
    // Since this is a hot code path and the settings store can be slow, we
    // use the cached lowBandwidth value from the room context if it exists
    const roomContext = useContext(RoomContext);
-    const lowBandwidth = roomContext ?
-        roomContext.lowBandwidth : SettingsStore.getValue("lowBandwidth");
+    const lowBandwidth = roomContext ? roomContext.lowBandwidth : SettingsStore.getValue("lowBandwidth");

    const [imageUrls, setUrls] = useState<string[]>(calculateUrls(url, urls, lowBandwidth));
    const [urlsIndex, setIndex] = useState<number>(0);

    const onError = useCallback(() => {
-        setIndex(i => i + 1); // try the next one
+        setIndex((i) => i + 1); // try the next one
    }, []);

    useEffect(() => {
@ -131,7 +130,7 @@ const BaseAvatar = (props: IProps) => {
                    lineHeight: toPx(height),
                }}
            >
-                { initialLetter }
+                {initialLetter}
            </span>
        );
        const imgNode = (
@ -146,7 +145,8 @@ const BaseAvatar = (props: IProps) => {
                    height: toPx(height),
                }}
                aria-hidden="true"
-                data-testid="avatar-img" />
+                data-testid="avatar-img"
+            />
        );

        if (onClick) {
@ -160,8 +160,8 @@ const BaseAvatar = (props: IProps) => {
                    onClick={onClick}
                    inputRef={inputRef}
                >
-                    { textNode }
-                    { imgNode }
+                    {textNode}
+                    {imgNode}
                </AccessibleButton>
            );
        } else {
@ -172,8 +172,8 @@ const BaseAvatar = (props: IProps) => {
                    {...otherProps}
                    role="presentation"
                >
-                    { textNode }
-                    { imgNode }
+                    {textNode}
+                    {imgNode}
                </span>
            );
        }
@ -183,7 +183,7 @@ const BaseAvatar = (props: IProps) => {
        return (
            <AccessibleButton
                className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
-                element='img'
+                element="img"
                src={imageUrl}
                onClick={onClick}
                onError={onError}
@ -195,7 +195,8 @@ const BaseAvatar = (props: IProps) => {
                alt={_t("Avatar")}
                inputRef={inputRef}
                data-testid="avatar-img"
-                {...otherProps} />
+                {...otherProps}
+            />
        );
    } else {
        return (
@ -211,7 +212,8 @@ const BaseAvatar = (props: IProps) => {
                alt=""
                ref={inputRef}
                data-testid="avatar-img"
-                {...otherProps} />
+                {...otherProps}
+            />
        );
    }
 };
--- a/src/components/views/avatars/DecoratedRoomAvatar.tsx
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@ -24,7 +24,7 @@ import { JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { UnstableValue } from "matrix-js-sdk/src/NamespacedValue";

 import RoomAvatar from "./RoomAvatar";
-import NotificationBadge from '../rooms/NotificationBadge';
+import NotificationBadge from "../rooms/NotificationBadge";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import { NotificationState } from "../../../stores/notifications/NotificationState";
 import { isPresenceEnabled } from "../../../utils/presence";
@ -144,14 +144,14 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt

        let icon = Icon.None;

-        const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === 'online';
+        const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === "online";
        if (BUSY_PRESENCE_NAME.matches(this.dmUser.presence)) {
            icon = Icon.PresenceBusy;
        } else if (isOnline) {
            icon = Icon.PresenceOnline;
-        } else if (this.dmUser.presence === 'offline') {
+        } else if (this.dmUser.presence === "offline") {
            icon = Icon.PresenceOffline;
-        } else if (this.dmUser.presence === 'unavailable') {
+        } else if (this.dmUser.presence === "unavailable") {
            icon = Icon.PresenceAway;
        }

@ -183,36 +183,42 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
    public render(): React.ReactNode {
        let badge: React.ReactNode;
        if (this.props.displayBadge) {
-            badge = <NotificationBadge
-                notification={this.state.notificationState}
-                forceCount={this.props.forceCount}
-                roomId={this.props.room.roomId}
-            />;
+            badge = (
+                <NotificationBadge
+                    notification={this.state.notificationState}
+                    forceCount={this.props.forceCount}
+                    roomId={this.props.room.roomId}
+                />
+            );
        }

        let icon;
        if (this.state.icon !== Icon.None) {
-            icon = <TextWithTooltip
-                tooltip={tooltipText(this.state.icon)}
-                tooltipProps={this.props.tooltipProps}
-                class={`mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_${this.state.icon.toLowerCase()}`}
-            />;
+            icon = (
+                <TextWithTooltip
+                    tooltip={tooltipText(this.state.icon)}
+                    tooltipProps={this.props.tooltipProps}
+                    class={`mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_${this.state.icon.toLowerCase()}`}
+                />
+            );
        }

        const classes = classNames("mx_DecoratedRoomAvatar", {
            mx_DecoratedRoomAvatar_cutout: icon,
        });

-        return <div className={classes}>
-            <RoomAvatar
-                room={this.props.room}
-                width={this.props.avatarSize}
-                height={this.props.avatarSize}
-                oobData={this.props.oobData}
-                viewAvatarOnClick={this.props.viewAvatarOnClick}
-            />
-            { icon }
-            { badge }
-        </div>;
+        return (
+            <div className={classes}>
+                <RoomAvatar
+                    room={this.props.room}
+                    width={this.props.avatarSize}
+                    height={this.props.avatarSize}
+                    oobData={this.props.oobData}
+                    viewAvatarOnClick={this.props.viewAvatarOnClick}
+                />
+                {icon}
+                {badge}
+            </div>
+        );
    }
 }
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@ -15,17 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { useContext } from 'react';
+import React, { useContext } from "react";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
+import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";

 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import BaseAvatar from "./BaseAvatar";
 import { mediaFromMxc } from "../../../customisations/Media";
-import { CardContext } from '../right_panel/context';
-import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
-import { useRoomMemberProfile } from '../../../hooks/room/useRoomMemberProfile';
+import { CardContext } from "../right_panel/context";
+import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
+import { useRoomMemberProfile } from "../../../hooks/room/useRoomMemberProfile";

 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
    member: RoomMember | null;
@ -47,7 +47,7 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
 export default function MemberAvatar({
    width,
    height,
-    resizeMethod = 'crop',
+    resizeMethod = "crop",
    viewUserOnClick,
    forceHistorical,
    fallbackUserId,
@ -76,35 +76,40 @@ export default function MemberAvatar({
        }

        if (!title) {
-            title = UserIdentifierCustomisations.getDisplayUserIdentifier(
-                member?.userId ?? "", { roomId: member?.roomId ?? "" },
-            ) ?? fallbackUserId;
+            title =
+                UserIdentifierCustomisations.getDisplayUserIdentifier(member?.userId ?? "", {
+                    roomId: member?.roomId ?? "",
+                }) ?? fallbackUserId;
        }
    }

-    return <BaseAvatar
-        {...props}
-        width={width}
-        height={height}
-        resizeMethod={resizeMethod}
-        name={name ?? ""}
-        title={hideTitle ? undefined : title}
-        idName={member?.userId ?? fallbackUserId}
-        url={imageUrl}
-        onClick={viewUserOnClick ? () => {
-            dis.dispatch({
-                action: Action.ViewUser,
-                member: propsMember,
-                push: card.isCard,
-            });
-        } : props.onClick}
-    />;
+    return (
+        <BaseAvatar
+            {...props}
+            width={width}
+            height={height}
+            resizeMethod={resizeMethod}
+            name={name ?? ""}
+            title={hideTitle ? undefined : title}
+            idName={member?.userId ?? fallbackUserId}
+            url={imageUrl}
+            onClick={
+                viewUserOnClick
+                    ? () => {
+                          dis.dispatch({
+                              action: Action.ViewUser,
+                              member: propsMember,
+                              push: card.isCard,
+                          });
+                      }
+                    : props.onClick
+            }
+        />
+    );
 }

 export class LegacyMemberAvatar extends React.Component<IProps> {
    public render(): JSX.Element {
-        return <MemberAvatar {...this.props}>
-            { this.props.children }
-        </MemberAvatar>;
+        return <MemberAvatar {...this.props}>{this.props.children}</MemberAvatar>;
    }
 }
--- a/src/components/views/avatars/MemberStatusMessageAvatar.tsx
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.tsx
@ -1 +0,0 @@
-
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@ -14,21 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { ComponentProps } from 'react';
-import { Room } from 'matrix-js-sdk/src/models/room';
-import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import React, { ComponentProps } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 import classNames from "classnames";
 import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";

-import BaseAvatar from './BaseAvatar';
-import ImageView from '../elements/ImageView';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import Modal from '../../../Modal';
-import * as Avatar from '../../../Avatar';
+import BaseAvatar from "./BaseAvatar";
+import ImageView from "../elements/ImageView";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import Modal from "../../../Modal";
+import * as Avatar from "../../../Avatar";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import { mediaFromMxc } from "../../../customisations/Media";
-import { IOOBData } from '../../../stores/ThreepidInviteStore';
+import { IOOBData } from "../../../stores/ThreepidInviteStore";

 interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
    // Room may be left unset here, but if it is,
@ -50,7 +50,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
    public static defaultProps = {
        width: 36,
        height: 36,
-        resizeMethod: 'crop',
+        resizeMethod: "crop",
        oobData: {},
    };

@ -96,8 +96,8 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
        return [
            oobAvatar, // highest priority
            RoomAvatar.getRoomAvatarUrl(props),
-        ].filter(function(url) {
-            return (url !== null && url !== "");
+        ].filter(function (url) {
+            return url !== null && url !== "";
        });
    }

@ -108,12 +108,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
    }

    private onRoomAvatarClick = () => {
-        const avatarUrl = Avatar.avatarUrlForRoom(
-            this.props.room,
-            null,
-            null,
-            null,
-        );
+        const avatarUrl = Avatar.avatarUrlForRoom(this.props.room, null, null, null);
        const params = {
            src: avatarUrl,
            name: this.props.room.name,
@ -128,7 +123,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
        const roomName = room?.name ?? oobData.name;
        // If the room is a DM, we use the other user's ID for the color hash
        // in order to match the room avatar with their avatar
-        const idName = room ? (DMRoomMap.shared().getUserIdForRoomId(room.roomId) ?? room.roomId) : oobData.roomId;
+        const idName = room ? DMRoomMap.shared().getUserIdForRoomId(room.roomId) ?? room.roomId : oobData.roomId;

        return (
            <BaseAvatar
--- a/src/components/views/avatars/SearchResultAvatar.tsx
+++ b/src/components/views/avatars/SearchResultAvatar.tsx
@ -32,22 +32,26 @@ export function SearchResultAvatar({ user, size }: SearchResultAvatarProps): JSX
        // we can’t show a real avatar here, but we try to create the exact same markup that a real avatar would have
        // BaseAvatar makes the avatar, if it's not clickable but just for decoration, invisible to screenreaders by
        // specifically setting an empty alt text, so we do the same.
-        return <img
-            className="mx_SearchResultAvatar mx_SearchResultAvatar_threepidAvatar"
-            alt=""
-            src={emailPillAvatar}
-            width={size}
-            height={size}
-        />;
+        return (
+            <img
+                className="mx_SearchResultAvatar mx_SearchResultAvatar_threepidAvatar"
+                alt=""
+                src={emailPillAvatar}
+                width={size}
+                height={size}
+            />
+        );
    } else {
        const avatarUrl = user.getMxcAvatarUrl();
-        return <BaseAvatar
-            className="mx_SearchResultAvatar"
-            url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(size) : null}
-            name={user.name}
-            idName={user.userId}
-            width={size}
-            height={size}
-        />;
+        return (
+            <BaseAvatar
+                className="mx_SearchResultAvatar"
+                url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(size) : null}
+                name={user.name}
+                idName={user.userId}
+                width={size}
+                height={size}
+            />
+        );
    }
 }
--- a/src/components/views/avatars/WidgetAvatar.tsx
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { ComponentProps } from 'react';
-import classNames from 'classnames';
+import React, { ComponentProps } from "react";
+import classNames from "classnames";

 import { IApp } from "../../../stores/WidgetStore";
 import BaseAvatar, { BaseAvatarType } from "./BaseAvatar";