sij/env.esq
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to single quotes

Browse source
This commit is contained in:
Jorik Schellekens 2020-08-18 11:16:31 +01:00
parent 0ac4116b24
commit f7abaadef1
32 changed files with 238 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -23,11 +23,11 @@
"lint-staged": {
"src/**/*.{js,jsx,ts,tsx}": [
"eslint --fix",
"prettier --write --tab-width 4",
"prettier --write --tab-width 4 --single-quote",
"git add"
],
"src/**/*.{json,css,scss,md}": [
"prettier --write --tab-width 4",
"prettier --write --tab-width 4 --single-quote",
"git add"
]
},

14
src/clients/Element.io.ts
View file

@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { LinkedClient, Maturity, ClientKind } from "./types";
import { LinkKind } from "../parser/types";
import logo from "./element.svg";
import { LinkedClient, Maturity, ClientKind } from './types';
import { LinkKind } from '../parser/types';
import logo from './element.svg';
const Element: LinkedClient = {
kind: ClientKind.LINKED_CLIENT,
name: "Element",
author: "Element",
name: 'Element',
author: 'Element',
logo: logo,
homepage: "https://element.io",
homepage: 'https://element.io',
maturity: Maturity.STABLE,
description: "Fully-featured Matrix client for the Web",
description: 'Fully-featured Matrix client for the Web',
tags: [],
toUrl: (link) => {
switch (link.kind) {

4
src/clients/index.ts
View file

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Client } from "./types";
import { Client } from './types';
import Element from "./Element.io";
import Element from './Element.io';
/*
* All the supported clients of matrix.to

22
src/clients/types.ts
View file

@ -14,35 +14,35 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { SafeLink } from "../parser/types";
import { SafeLink } from '../parser/types';
/*
* A collection of descriptive tags that can be added to
* a clients description.
*/
export enum Tag {
IOS = "IOS",
ANDROID = "ANDROID",
DESKTOP = "DESKTOP",
IOS = 'IOS',
ANDROID = 'ANDROID',
DESKTOP = 'DESKTOP',
}
/*
* A collection of states used for describing a clients maturity.
*/
export enum Maturity {
ALPHA = "ALPHA",
LATE_ALPHA = "LATE ALPHA",
BETA = "BETA",
LATE_BETA = "LATE_BETA",
STABLE = "STABLE",
ALPHA = 'ALPHA',
LATE_ALPHA = 'LATE ALPHA',
BETA = 'BETA',
LATE_BETA = 'LATE_BETA',
STABLE = 'STABLE',
}
/*
* Used for constructing the discriminated union of all client types.
*/
export enum ClientKind {
LINKED_CLIENT = "LINKED_CLIENT",
TEXT_CLIENT = "TEXT_CLIENT",
LINKED_CLIENT = 'LINKED_CLIENT',
TEXT_CLIENT = 'TEXT_CLIENT',
}
/*

18
src/components/Avatar.stories.tsx
View file

@ -14,17 +14,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
// disable camelcase check because our object keys come
// from the matrix spec
/* eslint-disable @typescript-eslint/camelcase */
import { UserAvatar } from "./Avatar";
import React from 'react';
import { UserAvatar } from './Avatar';
export default {
title: "Avatar",
title: 'Avatar',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853",
'https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853',
},
},
};
@ -32,8 +36,8 @@ export default {
export const Default: React.FC<{}> = () => (
<UserAvatar
user={{
avatar_url: "mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf",
displayname: "Jorik Schellekens",
avatar_url: 'mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf',
displayname: 'Jorik Schellekens',
}}
userId="@jorik:matrix.org"
/>

14
src/components/Avatar.tsx
View file

@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { useEffect, useState } from "react";
import classNames from "classnames";
import { Room, User } from "matrix-cypher";
import React, { useEffect, useState } from 'react';
import classNames from 'classnames';
import { Room, User } from 'matrix-cypher';
import { getMediaQueryFromMCX } from "../utils/cypher-wrapper";
import logo from "../imgs/matrix-logo.svg";
import { getMediaQueryFromMCX } from '../utils/cypher-wrapper';
import logo from '../imgs/matrix-logo.svg';
import "./Avatar.scss";
import './Avatar.scss';
interface IProps {
className?: string;
@ -40,7 +40,7 @@ const Avatar: React.FC<IProps> = ({ className, avatarUrl, label }: IProps) => {
src={src}
onError={(): void => setSrc(logo)}
alt={label}
className={classNames("avatar", className)}
className={classNames('avatar', className)}
/>
);
};

14
src/components/Button.stories.tsx
View file

@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { action } from "@storybook/addon-actions";
import { text } from "@storybook/addon-knobs";
import React from 'react';
import { action } from '@storybook/addon-actions';
import { text } from '@storybook/addon-knobs';
import Button from "./Button";
import Button from './Button';
export default { title: "Button" };
export default { title: 'Button' };
export const WithText: React.FC = () => (
<Button onClick={action("clicked")}>
{text("label", "Hello Story Book")}
<Button onClick={action('clicked')}>
{text('label', 'Hello Story Book')}
</Button>
);

8
src/components/Button.tsx
View file

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import classnames from "classnames";
import React from 'react';
import classnames from 'classnames';
import "./Button.scss";
import './Button.scss';
interface IProps extends React.ButtonHTMLAttributes<Element> {
// Briefly display these instead of the children onClick
@ -49,7 +49,7 @@ const Button: React.FC<
const content = wasClicked && flashChildren ? flashChildren : children;
const classNames = classnames("button", className, {
const classNames = classnames('button', className, {
buttonHighlight: wasClicked,
});

10
src/components/CreateLinkTile.stories.tsx
View file

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import CreateLinkTile from "./CreateLinkTile";
import CreateLinkTile from './CreateLinkTile';
export default {
title: "CreateLinkTile",
title: 'CreateLinkTile',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
'https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1',
},
},
};

36
src/components/CreateLinkTile.tsx
View file

@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { useEffect, useRef } from "react";
import Tile from "./Tile";
import Button from "./Button";
import TextButton from "./TextButton";
import Input from "./Input";
import { Formik, Form } from "formik";
import * as Yup from "yup";
import React, { useEffect, useRef } from 'react';
import Tile from './Tile';
import Button from './Button';
import TextButton from './TextButton';
import Input from './Input';
import { Formik, Form } from 'formik';
import * as Yup from 'yup';
import "./CreateLinkTile.scss";
import './CreateLinkTile.scss';
interface ILinkNotCreatedTileProps {
setLink: React.Dispatch<React.SetStateAction<string>>;
@ -39,31 +39,31 @@ const LinkNotCreatedTile: React.FC<ILinkNotCreatedTileProps> = (
</h1>
<Formik
initialValues={{
identifier: "",
identifier: '',
}}
validationSchema={Yup.object({
identifier: Yup.string()
.test(
"is-identifier",
'is-identifier',
"That link doesn't look right. Double check the details.",
(link) => link
)
.required("Required"),
.required('Required'),
})}
onSubmit={(values): void => {
props.setLink(
document.location.protocol +
"//" +
'//' +
document.location.host +
"/" +
'/' +
values.identifier
);
}}
>
<Form>
<Input
name={"identifier"}
type={"text"}
name={'identifier'}
type={'text'}
placeholder="#room:example.com, @user:example.com"
/>
<Button type="submit">Get Link</Button>
@ -90,12 +90,12 @@ const LinkCreatedTile: React.FC<ILinkCreatedTileProps> = (props) => {
return (
<Tile className="createLinkTile">
<TextButton onClick={(): void => props.setLink("")}>
<TextButton onClick={(): void => props.setLink('')}>
Create another lnk
</TextButton>
<h1>{props.link}</h1>
<Button
flashChildren={"Copied"}
flashChildren={'Copied'}
onClick={(): void => {
navigator.clipboard.writeText(props.link);
}}
@ -108,7 +108,7 @@ const LinkCreatedTile: React.FC<ILinkCreatedTileProps> = (props) => {
};
const CreateLinkTile: React.FC = () => {
const [link, setLink] = React.useState("");
const [link, setLink] = React.useState('');
console.log(link);
if (!link) {
return <LinkNotCreatedTile setLink={setLink} />;

6
src/components/EventPreview.tsx
View file

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { Room, Event } from "matrix-cypher";
import React from 'react';
import { Room, Event } from 'matrix-cypher';
import RoomPreview from "./RoomPreview";
import RoomPreview from './RoomPreview';
interface IProps {
room: Room;

14
src/components/Input.stories.tsx
View file

@ -14,19 +14,19 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { withDesign } from "storybook-addon-designs";
import { Formik, Form } from "formik";
import React from 'react';
import { withDesign } from 'storybook-addon-designs';
import { Formik, Form } from 'formik';
import Input from "./Input";
import Input from './Input';
export default {
title: "Input",
title: 'Input',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
'https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1',
},
},
decorators: [withDesign],

10
src/components/Input.tsx
View file

@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import classnames from "classnames";
import { useField } from "formik";
import React from 'react';
import classnames from 'classnames';
import { useField } from 'formik';
import "./Input.scss";
import './Input.scss';
interface IProps extends React.InputHTMLAttributes<Element> {
name: string;
@ -33,7 +33,7 @@ const Input: React.FC<IProps> = ({ className, ...props }) => {
<div className="inputError">{meta.error}</div>
) : null;
const classNames = classnames("input", className, {
const classNames = classnames('input', className, {
error: meta.error,
});

58
src/components/InviteTile.stories.tsx
View file

@ -14,41 +14,45 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
// disable camelcase check because our object keys come
// from the matrix spec
/* eslint-disable @typescript-eslint/camelcase */
import InviteTile from "./InviteTile";
import UserPreview, { InviterPreview } from "./UserPreview";
import RoomPreview, { RoomPreviewWithTopic } from "./RoomPreview";
import Clients from "../clients";
import { LinkKind, SafeLink } from "../parser/types";
import React from 'react';
import InviteTile from './InviteTile';
import UserPreview, { InviterPreview } from './UserPreview';
import RoomPreview, { RoomPreviewWithTopic } from './RoomPreview';
import Clients from '../clients';
import { LinkKind, SafeLink } from '../parser/types';
export default {
title: "InviteTile",
title: 'InviteTile',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A334",
'https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A334',
},
},
};
const userLink: SafeLink = {
kind: LinkKind.UserId,
identifier: "@jorik:matrix.org",
identifier: '@jorik:matrix.org',
arguments: {
vias: [],
},
originalLink: "asdfsadf",
originalLink: 'asdfsadf',
};
const roomLink: SafeLink = {
kind: LinkKind.Alias,
identifier: "#element-dev:matrix.org",
identifier: '#element-dev:matrix.org',
arguments: {
vias: [],
},
originalLink: "asdfsadf",
originalLink: 'asdfsadf',
};
export const withLink: React.FC<{}> = () => (
@ -67,8 +71,8 @@ export const withUserPreview: React.FC<{}> = () => (
<InviteTile client={Clients[0]} link={userLink}>
<UserPreview
user={{
avatar_url: "mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf",
displayname: "Nicholas Briteli",
avatar_url: 'mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf',
displayname: 'Nicholas Briteli',
}}
userId="@nicholasbritelli:matrix.org"
/>
@ -79,13 +83,13 @@ export const withRoomPreviewAndRoomTopic: React.FC<{}> = () => (
<InviteTile client={Clients[0]} link={roomLink}>
<RoomPreviewWithTopic
room={{
aliases: ["#murrays:cheese.bar"],
avatar_url: "mxc://bleeker.street/CHEDDARandBRIE",
aliases: ['#murrays:cheese.bar'],
avatar_url: 'mxc://bleeker.street/CHEDDARandBRIE',
guest_can_join: false,
name: "CHEESE",
name: 'CHEESE',
num_joined_members: 37,
room_id: "!ol19s:bleecker.street",
topic: "Tasty tasty cheese",
room_id: '!ol19s:bleecker.street',
topic: 'Tasty tasty cheese',
world_readable: true,
}}
/>
@ -96,20 +100,20 @@ export const withRoomPreviewAndInviter: React.FC<{}> = () => (
<InviteTile client={Clients[0]} link={roomLink}>
<InviterPreview
user={{
avatar_url: "mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf",
displayname: "Nicholas Briteli",
avatar_url: 'mxc://matrix.org/EqMZYbAYhREvHXvYFyfxOlkf',
displayname: 'Nicholas Briteli',
}}
userId="@nicholasbritelli:matrix.org"
/>
<RoomPreview
room={{
aliases: ["#murrays:cheese.bar"],
avatar_url: "mxc://bleeker.street/CHEDDARandBRIE",
aliases: ['#murrays:cheese.bar'],
avatar_url: 'mxc://bleeker.street/CHEDDARandBRIE',
guest_can_join: false,
name: "CHEESE",
name: 'CHEESE',
num_joined_members: 37,
room_id: "!ol19s:bleecker.street",
topic: "Tasty tasty cheese",
room_id: '!ol19s:bleecker.street',
topic: 'Tasty tasty cheese',
world_readable: true,
}}
/>

14
src/components/InviteTile.tsx
View file

@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import "./InviteTile.scss";
import './InviteTile.scss';
import Tile from "./Tile";
import LinkButton from "./LinkButton";
import TextButton from "./TextButton";
import { Client, ClientKind } from "../clients/types";
import { SafeLink } from "../parser/types";
import Tile from './Tile';
import LinkButton from './LinkButton';
import TextButton from './TextButton';
import { Client, ClientKind } from '../clients/types';
import { SafeLink } from '../parser/types';
interface IProps {
children?: React.ReactNode;

8
src/components/LinkButton.tsx
View file

@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import classnames from "classnames";
import React from 'react';
import classnames from 'classnames';
import "./Button.scss";
import './Button.scss';
interface IProps extends React.LinkHTMLAttributes<HTMLElement> {}
const LinkButton: React.FC<IProps> = ({ className, ...props }: IProps) => (
<a className={classnames("button", className)} {...props} />
<a className={classnames('button', className)} {...props} />
);
export default LinkButton;

20
src/components/LinkPreview.tsx
View file

@ -14,21 +14,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { useState, useEffect } from "react";
import { getEvent, client } from "matrix-cypher";
import React, { useState, useEffect } from 'react';
import { getEvent, client } from 'matrix-cypher';
import { RoomPreviewWithTopic } from "./RoomPreview";
import InviteTile from "./InviteTile";
import { SafeLink, LinkKind } from "../parser/types";
import UserPreview from "./UserPreview";
import EventPreview from "./EventPreview";
import Clients from "../clients";
import { RoomPreviewWithTopic } from './RoomPreview';
import InviteTile from './InviteTile';
import { SafeLink, LinkKind } from '../parser/types';
import UserPreview from './UserPreview';
import EventPreview from './EventPreview';
import Clients from '../clients';
import {
getRoomFromId,
getRoomFromAlias,
getRoomFromPermalink,
getUser,
} from "../utils/cypher-wrapper";
} from '../utils/cypher-wrapper';
interface IProps {
link: SafeLink;
@ -38,7 +38,7 @@ const LOADING: JSX.Element = <>Generating invite</>;
const invite = async ({ link }: { link: SafeLink }): Promise<JSX.Element> => {
// TODO: replace with client fetch
const defaultClient = await client("https://matrix.org");
const defaultClient = await client('https://matrix.org');
switch (link.kind) {
case LinkKind.Alias:
return (

6
src/components/MatrixTile.stories.tsx
View file

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import MatrixTile from "./MatrixTile";
import MatrixTile from './MatrixTile';
export default { title: "MatrixTile" };
export default { title: 'MatrixTile' };
export const Default: React.FC = () => <MatrixTile />;

8
src/components/MatrixTile.tsx
View file

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import Tile from "./Tile";
import React from 'react';
import Tile from './Tile';
import logo from "../imgs/matrix-logo.svg";
import logo from '../imgs/matrix-logo.svg';
import "./MatrixTile.scss";
import './MatrixTile.scss';
const MatrixTile: React.FC = () => {
return (

8
src/components/RoomPreview.tsx
View file

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { Room } from "matrix-cypher";
import React from 'react';
import { Room } from 'matrix-cypher';
import { RoomAvatar } from "./Avatar";
import { RoomAvatar } from './Avatar';
import "./RoomPreview.scss";
import './RoomPreview.scss';
interface IProps {
room: Room;

10
src/components/TextButton.stories.tsx
View file

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import TextButton from "./TextButton";
import TextButton from './TextButton';
export default {
title: "TextButton",
title: 'TextButton',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=149%3A10756",
'https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=149%3A10756',
},
},
};

8
src/components/TextButton.tsx
View file

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import classnames from "classnames";
import React from 'react';
import classnames from 'classnames';
import "./TextButton.scss";
import './TextButton.scss';
const TextButton: React.FC<React.ButtonHTMLAttributes<Element>> = ({
className,
...props
}) => {
return (
<button className={classnames("textButton", className)} {...props} />
<button className={classnames('textButton', className)} {...props} />
);
};
export default TextButton;

10
src/components/Tile.stories.tsx
View file

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import Tile from "./Tile";
import Tile from './Tile';
export default {
title: "Tile",
title: 'Tile',
parameters: {
design: {
type: "figma",
type: 'figma',
url:
"https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853",
'https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853',
},
},
};

8
src/components/Tile.tsx
View file

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import classnames from "classnames";
import React from 'react';
import classnames from 'classnames';
import "./Tile.scss";
import './Tile.scss';
interface IProps {
className?: string;
@ -26,7 +26,7 @@ interface IProps {
const Tile: React.FC<IProps> = (props: IProps) => {
return (
<div className={classnames("tile", props.className)}>
<div className={classnames('tile', props.className)}>
{props.children}
</div>
);

8
src/components/UserPreview.tsx
View file

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { User } from "matrix-cypher";
import React from 'react';
import { User } from 'matrix-cypher';
import { UserAvatar } from "./Avatar";
import { UserAvatar } from './Avatar';
import "./UserPreview.scss";
import './UserPreview.scss';
interface IProps {
user: User;

8
src/contexts/ClientContext.ts
View file

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import { prefixFetch, Client, discoverServer } from "matrix-cypher";
import { prefixFetch, Client, discoverServer } from 'matrix-cypher';
type State = {
clientURL: string;
@ -25,8 +25,8 @@ type State = {
// Actions are a discriminated union.
export enum ActionTypes {
AddClient = "ADD_CLIENT",
RemoveClient = "REMOVE_CLIENT",
AddClient = 'ADD_CLIENT',
RemoveClient = 'REMOVE_CLIENT',
}
export interface AddClient {

4
src/layouts/SingleColumn.tsx
View file

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import "./SingleColumn.scss";
import './SingleColumn.scss';
interface IProps {
children?: React.ReactNode;

10
src/pages/LinkRouter.tsx
View file

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React from 'react';
import Tile from "../components/Tile";
import LinkPreview from "../components/LinkPreview";
import { parseHash } from "../parser/parser";
import { LinkKind } from "../parser/types";
import Tile from '../components/Tile';
import LinkPreview from '../components/LinkPreview';
import { parseHash } from '../parser/parser';
import { LinkKind } from '../parser/types';
interface IProps {
link: string;

52
src/parser/parser.test.ts
View file

@ -7,57 +7,57 @@ import {
verifiers,
identifyTypeFromRegex,
toURL,
} from "./parser";
} from './parser';
import { LinkKind } from "./types";
import { LinkKind } from './types';
const identifierType = (id: string): LinkKind =>
identifyTypeFromRegex(id, verifiers, LinkKind.ParseFailed);
it("types identifiers correctly", () => {
expect(identifierType("@user:matrix.org")).toEqual(LinkKind.UserId);
expect(identifierType("!room:matrix.org")).toEqual(LinkKind.RoomId);
expect(identifierType("!somewhere:example.org/$event:example.org")).toEqual(
it('types identifiers correctly', () => {
expect(identifierType('@user:matrix.org')).toEqual(LinkKind.UserId);
expect(identifierType('!room:matrix.org')).toEqual(LinkKind.RoomId);
expect(identifierType('!somewhere:example.org/$event:example.org')).toEqual(
LinkKind.Permalink
);
expect(identifierType("+group:matrix.org")).toEqual(LinkKind.GroupId);
expect(identifierType("#alias:matrix.org")).toEqual(LinkKind.Alias);
expect(identifierType('+group:matrix.org')).toEqual(LinkKind.GroupId);
expect(identifierType('#alias:matrix.org')).toEqual(LinkKind.Alias);
});
it("types garbage as such", () => {
expect(identifierType("sdfa;fdlkja")).toEqual(LinkKind.ParseFailed);
expect(identifierType("$event$matrix.org")).toEqual(LinkKind.ParseFailed);
expect(identifierType("/user:matrix.org")).toEqual(LinkKind.ParseFailed);
it('types garbage as such', () => {
expect(identifierType('sdfa;fdlkja')).toEqual(LinkKind.ParseFailed);
expect(identifierType('$event$matrix.org')).toEqual(LinkKind.ParseFailed);
expect(identifierType('/user:matrix.org')).toEqual(LinkKind.ParseFailed);
});
it("parses args correctly", () => {
it('parses args correctly', () => {
expect(
parseArgs("via=example.org&via=alt.example.org")
).toHaveProperty("vias", ["example.org", "alt.example.org"]);
expect(parseArgs("sharer=blah")).toHaveProperty("sharer", "blah");
expect(parseArgs("client=blah.com")).toHaveProperty("client", "blah.com");
parseArgs('via=example.org&via=alt.example.org')
).toHaveProperty('vias', ['example.org', 'alt.example.org']);
expect(parseArgs('sharer=blah')).toHaveProperty('sharer', 'blah');
expect(parseArgs('client=blah.com')).toHaveProperty('client', 'blah.com');
});
it("parses permalinks", () => {
expect(parsePermalink("!somewhere:example.org/$event:example.org")).toEqual(
it('parses permalinks', () => {
expect(parsePermalink('!somewhere:example.org/$event:example.org')).toEqual(
{
roomKind: LinkKind.RoomId,
roomLink: "!somewhere:example.org",
eventId: "$event:example.org",
roomLink: '!somewhere:example.org',
eventId: '$event:example.org',
}
);
});
it("formats links correctly", () => {
it('formats links correctly', () => {
const bigLink =
"!somewhere:example.org/$event:example.org?via=dfasdf&via=jfjafjaf";
const origin = "https://matrix.org";
const prefix = origin + "/#/";
'!somewhere:example.org/$event:example.org?via=dfasdf&via=jfjafjaf';
const origin = 'https://matrix.org';
const prefix = origin + '/#/';
const parse = parseHash(bigLink);
switch (parse.kind) {
case LinkKind.ParseFailed:
fail("Parse failed");
fail('Parse failed');
default:
expect(toURL(origin, parse).toString()).toEqual(prefix + bigLink);
}

20
src/parser/parser.ts
View file

@ -1,4 +1,4 @@
import forEach from "lodash/forEach";
import forEach from 'lodash/forEach';
import {
LinkKind,
@ -7,7 +7,7 @@ import {
LinkContent,
Arguments,
Permalink,
} from "./types";
} from './types';
/*
* Verifiers are regexes which will match valid
@ -58,8 +58,8 @@ export function identifyTypeFromRegex<T, F>(
*/
export function parsePermalink(
identifier: string
): Pick<Permalink, "roomKind" | "roomLink" | "eventId"> {
const [roomLink, eventId] = identifier.split("/");
): Pick<Permalink, 'roomKind' | 'roomLink' | 'eventId'> {
const [roomLink, eventId] = identifier.split('/');
const roomKind = identifyTypeFromRegex(
roomLink,
roomVerifiers,
@ -89,9 +89,9 @@ export function parseArgs(args: string): Arguments {
const params = new URLSearchParams(args);
return {
vias: params.getAll("via"),
client: bottomExchange(params.get("client")),
sharer: bottomExchange(params.get("sharer")),
vias: params.getAll('via'),
client: bottomExchange(params.get('client')),
sharer: bottomExchange(params.get('sharer')),
};
}
@ -101,7 +101,7 @@ export function parseArgs(args: string): Arguments {
* be ParseFailed
*/
export function parseHash(hash: string): Link {
const [identifier, args] = hash.split("?");
const [identifier, args] = hash.split('?');
const kind = identifyTypeFromRegex(
identifier,
@ -150,9 +150,9 @@ export function toURL(origin: string, link: SafeLink): URL {
forEach(link.arguments, (value, key) => {
if (value === undefined) {
// do nothing
} else if (key === "vias") {
} else if (key === 'vias') {
(value as string[]).forEach((via) =>
params.append("via", via)
params.append('via', via)
);
} else {
params.append(key, value.toString());

12
src/parser/types.ts
View file

@ -13,12 +13,12 @@ export interface LinkContent {
}
export enum LinkKind {
Alias = "ALIAS",
RoomId = "ROOM_ID",
UserId = "USER_ID",
Permalink = "PERMALINK",
GroupId = "GROUP_ID",
ParseFailed = "PARSE_FAILED",
Alias = 'ALIAS',
RoomId = 'ROOM_ID',
UserId = 'USER_ID',
Permalink = 'PERMALINK',
GroupId = 'GROUP_ID',
ParseFailed = 'PARSE_FAILED',
}
export interface Alias extends LinkContent {

18
src/utils/cypher-wrapper.ts
View file

@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// disable camelcase check because our object keys come
// from the matrix spec
/* eslint-disable @typescript-eslint/camelcase */
import {
Client,
Room,
@ -23,8 +27,8 @@ import {
searchPublicRooms,
getUserDetails,
convertMXCtoMediaQuery,
} from "matrix-cypher";
import { LinkKind, Permalink } from "../parser/types";
} from 'matrix-cypher';
import { LinkKind, Permalink } from '../parser/types';
/* This is a collection of methods for providing fallback metadata
* for cypher queries
@ -55,13 +59,13 @@ export const fallbackRoom = ({
const roomAlias_ = roomAlias ? roomAlias : identifier;
return {
aliases: [roomAlias_],
topic: "Unable to find room details.",
topic: 'Unable to find room details.',
canonical_alias: roomAlias_,
name: roomAlias_,
num_joined_members: 0,
room_id: roomId_,
guest_can_join: true,
avatar_url: "",
avatar_url: '',
world_readable: false,
};
};
@ -140,15 +144,15 @@ export async function getRoomFromPermalink(
*/
export function getMediaQueryFromMCX(mxc?: string): string {
if (!mxc) {
return "";
return '';
}
try {
return convertMXCtoMediaQuery(
// TODO: replace with correct client
"https://matrix.org",
'https://matrix.org',
mxc
);
} catch {
return "";
return '';
}
}