diff --git a/makefile b/makefile index e29965a..a682419 100644 --- a/makefile +++ b/makefile @@ -14,7 +14,7 @@ build-tsc: ./node_modules/.bin/tsc -p ./src/tsconfig.json build-sass: - ./node_modules/.bin/sass ./src/client/webapp/styles/styles.scss ./dist/client/webapp/styles/styles.css + ./node_modules/.bin/sass ./src/client/webapp/index.scss ./dist/client/webapp/index.css build: lint build-tsc build-sass diff --git a/src/client/webapp/data-types.ts b/src/client/webapp/data-types.ts index 8fb3b00..b680189 100644 --- a/src/client/webapp/data-types.ts +++ b/src/client/webapp/data-types.ts @@ -316,7 +316,7 @@ export class GuildMetadata implements WithEquals { } } -export class GuildMetadataWithIds extends GuildMetadata { +export class GuildMetadataLocal extends GuildMetadata { private constructor( public readonly id: number, name: string, @@ -327,8 +327,8 @@ export class GuildMetadataWithIds extends GuildMetadata { super(name, iconResourceId, source); } - static fromDBData(data: any): GuildMetadataWithIds { - return new GuildMetadataWithIds( + static fromDBData(data: any): GuildMetadataLocal { + return new GuildMetadataLocal( data.id, data.name, data.icon_resource_id, diff --git a/src/client/webapp/elements-styles/contexts/components/context.scss b/src/client/webapp/elements-styles/contexts/components/context.scss index 808e79f..1c05d82 100644 --- a/src/client/webapp/elements-styles/contexts/components/context.scss +++ b/src/client/webapp/elements-styles/contexts/components/context.scss @@ -9,4 +9,33 @@ &.react:not(.aligned) { visibility: hidden; } + + .basic-hover { + display: flex; + align-items: center; + color: theme.$background-floating; + + &.left { + flex-direction: row; + } + + &.right { + flex-direction: row-reverse; + } + + &.bottom { + flex-direction: column; + } + + &.top { + flex-direction: column-reverse; + } + + .hover-text { + padding: 8px; + border-radius: 4px; + color: theme.$interactive-normal; + background-color: theme.$background-floating; + } + } } \ No newline at end of file diff --git a/src/client/webapp/elements/components/button.tsx b/src/client/webapp/elements/components/button.tsx index cd4871f..fbb1564 100644 --- a/src/client/webapp/elements/components/button.tsx +++ b/src/client/webapp/elements/components/button.tsx @@ -1,4 +1,7 @@ -import React, { FC, ReactNode, Ref, useCallback, useMemo } from 'react'; +import React, { FC, ReactNode, Ref, useCallback, useMemo, useRef } from 'react'; +import BasicHover, { BasicHoverSide } from '../contexts/context-hover-basic'; +import BaseElements from '../require/base-elements'; +import { useContextHover } from '../require/react-helper'; export enum ButtonColorType { BRAND = '', @@ -12,17 +15,21 @@ interface ButtonProps { colorType?: ButtonColorType; + hoverText?: string | null; + onClick?: () => void; shaking?: boolean; children?: ReactNode; } const DefaultButtonProps = { - colorType: ButtonColorType.BRAND, -} + colorType: ButtonColorType.BRAND +}; -const Button: FC = React.forwardRef((props: ButtonProps, ref: Ref) => { - const { colorType, onClick, shaking, children } = { ...DefaultButtonProps, ...props }; +const Button: FC = (props: ButtonProps) => { + const { colorType, hoverText, onClick, shaking, children } = { ...DefaultButtonProps, ...props }; + + const buttonRef = useRef(null); const className = useMemo( () => [ @@ -38,7 +45,30 @@ const Button: FC = React.forwardRef((props: ButtonProps, ref: Ref{children} -}); + const [ contextHover, mouseEnterCallable, mouseLeaveCallable ] = useContextHover( + () => { + if (!hoverText) return null; + return ( + + {BaseElements.TAB_ABOVE} +
{hoverText}
+ + ); + }, + [ hoverText ] + ); + + return ( +
+
{children}
+ {contextHover} +
+ ); +}; export default Button; \ No newline at end of file diff --git a/src/client/webapp/elements/components/token-row.tsx b/src/client/webapp/elements/components/token-row.tsx new file mode 100644 index 0000000..c7954bd --- /dev/null +++ b/src/client/webapp/elements/components/token-row.tsx @@ -0,0 +1,80 @@ +import moment from 'moment'; +import React, { FC } from 'react'; +import { GuildMetadata, Member, Token } from '../../data-types'; +import CombinedGuild from '../../guild-combined'; +import Util from '../../util'; +import { IAddGuildData } from '../overlays/overlay-add-guild'; +import BaseElements from '../require/base-elements'; +import { useSoftImageSrcResourceSubscription } from '../require/guild-subscriptions'; +import { useAsyncVoidCallback, useDownloadButton, useOneTimeAsyncAction } from '../require/react-helper'; +import Button, { ButtonColorType } from './button'; + +export interface TokenRowProps { + url: string; + guild: CombinedGuild; + guildMeta: GuildMetadata; + token: Token; +} + +const TokenRow: FC = (props: TokenRowProps) => { + const { guild, guildMeta, token } = props; + + const [ guildSocketConfigs ] = useOneTimeAsyncAction( + async () => await guild.fetchSocketConfigs(), + null, + [ guild ] + ); + const [ iconSrc ] = useSoftImageSrcResourceSubscription(guild, guildMeta.iconResourceId); + + const [ revoke ] = useAsyncVoidCallback(async () => { + await guild.requestDoRevokeToken(token.token); + }, [ guild, token ]); + + const [ downloadFunc, downloadText, downloadShaking ] = useDownloadButton( + guildMeta.name + '.cordis', + async () => { + if (guildSocketConfigs === null) return null; + const guildSocketConfig = Util.randomChoice(guildSocketConfigs); + const addGuildData: IAddGuildData = { + name: guildMeta.name, + url: guildSocketConfig.url, + cert: guildSocketConfig.cert, + token: token.token, + expires: token.expires?.getTime() ?? null, + iconSrc: iconSrc, + }; + const json = JSON.stringify(addGuildData); + return Buffer.from(json); + }, + [ guildSocketConfigs, guildMeta, token, iconSrc ] + ); + + const userText = (token.member instanceof Member ? 'Used by ' + token.member.displayName : token.member?.id) ?? 'Unused Token'; + return ( +
+
+
{userText}
+
{token.token}
+
+
+
{'Created ' + moment(token.created).fromNow()}
+
{token.expires ? 'Expires ' + moment(token.expires).fromNow() : 'Never expires'}
+
+
+ + +
+
+ ); +} + +export default TokenRow; diff --git a/src/client/webapp/elements/contexts/components/context-menu.tsx b/src/client/webapp/elements/contexts/components/context-menu.tsx index 8935bca..05638a3 100644 --- a/src/client/webapp/elements/contexts/components/context-menu.tsx +++ b/src/client/webapp/elements/contexts/components/context-menu.tsx @@ -1,4 +1,4 @@ -import React, { FC, ReactNode, RefObject, useRef } from 'react' +import React, { DependencyList, FC, ReactNode, RefObject, useRef } from 'react' import { IAlignment } from '../../require/elements-util'; import { useCloseWhenEscapeOrClickedOrContextOutsideEffect } from '../../require/react-helper'; import Context from './context'; @@ -7,20 +7,24 @@ export interface ContextMenuProps { relativeToRef?: RefObject; relativeToPos?: { x: number, y: number }; alignment: IAlignment; + realignDeps: DependencyList; children: ReactNode; close: () => void; } // Automatically closes when clicked outside of and includes a
subelement const ContextMenu: FC = (props: ContextMenuProps) => { - const { relativeToRef, relativeToPos, alignment, children, close } = props; + const { relativeToRef, relativeToPos, alignment, realignDeps, children, close } = props; const rootRef = useRef(null); useCloseWhenEscapeOrClickedOrContextOutsideEffect(rootRef, close); return ( - +
{children}
diff --git a/src/client/webapp/elements/contexts/components/context.tsx b/src/client/webapp/elements/contexts/components/context.tsx index 79245ff..bb10bd1 100644 --- a/src/client/webapp/elements/contexts/components/context.tsx +++ b/src/client/webapp/elements/contexts/components/context.tsx @@ -1,4 +1,4 @@ -import React, { FC, ReactNode, RefObject, useRef } from 'react'; +import React, { DependencyList, FC, ReactNode, RefObject, useRef } from 'react'; import { IAlignment } from '../../require/elements-util'; import { useAlignment } from '../../require/react-helper'; @@ -7,17 +7,23 @@ export interface ContextProps { relativeToRef?: RefObject; relativeToPos?: { x: number, y: number }; alignment: IAlignment; + realignDeps: DependencyList; children: ReactNode; } // You should create a component like context-menu.tsx instead of using this class directly. const Context: FC = (props: ContextProps) => { - const { rootRef, relativeToRef, relativeToPos, alignment, children } = props; + const { rootRef, relativeToRef, relativeToPos, alignment, realignDeps, children } = props; const myRootRef = useRef(null); const [ className ] = useAlignment( - rootRef ?? myRootRef, relativeToRef ?? null, relativeToPos ?? null, alignment, 'context react' + rootRef ?? myRootRef, + relativeToRef ?? null, + relativeToPos ?? null, + alignment, + realignDeps, + 'context react' ); return ( diff --git a/src/client/webapp/elements/contexts/context-hover-basic.tsx b/src/client/webapp/elements/contexts/context-hover-basic.tsx index a4186b8..af5b80b 100644 --- a/src/client/webapp/elements/contexts/context-hover-basic.tsx +++ b/src/client/webapp/elements/contexts/context-hover-basic.tsx @@ -1,4 +1,4 @@ -import React, { FC, ReactNode, RefObject, useMemo } from 'react'; +import React, { DependencyList, FC, ReactNode, RefObject, useMemo } from 'react'; import { ShouldNeverHappenError } from '../../data-types'; import Context from './components/context'; @@ -12,11 +12,12 @@ export enum BasicHoverSide { export interface BasicHoverProps { side: BasicHoverSide; relativeToRef: RefObject; + realignDeps: DependencyList; children: ReactNode; } const BasicHover: FC = (props: BasicHoverProps) => { - const { side, relativeToRef, children } = props; + const { side, relativeToRef, realignDeps, children } = props; const alignment = useMemo(() => { switch (side) { @@ -34,7 +35,7 @@ const BasicHover: FC = (props: BasicHoverProps) => { }, [ side ]); return ( - +
{children}
diff --git a/src/client/webapp/elements/contexts/context-menu-connection-info.tsx b/src/client/webapp/elements/contexts/context-menu-connection-info.tsx index 3a29a73..b8d05a5 100644 --- a/src/client/webapp/elements/contexts/context-menu-connection-info.tsx +++ b/src/client/webapp/elements/contexts/context-menu-connection-info.tsx @@ -43,7 +43,7 @@ const ConnectionInfoContextMenu: FC = (props: Co }, []); return ( - +
diff --git a/src/client/webapp/elements/contexts/context-menu-guild-title.tsx b/src/client/webapp/elements/contexts/context-menu-guild-title.tsx index 82ff559..c269d54 100644 --- a/src/client/webapp/elements/contexts/context-menu-guild-title.tsx +++ b/src/client/webapp/elements/contexts/context-menu-guild-title.tsx @@ -8,7 +8,7 @@ import ContextMenu from './components/context-menu'; export interface GuildTitleContextMenuProps { close: () => void; - relativeToRef: RefObject + relativeToRef: RefObject; guild: CombinedGuild; guildMeta: GuildMetadata; selfMember: Member; @@ -55,7 +55,7 @@ const GuildTitleContextMenu: FC = (props: GuildTitle }, []); return ( - +
{guildSettingsElement} {createChannelElement} diff --git a/src/client/webapp/elements/contexts/context-menu-image.tsx b/src/client/webapp/elements/contexts/context-menu-image.tsx index e3083d1..db91ccb 100644 --- a/src/client/webapp/elements/contexts/context-menu-image.tsx +++ b/src/client/webapp/elements/contexts/context-menu-image.tsx @@ -51,7 +51,8 @@ const ImageContextMenu: FC = (props: ImageContextMenuProp ); const [ saveCallable, saveText, saveShaking ] = useDownloadButton( - resourceName + (isPreview ? '-preview.jpg' : ''), resourceBuff, + resourceName + (isPreview ? '-preview.jpg' : ''), + async () => resourceBuff, [ resourceBuff ], { start: 'Save Image' + previewText, pendingSave: 'Saving' + previewText + '...', @@ -62,7 +63,7 @@ const ImageContextMenu: FC = (props: ImageContextMenuProp const alignment = useMemo(() => ({ top: 'centerY', left: 'centerX' }), []); return ( - +
{copyText}
{saveText}
diff --git a/src/client/webapp/elements/displays/display-guild-invites.tsx b/src/client/webapp/elements/displays/display-guild-invites.tsx index 773f963..cd1e246 100644 --- a/src/client/webapp/elements/displays/display-guild-invites.tsx +++ b/src/client/webapp/elements/displays/display-guild-invites.tsx @@ -7,14 +7,14 @@ import React, { FC, useEffect, useMemo, useState } from 'react'; import CombinedGuild from '../../guild-combined'; import Display from '../components/display'; import InvitePreview from '../components/invite-preview'; -import { Member, Token } from '../../data-types'; +import { Token } from '../../data-types'; import { useAsyncSubmitButton } from '../require/react-helper'; import { Duration } from 'moment'; import moment from 'moment'; import DropdownInput from '../components/input-dropdown'; -import Button, { ButtonColorType } from '../components/button'; -import BaseElements from '../require/base-elements'; +import Button from '../components/button'; import { useTokensSubscription, useGuildMetadataSubscription, useSoftImageSrcResourceSubscription } from '../require/guild-subscriptions'; +import TokenRow from '../components/token-row'; export interface GuildInvitesDisplayProps { @@ -69,29 +69,11 @@ const GuildInvitesDisplay: FC = (props: GuildInvitesDi // TODO: Try Again return
Unable to load tokens
; } - return tokens?.map((token: Token) => { - const userText = (token.member instanceof Member ? 'Used by ' + token.member.displayName : token.member?.id) ?? 'Unused Token'; - return ( -
-
-
{userText}
-
{token.token}
-
-
-
{'Created ' + moment(token.created).fromNow()}
-
{token.expires ? 'Expires ' + moment(token.expires).fromNow() : 'Never expires'}
-
-
- - -
-
- ); - }); - }, [ tokens, tokensError ]); + if (!guildMeta) { + return
No Guild Metadata
; + } + return tokens?.map((token: Token) => ); + }, [ url, guild, tokens, tokensError ]); return ( = (props: ChannelElementProps) => const [ modifyContextHover, modifyMouseEnterCallable, modifyMouseLeaveCallable ] = useContextHover( () => { return ( - +
{BaseElements.TAB_LEFT}
-
Modify Channel
+
Modify Channel
 ); @@ -55,7 +55,8 @@ const ChannelElement: FC = (props: ChannelElementProps) =>
{channel.name}
{BaseElements.COG}
{modifyContextHover}
diff --git a/src/client/webapp/elements/lists/components/guild-list-element.tsx b/src/client/webapp/elements/lists/components/guild-list-element.tsx index 36ef677..842e682 100644 --- a/src/client/webapp/elements/lists/components/guild-list-element.tsx +++ b/src/client/webapp/elements/lists/components/guild-list-element.tsx @@ -31,7 +31,7 @@ const GuildListElement: FC = (props: GuildListElementProp if (!selfMember) return null; const nameStyle = selfMember.roleColor ? { color: selfMember.roleColor } : {}; return ( - +
{BaseElements.TAB_LEFT}
@@ -54,7 +54,7 @@ const GuildListElement: FC = (props: GuildListElementProp const [ contextClickMenu, onContextClick ] = useContextClickContextMenu((alignment: IAlignment, relativeToPos: { x: number, y: number }, close: () => void) => { return (
Leave Guild
diff --git a/src/client/webapp/elements/lists/components/message-element.tsx b/src/client/webapp/elements/lists/components/message-element.tsx index 0773509..60d6595 100644 --- a/src/client/webapp/elements/lists/components/message-element.tsx +++ b/src/client/webapp/elements/lists/components/message-element.tsx @@ -19,7 +19,7 @@ const ResourceElement: FC = (props: ResourceElementProps) const [ callable, text, shaking ] = useDownloadButton( resourceName, - { guild, resourceId }, + async () => (await guild.fetchResource(resourceId)).data, [ guild, resourceId ], { start: 'Click to Download', pendingFetch: 'Fetching...', errorFetch: 'Unable to Download. Try Again', diff --git a/src/client/webapp/elements/overlays/overlay-add-guild.tsx b/src/client/webapp/elements/overlays/overlay-add-guild.tsx index 0d2171b..4795f9b 100644 --- a/src/client/webapp/elements/overlays/overlay-add-guild.tsx +++ b/src/client/webapp/elements/overlays/overlay-add-guild.tsx @@ -23,7 +23,7 @@ export interface IAddGuildData { url: string, cert: string, token: string, - expires: number, + expires: number | null, iconSrc: string } @@ -61,7 +61,7 @@ const AddGuildOverlay: FC = (props: AddGuildOverlayProps) const rootRef = useRef(null); - const expired = addGuildData.expires < new Date().getTime(); + const expired = addGuildData.expires && addGuildData.expires < new Date().getTime(); const exampleDisplayName = useMemo(() => getExampleDisplayName(), []); const exampleAvatarPath = useMemo(() => getExampleAvatarPath(), []); @@ -125,7 +125,7 @@ const AddGuildOverlay: FC = (props: AddGuildOverlayProps)
diff --git a/src/client/webapp/elements/overlays/overlay-error-message.tsx b/src/client/webapp/elements/overlays/overlay-error-message.tsx index 9310b38..cca23b6 100644 --- a/src/client/webapp/elements/overlays/overlay-error-message.tsx +++ b/src/client/webapp/elements/overlays/overlay-error-message.tsx @@ -17,7 +17,7 @@ const ErrorMessageOverlay: FC = (props: ErrorMessageOv
error
-
+
{title}
{message}
diff --git a/src/client/webapp/elements/require/base-elements.tsx b/src/client/webapp/elements/require/base-elements.tsx index 7342ac6..1001956 100644 --- a/src/client/webapp/elements/require/base-elements.tsx +++ b/src/client/webapp/elements/require/base-elements.tsx @@ -192,6 +192,11 @@ export default class BaseElements { L 0,8 Z` } }; + static TAB_ABOVE = ( + + + + ); static Q_TAB_BELOW = { ns: 'http://www.w3.org/2000/svg', tag: 'svg', width: 12, height: 8, viewBox: '0 0 12 8', content: diff --git a/src/client/webapp/elements/require/react-helper.tsx b/src/client/webapp/elements/require/react-helper.tsx index be500a6..f81f9e1 100644 --- a/src/client/webapp/elements/require/react-helper.tsx +++ b/src/client/webapp/elements/require/react-helper.tsx @@ -6,7 +6,6 @@ const LOG = Logger.create(__filename, electronConsole); import { DependencyList, Dispatch, MutableRefObject, ReactNode, RefObject, SetStateAction, UIEvent, useCallback, useEffect, useMemo, useRef, useState } from "react"; import { ShouldNeverHappenError } from "../../data-types"; import Util from '../../util'; -import CombinedGuild from '../../guild-combined'; import Globals from '../../globals'; import path from 'path'; import fs from 'fs/promises'; @@ -124,17 +123,22 @@ export function useAsyncVoidCallback( return [ callable ]; } +// TODO: If this function gets expanded one more time, downloadSrc needs to be changed to fetchBuff and only +// be a function. Having 3 types for downloadSrc is a bit iffy. export function useDownloadButton( downloadName: string, - downloadSrc: { guild: CombinedGuild, resourceId: string } | Buffer, - stateTextMapping?: { start?: string, pendingFetch?: string, errorFetch?: string, pendingSave?: string, errorSave?: string, success?: string } -): [ callable: () => void, text: string, shaking: boolean ] { - const textMapping = { ...{ start: 'Download', pendingFetch: 'Downloading...', errorFetch: 'Try Again', pendingSave: 'Saving...', errorSave: 'Try Again', success: 'Open in Explorer' }, ...stateTextMapping }; - - const downloadBuff = downloadSrc instanceof Buffer ? downloadSrc : null; + fetchBuff: () => Promise, + fetchBuffDeps: DependencyList, + stateTextMapping?: { start?: string, pendingFetch?: string, errorFetch?: string, notReadyFetch?: string, pendingSave?: string, errorSave?: string, success?: string } +): [ + callable: () => void, + text: string, + shaking: boolean +] { + const textMapping = { ...{ start: 'Download', pendingFetch: 'Downloading...', errorFetch: 'Try Again', notReadyFetch: 'Not Ready', pendingSave: 'Saving...', errorSave: 'Try Again', success: 'Open in Explorer' }, ...stateTextMapping }; const [ filePath, setFilePath ] = useState(null); - const [ fileBuffer, setFileBuffer ] = useState(downloadBuff); + const [ fileBuffer, setFileBuffer ] = useState(null); const [ text, setText ] = useState(textMapping.start); const [ shaking, doShake ] = useShake(400); @@ -159,25 +163,20 @@ export function useDownloadButton( let saveBuffer = fileBuffer; if (saveBuffer === null) { - if (!(downloadSrc instanceof Buffer)) { - // fetch the buffer - const { guild, resourceId } = downloadSrc; - try { - setText(textMapping.pendingFetch); - const resource = await guild.fetchResource(resourceId); - if (!isMounted.current) return; - setFileBuffer(resource.data); - saveBuffer = resource.data; - } catch (e: unknown) { - LOG.error('Error fetching resource for download button', e); - if (!isMounted.current) return; - setText(textMapping.errorFetch); + try { + setText(textMapping.pendingFetch); + const data = await fetchBuff(); + if (!isMounted.current) return; + if (data === null) { + setText(textMapping.notReadyFetch); doShake(); return; } - } else { - // Save buffer not specified - LOG.error('Bad download setup'); + setFileBuffer(data); + saveBuffer = data; + } catch (e: unknown) { + LOG.error('Error executing download function for download button', e); + if (!isMounted.current) return; setText(textMapping.errorFetch); doShake(); return; @@ -204,7 +203,7 @@ export function useDownloadButton( setText(textMapping.success); }, - [ downloadName, downloadSrc, filePath, fileBuffer ] + [ downloadName, fetchBuff, ...fetchBuffDeps, filePath, fileBuffer ] ); return [ callable, text, shaking ]; @@ -420,6 +419,7 @@ export function useAlignment( relativeToRef: RefObject | null, relativeToPos: { x: number, y: number } | null, alignment: IAlignment, + realignDeps: DependencyList, baseClassName: string ): [ className: string @@ -432,7 +432,7 @@ export function useAlignment( if (!relativeTo) throw new ShouldNeverHappenError('invalid alignment props'); ElementsUtil.alignContextElement(rootRef.current, relativeTo, alignment); setAligned(true); - }, [ rootRef, relativeToRef, relativeToPos ]); + }, [ rootRef, relativeToRef, relativeToPos, ...realignDeps ]); const className = useMemo(() => { return baseClassName + (aligned ? ' aligned' : ''); diff --git a/src/client/webapp/elements/sections/guild-list-container.tsx b/src/client/webapp/elements/sections/guild-list-container.tsx index 9f9747d..81901b3 100644 --- a/src/client/webapp/elements/sections/guild-list-container.tsx +++ b/src/client/webapp/elements/sections/guild-list-container.tsx @@ -29,7 +29,7 @@ const GuildListContainer: FC = (props: GuildListContain const [ contextHover, onMouseEnter, onMouseLeave ] = useContextHover(() => { return ( - +
{BaseElements.TAB_LEFT}
Add Guild
diff --git a/src/client/webapp/guild-combined.ts b/src/client/webapp/guild-combined.ts index 091053f..ad1a2e1 100644 --- a/src/client/webapp/guild-combined.ts +++ b/src/client/webapp/guild-combined.ts @@ -7,7 +7,7 @@ import * as socketio from 'socket.io-client'; import PersonalDBGuild from './guild-personal-db'; import RAMGuild from './guild-ram'; import SocketGuild from './guild-socket'; -import { Changes, Channel, ConnectionInfo, GuildMetadata, GuildMetadataWithIds, Member, Message, Resource, SocketConfig, Token } from './data-types'; +import { Changes, Channel, ConnectionInfo, GuildMetadata, GuildMetadataLocal, Member, Message, Resource, SocketConfig, Token } from './data-types'; import MessageRAMCache from "./message-ram-cache"; import PersonalDB from "./personal-db"; @@ -195,7 +195,7 @@ export default class CombinedGuild extends EventEmitter { + return await this.personalDBGuild.fetchSocketConfigs(); + } + async fetchConnectionInfo(): Promise { const connection: ConnectionInfo = { id: null, diff --git a/src/client/webapp/guild-personal-db.ts b/src/client/webapp/guild-personal-db.ts index 6e90512..30bcdbb 100644 --- a/src/client/webapp/guild-personal-db.ts +++ b/src/client/webapp/guild-personal-db.ts @@ -4,7 +4,7 @@ import Logger from '../../logger/logger'; const LOG = Logger.create(__filename, electronConsole); import { AsyncFetchable, AsyncLackable } from "./guild-types"; -import { Channel, GuildMetadata, Member, Message, Resource, Token } from "./data-types"; +import { Channel, GuildMetadata, GuildMetadataLocal, Member, Message, Resource, SocketConfig, Token } from "./data-types"; import PersonalDB from "./personal-db"; @@ -17,7 +17,11 @@ export default class PersonalDBGuild implements AsyncFetchable, AsyncLackable { // Fetched Methods - async fetchMetadata(): Promise { + async fetchSocketConfigs(): Promise { + return await this.db.fetchGuildSockets(this.guildId); + } + + async fetchMetadata(): Promise { return this.db.fetchGuild(this.guildId); } diff --git a/src/client/webapp/guilds-manager.ts b/src/client/webapp/guilds-manager.ts index aa78c6f..4863463 100644 --- a/src/client/webapp/guilds-manager.ts +++ b/src/client/webapp/guilds-manager.ts @@ -10,7 +10,7 @@ import * as socketio from 'socket.io-client'; import * as crypto from 'crypto'; -import { Changes, Channel, GuildMetadata, GuildMetadataWithIds, Member, Message, Resource, SocketConfig, Token } from './data-types'; +import { Changes, Channel, GuildMetadata, GuildMetadataLocal, Member, Message, Resource, SocketConfig, Token } from './data-types'; import { IAddGuildData } from './elements/overlays/overlay-add-guild'; import { EventEmitter } from 'tsee'; import CombinedGuild from './guild-combined'; @@ -65,7 +65,7 @@ export default class GuildsManager extends EventEmitter<{ super(); } - async _connectFromConfig(guildMetadata: GuildMetadataWithIds, socketConfig: SocketConfig): Promise { + async _connectFromConfig(guildMetadata: GuildMetadataLocal, socketConfig: SocketConfig): Promise { LOG.debug(`connecting to g#${guildMetadata.id} at ${socketConfig.url}`); const guild = await CombinedGuild.create( @@ -166,7 +166,7 @@ export default class GuildsManager extends EventEmitter<{ try { const member = Member.fromDBData(dataMember); const meta = GuildMetadata.fromDBData(dataMetadata); - let guildMeta: GuildMetadataWithIds | null = null; + let guildMeta: GuildMetadataLocal | null = null; let socketConfig: SocketConfig | null = null; await this.personalDB.queueTransaction(async () => { const guildId = await this.personalDB.addGuild(meta.name, meta.iconResourceId, member.id); diff --git a/src/client/webapp/personal-db.ts b/src/client/webapp/personal-db.ts index 2ae9229..1d68109 100644 --- a/src/client/webapp/personal-db.ts +++ b/src/client/webapp/personal-db.ts @@ -10,7 +10,7 @@ import ConcurrentQueue from "../../concurrent-queue/concurrent-queue"; import * as sqlite from 'sqlite'; import * as sqlite3 from 'sqlite3'; -import { Channel, GuildMetadataWithIds, Member, Message, Resource, SocketConfig } from "./data-types"; +import { Channel, GuildMetadataLocal, Member, Message, Resource, SocketConfig } from "./data-types"; export default class PersonalDB { private transactions = new ConcurrentQueue(1); @@ -192,18 +192,18 @@ export default class PersonalDB { if (result?.changes !== 1) throw new Error('unable to update guild icon'); } - async fetchGuild(guildId: number): Promise { + async fetchGuild(guildId: number): Promise { const result = await this.db.get( `SELECT * FROM guilds WHERE id=:id`, { ':id': guildId } ); if (!result) throw new Error('unable to fetch guild'); - return GuildMetadataWithIds.fromDBData(result); + return GuildMetadataLocal.fromDBData(result); } - async fetchGuilds(): Promise { + async fetchGuilds(): Promise { const result = await this.db.all('SELECT * FROM guilds'); - return result.map(dataGuild => GuildMetadataWithIds.fromDBData(dataGuild)); + return result.map(dataGuild => GuildMetadataLocal.fromDBData(dataGuild)); } // Guild Sockets diff --git a/src/client/webapp/util.ts b/src/client/webapp/util.ts index 8e478af..00cacf8 100644 --- a/src/client/webapp/util.ts +++ b/src/client/webapp/util.ts @@ -104,4 +104,8 @@ export default class Util { }); }); } + + static randomChoice(list: T[]): T { + return list[Math.floor(Math.random() * list.length)] as T; + } }