Merge branch 'main' into invite-link

src/clients/Fractal.tsx

@@ -37,9 +37,14 @@ const Fractal: TextClient = {
             case LinkKind.Alias:
             case LinkKind.RoomId:
             case LinkKind.UserId:
-                return <span>Click the '+' button in the top right</span>;
+                return (
+                    <span>
+                        Click the '+' button in the top right and paste the
+                        identifier
+                    </span>
+                );
             default:
-                return <span>Weechat doesn't support this kind of link</span>;
+                return <span>Fractal doesn't support this kind of link</span>;
         }
     },
     copyString: (link) => {
@@ -63,7 +68,7 @@ const Fractal: TextClient = {
         }
     },
 
-    description: 'Command-line Matrix interface using Weechat',
+    description: 'Fractal is a Matrix Client written in Rust',
 };
 
 export default Fractal;

src/components/ClientTile.tsx

@@ -39,19 +39,22 @@ const ClientTile: React.FC<IProps> = ({ client, link }: IProps) => {
         clientTileLink: client.kind === ClientKind.LINKED_CLIENT,
     });
 
-    const inviteButton =
+    let inviteButton: JSX.Element = <></>;
-        client.kind === ClientKind.LINKED_CLIENT ? (
+    if (client.kind === ClientKind.LINKED_CLIENT) {
-            <Button>Accept invite</Button>
+        inviteButton = <Button>Accept invite</Button>;
-        ) : (
+    } else {
+        const copyString = client.copyString(link);
+        if (copyString !== '') {
+            inviteButton = (
                 <Button
-                onClick={() =>
+                    onClick={() => navigator.clipboard.writeText(copyString)}
-                    navigator.clipboard.writeText(client.copyString(link))
-                }
                     flashChildren="Invite copied"
                 >
                     Copy invite
                 </Button>
             );
+        }
+    }
 
     let clientTile = (
         <Tile className={className}>

src/components/CreateLinkTile.scss

@@ -35,7 +35,7 @@ limitations under the License.
         color: $foreground;
     }
 
-    h1 {
+    .linkHeader h1 {
         word-break: break-all;
     }
 

src/components/CreateLinkTile.tsx

@@ -128,7 +128,7 @@ const LinkCreatedTile: React.FC<ILinkCreatedTileProps> = (props) => {
                 <div>New link</div>
                 <img src={refreshIcon} alt="Go back to matrix.to home page" />
             </button>
-            <h1>{props.link}</h1>
+            <h1 className="linkHeader">{props.link}</h1>
             <Button
                 flashChildren={'Copied'}
                 icon={copyIcon}

src/matrix-cypher/schemas/EventSchema.ts

@@ -24,7 +24,7 @@ const EventSchema = object({
     origin_server_ts: string(),
     unsigned: object({}).nonstrict().optional(),
     room_id: string(),
-});
+}).nonstrict();
 
 export type Event = TypeOf<typeof EventSchema>;
 export default EventSchema;

src/matrix-cypher/schemas/PublicRoomsSchema.ts

@@ -26,18 +26,16 @@ export const RoomSchema = object({
     world_readable: boolean(),
     guest_can_join: boolean(),
     avatar_url: string().optional(),
-});
+}).nonstrict();
-
 
 const PublicRoomsSchema = object({
     chunk: array(RoomSchema),
     next_batch: string().optional(),
     prev_batch: string().optional(),
     total_room_count_estimate: number().optional(),
-});
+}).nonstrict();
 
 export type Room = TypeOf<typeof RoomSchema>;
 export type PublicRooms = TypeOf<typeof PublicRoomsSchema>;
 
 export default PublicRoomsSchema;
-

src/matrix-cypher/schemas/RoomAliasSchema.ts

@@ -19,8 +19,7 @@ import { object, array, string, TypeOf } from 'zod';
 const RoomAliasSchema = object({
     room_id: string(),
     servers: array(string()),
-});
+}).nonstrict();
 
 export type RoomAlias = TypeOf<typeof RoomAliasSchema>;
 export default RoomAliasSchema;
-

src/matrix-cypher/schemas/UserSchema.ts

@@ -19,8 +19,7 @@ import { object, string, TypeOf } from 'zod';
 const UserSchema = object({
     avatar_url: string().optional(),
     displayname: string().optional(),
-})
+}).nonstrict();
 
 export type User = TypeOf<typeof UserSchema>;
 export default UserSchema;
-

src/matrix-cypher/schemas/WellKnownSchema.ts

@@ -18,12 +18,12 @@ import { object, string, TypeOf } from 'zod';
 
 const WellKnownSchema = object({
     'm.homeserver': object({
-    'base_url': string().url(),
+        base_url: string().url(),
     }),
     'm.identity_server': object({
-    'base_url': string().url(),
+        base_url: string().url(),
-  }),
+    }).optional(),
-});
+}).nonstrict();
 
 export type WellKnown = TypeOf<typeof WellKnownSchema>;
 export default WellKnownSchema;

src/parser/parser.ts

@@ -16,13 +16,13 @@ import {
  */
 type Verifier<A> = [RegExp, A];
 export const roomVerifiers: Verifier<LinkKind.Alias | LinkKind.RoomId>[] = [
-    [/^#([^/:]+?):(.+)$/, LinkKind.Alias],
+    [/^#([^:]*):(.+)$/, LinkKind.Alias],
-    [/^!([^/:]+?):(.+)$/, LinkKind.RoomId],
+    [/^!([^:]*):(.+)$/, LinkKind.RoomId],
 ];
 export const verifiers: Verifier<LinkKind>[] = [
-    [/^[!#]([^/:]+?):(.+?)\/\$([^/:]+?)$/, LinkKind.Permalink],
+    [/^[!#]([^:]*):(.+)\/\$([^:]+):(.+)$/, LinkKind.Permalink],
-    [/^@([^/:]+?):(.+)$/, LinkKind.UserId],
+    [/^@([^:]+):(.+)$/, LinkKind.UserId],
-    [/^\+([^/:]+?):(.+)$/, LinkKind.GroupId],
+    [/^\+([^:]+):(.+)$/, LinkKind.GroupId],
     ...roomVerifiers,
 ];