URL navigation in interface and other improvements (#1633)
* load room on url change * add direct room list * render space room list * fix css syntax error * update scroll virtualizer * render subspaces room list * improve sidebar notification badge perf * add nav category components * add space recursive direct component * use nav category component in home, direct and space room list * add empty home and direct list layout * fix unread room menu ref * add more navigation items in room, direct and space tab * add more navigation * fix unread room menu to links * fix space lobby and search link * add explore navigation section * add notifications navigation menu * redirect to initial path after login * include unsupported room in rooms * move router hooks in hooks/router folder * add featured explore - WIP * load featured room with room summary * fix room card topic line clamp * add react query * load room summary using react query * add join button in room card * add content component * use content component in featured community content * fix content width * add responsive room card grid * fix async callback error status * add room card error button * fix client drawer shrink * add room topic viewer * open room card topic in viewer * fix room topic close btn * add get orphan parent util * add room card error dialog * add view featured room or space btn * refactor orphanParent to orphanParents * WIP - explore server * show space hint in room card * add room type filters * add per page item limit popout * reset scroll on public rooms load * refactor explore ui * refactor public rooms component * reset search on server change * fix typo * add empty featured section info * display user server on top * make server room card view btn clickable * add user server as default redirect for explore path * make home empty btn clickable * add thirdparty instance filter in server explore * remove since param on instance change * add server button in explore menu * rename notifications path to inbox * update react-virtual * Add notification messages inbox - WIP * add scroll top container component * add useInterval hook * add visibility change callback prop to scroll top container component * auto refresh notifications every 10 seconds * make message related component reusable * refactor matrix event renderer hoook * render notification message content * refactor matrix event renderer hook * update sequence card styles * move room navigate hook in global hooks * add open message button in notifications * add mark room as read button in notification group * show error in notification messages * add more featured spaces * render reply in notification messages * make notification message reply clickable * add outline prop for attachments * make old settings dialog viewable * add open featured communities as default config option * add invite count notification badge in sidebar and inbox menu * add element size observer hook * improve element size observer hook props * improve screen size hook * fix room avatar util function * allow Text props in Time component * fix dm room util function * add invitations * add no invites and notification cards * fix inbox tab unread badge visible without invite count * update folds and change inbox icon * memo search param construction * add message search in home * fix default message search order * fix display edited message new content * highlight search text in search messages * fix message search loading * disable log in production * add use space context * add useRoom context * fix space room list * fix inbox tab active state * add hook to get space child room recursive * add search for space * add virtual tile component * virtualize home and directs room list * update nav category component * use virtual tile component in more places * fix message highlight when click on reply twice * virtualize space room list * fix space room list lag issue * update folds * add room nav item component in space room list * use room nav item in home and direct room list * make space categories closable and save it in local storage * show unread room when category is collapsed * make home and direct room list category closable * rename room nav item show avatar prop * fix explore server category text alignment * rename closedRoomCategories to closedNavCategories * add nav category handler hook * save and restore last navigation path on space select * filter space rooms category by activity when it is closed * save and restore home and direct nav path state * save and restore inbox active path on open * save and restore explore tab active path * remove notification badge unread menu * add join room or space before navigate screen * move room component to features folder and add new room header * update folds * add room header menu * fix home room list activity sorting * do not hide selected room item on category closed in home and direct tab * replace old select room/tab call with navigate hook * improve state event hooks * show room card summary for joined rooms * prevent room from opening in wrong tab * only show message sender id on hover in modern layout * revert state event hooks changes * add key prop to room provider components * add welcome page * prevent excessive redirects * fix sidebar style with no spaces * move room settings in popup window * remove invite option from room settings * fix open room list search * add leave room prompt * standardize room and user avatar * fix avatar text size * add new reply layout * rename space hierarchy hook * add room topic hook * add room name hook * add room avatar hook and add direct room avatar util * space lobby - WIP * hide invalid space child event from space hierarchy in lobby * move lobby to features * fix element size observer hook width and height * add lobby header and hero section * add hierarchy room item error and loading state * add first and last child prop in sequence card * redirect to lobby from index path * memo and retry hierarchy room summary error * fix hierarchy room item styles * rename lobby hierarchy item card to room item card * show direct room avatar in space lobby * add hierarchy space item * add space item unknown room join button * fix space hierarchy hook refresh after new space join * change user avatar color and fallback render to user icon * change room avatar fallback to room icon * rename room/user avatar renderInitial prop to renderFallback * add room join and view button in space lobby * make power level api more reusable * fix space hierarchy not updating on child update * add menu to suggest or remove space children * show reply arrow in place of reply bend in message * fix typeerror in search because of wrong js-sdk t.ds * do not refetch hierarchy room summary on window focus * make room/user avatar un-draggable * change welcome page support button copy * drag-and-drop ordering of lobby spaces/rooms - WIP * add ASCIILexicalTable algorithms * fix wrong power level check in lobby items options * fix lobby can drop checks * fix join button error crash * fix reply spacing * fix m direct updated with other account data * add option to open room/space settings from lobby * add option in lobby to add new or existing room/spaces * fix room nav item selected styles * add space children reorder mechanism * fix space child reorder bug * fix hierarchy item sort function * Apply reorder of lobby into room list * add and improve space lobby menu items * add existing spaces menu in lobby * change restricted room allow params when dragging outside space * move featured servers config from homeserver list * removed unused features from space settings * add canonical alias as name fallback in lobby item * fix unreliable unread count update bug * fix after login redirect * fix room card topic hover style * Add dnd and folders in sidebar spaces * fix orphan space not visible in sidebar * fix sso login has mix of icon and button * fix space children not visible in home upon leaving space * recalculate notification on updating any space child * fix user color saturation/lightness * add user color to user avatar * add background colors to room avatar * show 2 length initial in sidebar space avatar * improve link color * add nav button component * open legacy create room and create direct * improve page route structure * handle hash router in path utils * mobile friendly router and navigation * make room header member drawer icon mobile friendly * setup index redirect for inbox and explore server route * add leave space prompt * improve member drawer filter menu * add space context menu * add context menu in home * add leave button in lobby items * render user tab avatar on sidebar * force overwrite netlify - test * netlify test * fix reset-password path without server redirected to login * add message link copy button in message menu * reset unread on sync prepared * fix stuck typing notifications * show typing indication in room nav item * refactor closedNavCategories atom to use userId in store key * refactor closedLobbyCategoriesAtom to include userId in store key * refactor navToActivePathAtom to use userId in storage key * remove unused file * refactor openedSidebarFolderAtom to include userId in storage key * add context menu for sidebar space tab * fix eslint not working * add option to pin/unpin child spaces * add context menu for directs tab * add context menu for direct and home tab * show lock icon for non-public space in header * increase matrix max listener count * wrap lobby add space room in callback hook
This commit is contained in:
Ajay Bura
GitHub
393
src/app/utils/ASCIILexicalTable.ts
Normal file
393
src/app/utils/ASCIILexicalTable.ts
Normal file
@@ -0,0 +1,393 @@
|
||||
export class ASCIILexicalTable {
|
||||
readonly startCode: number;
|
||||
|
||||
readonly endCode: number;
|
||||
|
||||
readonly maxStrWidth: number;
|
||||
|
||||
private readonly widthToSize: number[];
|
||||
|
||||
private readonly rangeCount: (i: number, j: number) => number;
|
||||
|
||||
constructor(startCode: number, endCode: number, maxStrWidth: number) {
|
||||
if (startCode > endCode) {
|
||||
throw new Error('Invalid ASCII code! startCode is greater than endCode.');
|
||||
}
|
||||
if (startCode < 0 || endCode > 128) {
|
||||
throw new Error('Invalid ASCII code range!');
|
||||
}
|
||||
|
||||
if (maxStrWidth <= 0) {
|
||||
throw new Error('Invalid max string width!');
|
||||
}
|
||||
|
||||
this.maxStrWidth = maxStrWidth;
|
||||
this.startCode = startCode;
|
||||
this.endCode = endCode;
|
||||
|
||||
/**
|
||||
* @param i smaller - inclusive
|
||||
* @param j larger - inclusive
|
||||
* @returns number
|
||||
*/
|
||||
this.rangeCount = (i: number, j: number): number => j - i + 1;
|
||||
|
||||
this.widthToSize = [];
|
||||
this.populateWidthToSize();
|
||||
|
||||
if (this.size() > Number.MAX_SAFE_INTEGER) {
|
||||
console.warn(
|
||||
`[!] Warning: ASCIILexicalTable size is larger than the Number.MAX_SAFE_INTEGER: ${this.size()} > ${
|
||||
Number.MAX_SAFE_INTEGER
|
||||
}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private populateWidthToSize() {
|
||||
const chars = this.rangeCount(this.startCode, this.endCode);
|
||||
for (let i = 0, count = 0; i < this.maxStrWidth; i += 1) {
|
||||
count = count * chars + chars;
|
||||
this.widthToSize[i] = count;
|
||||
}
|
||||
}
|
||||
|
||||
private getWidthToSize(width: number): number {
|
||||
return this.widthToSize[width - 1];
|
||||
}
|
||||
|
||||
first(): string {
|
||||
return String.fromCharCode(this.startCode);
|
||||
}
|
||||
|
||||
last(): string {
|
||||
let str = '';
|
||||
for (let i = 0; i < this.maxStrWidth; i += 1) {
|
||||
str += String.fromCharCode(this.endCode);
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
hasIndex(index: number): boolean {
|
||||
return index >= 0 && index < this.size();
|
||||
}
|
||||
|
||||
has(str: string): boolean {
|
||||
if (str.length === 0 || str.length > this.maxStrWidth) {
|
||||
return false;
|
||||
}
|
||||
|
||||
let charCode: number;
|
||||
for (let i = 0; i < str.length; i += 1) {
|
||||
charCode = str.charCodeAt(i);
|
||||
if (charCode < this.startCode || charCode > this.endCode) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
size(): number {
|
||||
return this.getWidthToSize(this.maxStrWidth);
|
||||
}
|
||||
|
||||
index(str: string): number {
|
||||
if (!this.has(str)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
let index = 0;
|
||||
const chars = this.rangeCount(this.startCode, this.endCode);
|
||||
|
||||
for (let i = 0; i < this.maxStrWidth; i += 1) {
|
||||
const code = str.charCodeAt(i);
|
||||
|
||||
if (Number.isNaN(code)) {
|
||||
return index;
|
||||
}
|
||||
|
||||
const opStrWidth = this.maxStrWidth - i;
|
||||
const opStrTableSize = this.getWidthToSize(opStrWidth);
|
||||
|
||||
const segmentSize = opStrTableSize / chars;
|
||||
|
||||
const codeIndex = code - this.startCode;
|
||||
const emptyCount = i === 0 ? 0 : 1;
|
||||
|
||||
index += segmentSize * codeIndex + emptyCount;
|
||||
}
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
get(index: number): string | undefined {
|
||||
if (!this.hasIndex(index)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let str = '';
|
||||
const chars = this.rangeCount(this.startCode, this.endCode);
|
||||
|
||||
for (let toIndex = index, i = 0; i < this.maxStrWidth; i += 1) {
|
||||
const opStrWidth = this.maxStrWidth - i;
|
||||
const opStrTableSize = this.getWidthToSize(opStrWidth);
|
||||
|
||||
const segmentSize = opStrTableSize / chars;
|
||||
|
||||
const segmentIndex = Math.floor(toIndex / segmentSize);
|
||||
str += String.fromCharCode(this.startCode + segmentIndex);
|
||||
|
||||
toIndex -= segmentIndex * segmentSize;
|
||||
if (toIndex === 0) {
|
||||
break;
|
||||
}
|
||||
toIndex -= 1;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
previous(str: string): string | undefined {
|
||||
if (!this.has(str)) return undefined;
|
||||
let prev = str;
|
||||
const lastCode = prev.charCodeAt(prev.length - 1);
|
||||
prev = prev.slice(0, prev.length - 1);
|
||||
|
||||
if (lastCode === this.startCode) {
|
||||
if (prev.length === 0) return undefined;
|
||||
return prev;
|
||||
}
|
||||
|
||||
prev += String.fromCharCode(lastCode - 1);
|
||||
while (prev.length < this.maxStrWidth) {
|
||||
prev += String.fromCharCode(this.endCode);
|
||||
}
|
||||
return prev;
|
||||
}
|
||||
|
||||
next(str: string): string | undefined {
|
||||
if (!this.has(str)) return undefined;
|
||||
let next = str;
|
||||
|
||||
if (next.length < this.maxStrWidth) {
|
||||
next += String.fromCharCode(this.startCode);
|
||||
return next;
|
||||
}
|
||||
|
||||
for (let i = next.length - 1; i >= 0; i -= 1) {
|
||||
const lastCode = next.charCodeAt(i);
|
||||
if (lastCode !== this.endCode) {
|
||||
next = next.slice(0, i) + String.fromCharCode(lastCode + 1);
|
||||
return next;
|
||||
}
|
||||
next = next.slice(0, i);
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
between(a: string, b: string): string | undefined {
|
||||
if (!this.has(a) || !this.has(b)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const centerIndex = Math.floor((this.index(a) + this.index(b)) / 2);
|
||||
|
||||
const str = this.get(centerIndex);
|
||||
if (str === a || str === b) return undefined;
|
||||
return str;
|
||||
}
|
||||
|
||||
nBetween(n: number, a: string, b: string): string[] | undefined {
|
||||
if (n <= 0 || !this.has(a) || !this.has(b)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const indexA = this.index(a);
|
||||
const indexB = this.index(b);
|
||||
|
||||
const nBetween = Math.max(indexA, indexB) - Math.min(indexA, indexB);
|
||||
if (nBetween < n) {
|
||||
return undefined;
|
||||
}
|
||||
const segmentSize = Math.floor(nBetween / (n + 1));
|
||||
if (segmentSize === 0) return undefined;
|
||||
|
||||
const items: string[] = [];
|
||||
|
||||
for (
|
||||
let segmentIndex = indexA + segmentSize;
|
||||
segmentIndex < indexB;
|
||||
segmentIndex += segmentSize
|
||||
) {
|
||||
if (items.length === n) break;
|
||||
|
||||
const str = this.get(segmentIndex);
|
||||
|
||||
if (!str) break;
|
||||
items.push(str);
|
||||
}
|
||||
|
||||
if (items.length < n) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
}
|
||||
|
||||
// const printLex = (lex: ASCIILexicalTable) => {
|
||||
// const padRight = (s: string, maxWidth: number, padding: string): string => {
|
||||
// let ns = s;
|
||||
// for (let i = s.length; i < maxWidth; i += 1) {
|
||||
// ns += padding;
|
||||
// }
|
||||
// return ns;
|
||||
// };
|
||||
|
||||
// const formattedLine = (n: number, item: string): string =>
|
||||
// `|${padRight(n.toString(), lex.size().toString().length, ' ')}|${item}|`;
|
||||
|
||||
// const hr = `|${padRight('-', lex.size().toString().length, '-')}|${padRight(
|
||||
// '-',
|
||||
// lex.maxStrWidth,
|
||||
// '-'
|
||||
// )}|`;
|
||||
|
||||
// console.log(`All lexicographic string combination in order.`);
|
||||
// console.log(`Start ASCII code: "${lex.startCode}"`);
|
||||
// console.log(`End ASCII code: "${lex.endCode}"`);
|
||||
// console.log(`Max string width: ${lex.maxStrWidth}`);
|
||||
// console.log(`Total String Combination Count: ${lex.size()}\n`);
|
||||
// console.log('Table:');
|
||||
// console.log(hr);
|
||||
// for (let i = 0; i < lex.size(); i += 1) {
|
||||
// const str = lex.get(i);
|
||||
// if (str) {
|
||||
// console.log(formattedLine(i, padRight(str, lex.maxStrWidth, '_')));
|
||||
// }
|
||||
// }
|
||||
// console.log(hr);
|
||||
// };
|
||||
|
||||
// console.log('\n');
|
||||
|
||||
// const lex = new ASCIILexicalTable('a'.charCodeAt(0), 'c'.charCodeAt(0), 3);
|
||||
// printLex(lex);
|
||||
// console.log(lex.size());
|
||||
// console.log(lex.nBetween(8, ' ', '~~~~~'));
|
||||
// console.log(lex.between('a', 'ccc'));
|
||||
// console.log(lex.get(11));
|
||||
// console.log(lex.get(11) === 'aaac');
|
||||
|
||||
// const lex4 = new ASCIILexicalTable(' '.charCodeAt(0), '~'.charCodeAt(0), 5);
|
||||
// console.log('Size: ', lex4.size());
|
||||
// console.log('Between: ', lex4.between('7g7g5', 'caccc'));
|
||||
// printLex(lex4);
|
||||
|
||||
// console.log('\n');
|
||||
|
||||
// const perf = () => {
|
||||
// const loopLength = 99999;
|
||||
// const lexT = new ASCIILexicalTable('a'.charCodeAt(0), 'z'.charCodeAt(0), 9);
|
||||
// console.log(lexT.size());
|
||||
// const str = 'bcbba';
|
||||
// const strI = lexT.index(str);
|
||||
// console.log('================');
|
||||
// console.time('index');
|
||||
// console.log(lexT.index(str));
|
||||
// for (let i = 0; i < loopLength; i += 1) {
|
||||
// lexT.index(str);
|
||||
// }
|
||||
// console.timeEnd('index');
|
||||
// console.log('================');
|
||||
// console.time('get');
|
||||
// console.log(lexT.get(strI));
|
||||
// for (let i = 0; i < loopLength; i += 1) {
|
||||
// lexT.get(strI);
|
||||
// }
|
||||
// console.timeEnd('get');
|
||||
// console.log('================');
|
||||
// console.time('previous');
|
||||
// console.log(lexT.previous(str));
|
||||
// for (let i = 0; i < loopLength; i += 1) {
|
||||
// lexT.previous(str);
|
||||
// }
|
||||
// console.timeEnd('previous');
|
||||
// console.log('================');
|
||||
// console.time('next');
|
||||
// console.log(lexT.next(str));
|
||||
// for (let i = 0; i < loopLength; i += 1) {
|
||||
// lexT.next(str);
|
||||
// }
|
||||
// console.timeEnd('next');
|
||||
// console.log('================');
|
||||
// console.time('between');
|
||||
// console.log(lexT.between(str, 'cbbca'));
|
||||
// for (let i = 0; i < loopLength; i += 1) {
|
||||
// lexT.between(str, 'cbbca');
|
||||
// }
|
||||
// console.timeEnd('between');
|
||||
// };
|
||||
|
||||
// perf();
|
||||
|
||||
const findNextFilledKey = (
|
||||
fromIndex: number,
|
||||
keys: Array<string | undefined>
|
||||
): [number, string] | [-1, undefined] => {
|
||||
for (let j = fromIndex; j < keys.length; j += 1) {
|
||||
const key = keys[j];
|
||||
if (typeof key === 'string') {
|
||||
return [j, key];
|
||||
}
|
||||
}
|
||||
|
||||
return [-1, undefined];
|
||||
};
|
||||
|
||||
export const orderKeys = (
|
||||
lex: ASCIILexicalTable,
|
||||
keys: Array<string | undefined>
|
||||
): Array<string> | undefined => {
|
||||
const newKeys: string[] = [];
|
||||
|
||||
for (let i = 0; i < keys.length; ) {
|
||||
const key = keys[i];
|
||||
const collectedKeys: string[] = [];
|
||||
const [nextKeyIndex, nextKey] = findNextFilledKey(i + 1, keys);
|
||||
const isKey = typeof key === 'string';
|
||||
|
||||
if (isKey) {
|
||||
collectedKeys.push(key);
|
||||
}
|
||||
|
||||
const keyToGenerateCount =
|
||||
(nextKeyIndex === -1 ? keys.length : nextKeyIndex) - (key ? i + 1 : i + 0);
|
||||
|
||||
if (keyToGenerateCount > 0) {
|
||||
const generatedKeys = lex.nBetween(
|
||||
keyToGenerateCount,
|
||||
key ?? lex.first(),
|
||||
nextKey ?? lex.last()
|
||||
);
|
||||
if (generatedKeys) {
|
||||
collectedKeys.push(...generatedKeys);
|
||||
} else {
|
||||
return lex.nBetween(keys?.length, lex.first(), lex.last());
|
||||
}
|
||||
}
|
||||
|
||||
newKeys.push(...collectedKeys);
|
||||
i += collectedKeys.length;
|
||||
}
|
||||
|
||||
if (newKeys.length !== keys.length) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return newKeys;
|
||||
};
|
||||
|
||||
// const lex = new ASCIILexicalTable('a'.charCodeAt(0), 'b'.charCodeAt(0), 2);
|
||||
// const keys = [undefined, undefined];
|
||||
// console.log(orderKeys(lex, keys));
|
||||
@@ -95,3 +95,20 @@ export const trimLeadingSlash = (str: string): string => str.replace(START_SLASH
|
||||
export const trimTrailingSlash = (str: string): string => str.replace(END_SLASHES_REG, '');
|
||||
|
||||
export const trimSlash = (str: string): string => trimLeadingSlash(trimTrailingSlash(str));
|
||||
|
||||
export const nameInitials = (str: string | undefined | null, len = 1): string => {
|
||||
if (!str) return '<27>';
|
||||
return [...str].slice(0, len).join('') || '<27>';
|
||||
};
|
||||
|
||||
export const randomStr = (len = 12): string => {
|
||||
let str = '';
|
||||
const minCode = 'A'.charCodeAt(0);
|
||||
const maxCode = 'Z'.charCodeAt(0);
|
||||
|
||||
for (let i = 0; i < len; i += 1) {
|
||||
const code = Math.floor(Math.random() * (maxCode - minCode + 1) + minCode);
|
||||
str += String.fromCharCode(code);
|
||||
}
|
||||
return str;
|
||||
};
|
||||
|
||||
@@ -23,3 +23,10 @@ export const preventScrollWithArrowKey: KeyboardEventHandler = (evt) => {
|
||||
evt.preventDefault();
|
||||
}
|
||||
};
|
||||
|
||||
export const onEnterOrSpace = (callback: () => void) => (evt: KeyboardEventLike) => {
|
||||
if (isKeyHotkey('enter', evt) || isKeyHotkey('space', evt)) {
|
||||
evt.preventDefault();
|
||||
callback();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -8,10 +8,12 @@ import {
|
||||
MatrixError,
|
||||
MatrixEvent,
|
||||
Room,
|
||||
RoomMember,
|
||||
UploadProgress,
|
||||
UploadResponse,
|
||||
} from 'matrix-js-sdk';
|
||||
import { IImageInfo, IThumbnailContent, IVideoInfo } from '../../types/matrix/common';
|
||||
import { AccountDataEvent } from '../../types/matrix/accountData';
|
||||
|
||||
export const matchMxId = (id: string): RegExpMatchArray | null =>
|
||||
id.match(/^([@!$+#])(\S+):(\S+)$/);
|
||||
@@ -37,8 +39,11 @@ export const parseMatrixToUrl = (url: string): [string | undefined, string | und
|
||||
return [g1AsMxId, g3AsVia];
|
||||
};
|
||||
|
||||
export const getRoomWithCanonicalAlias = (mx: MatrixClient, alias: string): Room | undefined =>
|
||||
mx.getRooms()?.find((room) => room.getCanonicalAlias() === alias);
|
||||
export const getCanonicalAliasRoomId = (mx: MatrixClient, alias: string): string | undefined =>
|
||||
mx.getRooms()?.find((room) => room.getCanonicalAlias() === alias)?.roomId;
|
||||
|
||||
export const getCanonicalAliasOrRoomId = (mx: MatrixClient, roomId: string): string =>
|
||||
mx.getRoom(roomId)?.getCanonicalAlias() || roomId;
|
||||
|
||||
export const getImageInfo = (img: HTMLImageElement, fileOrBlob: File | Blob): IImageInfo => {
|
||||
const info: IImageInfo = {};
|
||||
@@ -162,10 +167,86 @@ export const factoryEventSentBy = (senderId: string) => (ev: MatrixEvent) =>
|
||||
export const eventWithShortcode = (ev: MatrixEvent) =>
|
||||
typeof ev.getContent().shortcode === 'string';
|
||||
|
||||
export function hasDMWith(mx: MatrixClient, userId: string) {
|
||||
export const getDMRoomFor = (mx: MatrixClient, userId: string): Room | undefined => {
|
||||
const dmLikeRooms = mx
|
||||
.getRooms()
|
||||
.filter((room) => mx.isRoomEncrypted(room.roomId) && room.getMembers().length <= 2);
|
||||
|
||||
return dmLikeRooms.find((room) => room.getMember(userId));
|
||||
}
|
||||
};
|
||||
|
||||
export const guessDmRoomUserId = (room: Room, myUserId: string): string => {
|
||||
const getOldestMember = (members: RoomMember[]): RoomMember | undefined => {
|
||||
let oldestMemberTs: number | undefined;
|
||||
let oldestMember: RoomMember | undefined;
|
||||
|
||||
const pickOldestMember = (member: RoomMember) => {
|
||||
if (member.userId === myUserId) return;
|
||||
|
||||
if (
|
||||
oldestMemberTs === undefined ||
|
||||
(member.events.member && member.events.member.getTs() < oldestMemberTs)
|
||||
) {
|
||||
oldestMember = member;
|
||||
oldestMemberTs = member.events.member?.getTs();
|
||||
}
|
||||
};
|
||||
|
||||
members.forEach(pickOldestMember);
|
||||
|
||||
return oldestMember;
|
||||
};
|
||||
|
||||
// Pick the joined user who's been here longest (and isn't us),
|
||||
const member = getOldestMember(room.getJoinedMembers());
|
||||
if (member) return member.userId;
|
||||
|
||||
// if there are no joined members other than us, use the oldest member
|
||||
const member1 = getOldestMember(room.currentState.getMembers());
|
||||
return member1?.userId ?? myUserId;
|
||||
};
|
||||
|
||||
export const addRoomIdToMDirect = async (
|
||||
mx: MatrixClient,
|
||||
roomId: string,
|
||||
userId: string
|
||||
): Promise<void> => {
|
||||
const mDirectsEvent = mx.getAccountData(AccountDataEvent.Direct);
|
||||
const userIdToRoomIds: Record<string, string[]> = mDirectsEvent?.getContent() ?? {};
|
||||
|
||||
// remove it from the lists of any others users
|
||||
// (it can only be a DM room for one person)
|
||||
Object.keys(userIdToRoomIds).forEach((targetUserId) => {
|
||||
const roomIds = userIdToRoomIds[targetUserId];
|
||||
|
||||
if (targetUserId !== userId) {
|
||||
const indexOfRoomId = roomIds.indexOf(roomId);
|
||||
if (indexOfRoomId > -1) {
|
||||
roomIds.splice(indexOfRoomId, 1);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const roomIds = userIdToRoomIds[userId] || [];
|
||||
if (roomIds.indexOf(roomId) === -1) {
|
||||
roomIds.push(roomId);
|
||||
}
|
||||
userIdToRoomIds[userId] = roomIds;
|
||||
|
||||
await mx.setAccountData(AccountDataEvent.Direct, userIdToRoomIds);
|
||||
};
|
||||
|
||||
export const removeRoomIdFromMDirect = async (mx: MatrixClient, roomId: string): Promise<void> => {
|
||||
const mDirectsEvent = mx.getAccountData(AccountDataEvent.Direct);
|
||||
const userIdToRoomIds: Record<string, string[]> = mDirectsEvent?.getContent() ?? {};
|
||||
|
||||
Object.keys(userIdToRoomIds).forEach((targetUserId) => {
|
||||
const roomIds = userIdToRoomIds[targetUserId];
|
||||
const indexOfRoomId = roomIds.indexOf(roomId);
|
||||
if (indexOfRoomId > -1) {
|
||||
roomIds.splice(indexOfRoomId, 1);
|
||||
}
|
||||
});
|
||||
|
||||
await mx.setAccountData(AccountDataEvent.Direct, userIdToRoomIds);
|
||||
};
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -76,8 +76,8 @@ export const isSpace = (room: Room | null): boolean => {
|
||||
export const isRoom = (room: Room | null): boolean => {
|
||||
if (!room) return false;
|
||||
const event = getStateEvent(room, StateEvent.RoomCreate);
|
||||
if (!event) return false;
|
||||
return event.getContent().type === undefined;
|
||||
if (!event) return true;
|
||||
return event.getContent().type !== RoomType.Space;
|
||||
};
|
||||
|
||||
export const isUnsupportedRoom = (room: Room | null): boolean => {
|
||||
@@ -88,7 +88,10 @@ export const isUnsupportedRoom = (room: Room | null): boolean => {
|
||||
};
|
||||
|
||||
export function isValidChild(mEvent: MatrixEvent): boolean {
|
||||
return mEvent.getType() === StateEvent.SpaceChild && Object.keys(mEvent.getContent()).length > 0;
|
||||
return (
|
||||
mEvent.getType() === StateEvent.SpaceChild &&
|
||||
Array.isArray(mEvent.getContent<{ via: string[] }>().via)
|
||||
);
|
||||
}
|
||||
|
||||
export const getAllParents = (roomToParents: RoomToParents, roomId: string): Set<string> => {
|
||||
@@ -141,6 +144,15 @@ export const getRoomToParents = (mx: MatrixClient): RoomToParents => {
|
||||
return map;
|
||||
};
|
||||
|
||||
export const getOrphanParents = (roomToParents: RoomToParents, roomId: string): string[] => {
|
||||
const parents = getAllParents(roomToParents, roomId);
|
||||
const orphanParents = Array.from(parents).filter(
|
||||
(parentRoomId) => !roomToParents.has(parentRoomId)
|
||||
);
|
||||
|
||||
return orphanParents;
|
||||
};
|
||||
|
||||
export const isMutedRule = (rule: IPushRule) =>
|
||||
rule.actions[0] === 'dont_notify' && rule.conditions?.[0]?.kind === 'event_match';
|
||||
|
||||
@@ -167,14 +179,18 @@ export const getNotificationType = (mx: MatrixClient, roomId: string): Notificat
|
||||
return NotificationType.MentionsAndKeywords;
|
||||
};
|
||||
|
||||
const NOTIFICATION_EVENT_TYPES = [
|
||||
'm.room.create',
|
||||
'm.room.message',
|
||||
'm.room.encrypted',
|
||||
'm.room.member',
|
||||
'm.sticker',
|
||||
];
|
||||
export const isNotificationEvent = (mEvent: MatrixEvent) => {
|
||||
const eType = mEvent.getType();
|
||||
if (
|
||||
['m.room.create', 'm.room.message', 'm.room.encrypted', 'm.room.member', 'm.sticker'].find(
|
||||
(type) => type === eType
|
||||
)
|
||||
)
|
||||
if (!NOTIFICATION_EVENT_TYPES.includes(eType)) {
|
||||
return false;
|
||||
}
|
||||
if (eType === 'm.room.member') return false;
|
||||
|
||||
if (mEvent.isRedacted()) return false;
|
||||
@@ -183,6 +199,13 @@ export const isNotificationEvent = (mEvent: MatrixEvent) => {
|
||||
return true;
|
||||
};
|
||||
|
||||
export const roomHaveNotification = (room: Room): boolean => {
|
||||
const total = room.getUnreadNotificationCount(NotificationCountType.Total);
|
||||
const highlight = room.getUnreadNotificationCount(NotificationCountType.Highlight);
|
||||
|
||||
return total > 0 || highlight > 0;
|
||||
};
|
||||
|
||||
export const roomHaveUnread = (mx: MatrixClient, room: Room) => {
|
||||
const userId = mx.getUserId();
|
||||
if (!userId) return false;
|
||||
@@ -218,7 +241,7 @@ export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] => {
|
||||
if (room.getMyMembership() !== 'join') return unread;
|
||||
if (getNotificationType(mx, room.roomId) === NotificationType.Mute) return unread;
|
||||
|
||||
if (roomHaveUnread(mx, room)) {
|
||||
if (roomHaveNotification(room) || roomHaveUnread(mx, room)) {
|
||||
unread.push(getUnreadInfo(room));
|
||||
}
|
||||
|
||||
@@ -247,13 +270,19 @@ export const joinRuleToIconSrc = (
|
||||
return undefined;
|
||||
};
|
||||
|
||||
export const getRoomAvatarUrl = (mx: MatrixClient, room: Room): string | undefined => {
|
||||
const url =
|
||||
room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 32, 32, 'crop', undefined, false) ??
|
||||
undefined;
|
||||
if (url) return url;
|
||||
return room.getAvatarUrl(mx.baseUrl, 32, 32, 'crop') ?? undefined;
|
||||
};
|
||||
export const getRoomAvatarUrl = (
|
||||
mx: MatrixClient,
|
||||
room: Room,
|
||||
size: 32 | 96 = 32
|
||||
): string | undefined => room.getAvatarUrl(mx.baseUrl, size, size, 'crop') ?? undefined;
|
||||
|
||||
export const getDirectRoomAvatarUrl = (
|
||||
mx: MatrixClient,
|
||||
room: Room,
|
||||
size: 32 | 96 = 32
|
||||
): string | undefined =>
|
||||
room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, size, size, 'crop', undefined, false) ??
|
||||
undefined;
|
||||
|
||||
export const trimReplyFromBody = (body: string): string => {
|
||||
const match = body.match(/^> <.+?> .+\n(>.*\n)*?\n/m);
|
||||
|
||||
59
src/app/utils/sort.ts
Normal file
59
src/app/utils/sort.ts
Normal file
@@ -0,0 +1,59 @@
|
||||
import { MatrixClient } from 'matrix-js-sdk';
|
||||
|
||||
export type SortFunc<T> = (a: T, b: T) => number;
|
||||
|
||||
export const factoryRoomIdByActivity =
|
||||
(mx: MatrixClient): SortFunc<string> =>
|
||||
(a, b) => {
|
||||
const room1 = mx.getRoom(a);
|
||||
const room2 = mx.getRoom(b);
|
||||
|
||||
return (
|
||||
(room2?.getLastActiveTimestamp() ?? Number.MIN_SAFE_INTEGER) -
|
||||
(room1?.getLastActiveTimestamp() ?? Number.MIN_SAFE_INTEGER)
|
||||
);
|
||||
};
|
||||
|
||||
export const factoryRoomIdByAtoZ =
|
||||
(mx: MatrixClient): SortFunc<string> =>
|
||||
(a, b) => {
|
||||
let aName = mx.getRoom(a)?.name ?? '';
|
||||
let bName = mx.getRoom(b)?.name ?? '';
|
||||
|
||||
// remove "#" from the room name
|
||||
// To ignore it in sorting
|
||||
aName = aName.replace(/#/g, '');
|
||||
bName = bName.replace(/#/g, '');
|
||||
|
||||
if (aName.toLowerCase() < bName.toLowerCase()) {
|
||||
return -1;
|
||||
}
|
||||
if (aName.toLowerCase() > bName.toLowerCase()) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
};
|
||||
|
||||
export const factoryRoomIdByUnreadCount =
|
||||
(getUnreadCount: (roomId: string) => number): SortFunc<string> =>
|
||||
(a, b) => {
|
||||
const aT = getUnreadCount(a) ?? 0;
|
||||
const bT = getUnreadCount(b) ?? 0;
|
||||
return bT - aT;
|
||||
};
|
||||
|
||||
export const byTsOldToNew: SortFunc<number> = (a, b) => a - b;
|
||||
|
||||
export const byOrderKey: SortFunc<string | undefined> = (a, b) => {
|
||||
if (!a && !b) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!b) return -1;
|
||||
if (!a) return 1;
|
||||
|
||||
if (a < b) {
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
};
|
||||
Reference in New Issue
Block a user