Resolved merge conflict

This commit is contained in:
GigiaJ 2025-05-22 20:28:19 -05:00
commit cd0d4c9704
21 changed files with 481 additions and 119 deletions

View file

@ -1,12 +1,7 @@
import { createClient, MatrixClient, IndexedDBStore, IndexedDBCryptoStore } from 'matrix-js-sdk';
import { logger } from 'matrix-js-sdk/lib/logger';
import { cryptoCallbacks } from './state/secretStorageKeys';
if (import.meta.env.PROD) {
logger.disableAll();
}
type Session = {
baseUrl: string;
accessToken: string;
@ -38,7 +33,6 @@ export const initClient = async (session: Session): Promise<MatrixClient> => {
await indexedDBStore.startup();
await mx.initRustCrypto();
mx.setGlobalErrorOnUnknownDevices(false);
mx.setMaxListeners(50);
return mx;

View file

@ -1,5 +1,5 @@
const cons = {
version: '4.6.0',
version: '4.7.1',
secretKey: {
ACCESS_TOKEN: 'cinny_access_token',
DEVICE_ID: 'cinny_device_id',