ref(TS) Remove unnecessary ts-ignores

globals.d.ts

@@ -15,5 +15,6 @@ declare global {
     interface Window {
         config?: IConfig;
         JITSI_MEET_LITE_SDK?: boolean;
+        interfaceConfig?: any;
     }
 }

package-lock.json

@@ -49,6 +49,7 @@
         "@svgr/webpack": "4.3.2",
         "@tensorflow/tfjs-backend-wasm": "3.13.0",
         "@tensorflow/tfjs-core": "3.13.0",
+        "@types/amplitude-js": "8.16.2",
         "@types/audioworklet": "0.0.29",
         "@types/w3c-image-capture": "1.0.6",
         "@vladmandic/human": "2.6.5",
@@ -5794,6 +5795,11 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/@types/amplitude-js": {
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.2.tgz",
+      "integrity": "sha512-a+tb/CEQOlrHRvEvAuYNOcoUy1POERANnAhfKgiTmsy0eACj3eukGP0ucA9t115QOPzVUhbnUfZqtyHp99IZyA=="
+    },
     "node_modules/@types/audioworklet": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.29.tgz",
@@ -24683,6 +24689,11 @@
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
     },
+    "@types/amplitude-js": {
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.2.tgz",
+      "integrity": "sha512-a+tb/CEQOlrHRvEvAuYNOcoUy1POERANnAhfKgiTmsy0eACj3eukGP0ucA9t115QOPzVUhbnUfZqtyHp99IZyA=="
+    },
     "@types/audioworklet": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/audioworklet/-/audioworklet-0.0.29.tgz",

package.json

@@ -54,6 +54,7 @@
     "@svgr/webpack": "4.3.2",
     "@tensorflow/tfjs-backend-wasm": "3.13.0",
     "@tensorflow/tfjs-core": "3.13.0",
+    "@types/amplitude-js": "8.16.2",
     "@types/audioworklet": "0.0.29",
     "@types/w3c-image-capture": "1.0.6",
     "@vladmandic/human": "2.6.5",

react/features/analytics/functions.ts

@@ -4,8 +4,7 @@ import { API_ID } from '../../../modules/API/constants';
 // @ts-ignore
 import { getName as getAppName } from '../app/functions';
 import { IStore } from '../app/types';
-// @ts-ignore
-import { getAnalyticsRoomName } from '../base/conference';
+import { getAnalyticsRoomName } from '../base/conference/functions';
 import {
     checkChromeExtensionsInstalled,
     isMobileBrowser
@@ -14,8 +13,7 @@ import JitsiMeetJS, {
     analytics,
     browser
 } from '../base/lib-jitsi-meet';
-// @ts-ignore
-import { isAnalyticsEnabled } from '../base/lib-jitsi-meet/functions';
+import { isAnalyticsEnabled } from '../base/lib-jitsi-meet/functions.any';
 // @ts-ignore
 import { loadScript } from '../base/util';
 import { getJitsiMeetGlobalNS } from '../base/util/helpers';

react/features/analytics/handlers/amplitude/lib.web.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 import amplitude from 'amplitude-js';
 
 export default amplitude;

react/features/analytics/middleware.ts

@@ -16,7 +16,6 @@ import {
 import {
     getLocalAudioTrack,
     getLocalVideoTrack
-    // @ts-ignore
 } from '../base/tracks/functions';
 
 import { createLocalTracksDurationEvent, createNetworkInfoEvent } from './AnalyticsEvents';

react/features/authentication/components/web/LoginDialog.tsx

@@ -7,12 +7,10 @@ import type { Dispatch } from 'redux';
 import { connect } from '../../../../../connection';
 import { IState } from '../../../app/types';
 import { IConfig } from '../../../base/config/configType';
-// @ts-ignore
 import { toJid } from '../../../base/connection/functions';
 // @ts-ignore
 import { Dialog } from '../../../base/dialog';
 import { translate, translateToHTML } from '../../../base/i18n/functions';
-// @ts-ignore
 import { JitsiConnectionErrors } from '../../../base/lib-jitsi-meet';
 import { connect as reduxConnect } from '../../../base/redux/functions';
 import Input from '../../../base/ui/components/web/Input';

react/features/av-moderation/actions.ts

@@ -1,7 +1,5 @@
 import { IStore } from '../app/types';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
-import { getConferenceState } from '../base/conference';
+import { getConferenceState } from '../base/conference/functions';
 import { MEDIA_TYPE, type MediaType } from '../base/media/constants';
 import { getParticipantById, isParticipantModerator } from '../base/participants/functions';
 import { Participant } from '../base/participants/types';
@@ -40,7 +38,7 @@ export const approveParticipantAudio = (id: string) => (dispatch: IStore['dispat
     const isVideoForceMuted = isForceMuted(participant, MEDIA_TYPE.VIDEO, state);
 
     if (isAudioModerationOn || !isVideoModerationOn || !isVideoForceMuted) {
-        conference.avModerationApprove(MEDIA_TYPE.AUDIO, id);
+        conference?.avModerationApprove(MEDIA_TYPE.AUDIO, id);
     }
 };
 
@@ -59,7 +57,7 @@ export const approveParticipantVideo = (id: string) => (dispatch: IStore['dispat
     const isVideoModerationOn = isEnabledFromState(MEDIA_TYPE.VIDEO, state);
 
     if (isVideoModerationOn && isVideoForceMuted) {
-        conference.avModerationApprove(MEDIA_TYPE.VIDEO, id);
+        conference?.avModerationApprove(MEDIA_TYPE.VIDEO, id);
     }
 };
 
@@ -90,7 +88,7 @@ export const rejectParticipantAudio = (id: string) => (dispatch: IStore['dispatc
     const isModerator = isParticipantModerator(participant);
 
     if (audioModeration && !isAudioForceMuted && !isModerator) {
-        conference.avModerationReject(MEDIA_TYPE.AUDIO, id);
+        conference?.avModerationReject(MEDIA_TYPE.AUDIO, id);
     }
 };
 
@@ -110,7 +108,7 @@ export const rejectParticipantVideo = (id: string) => (dispatch: IStore['dispatc
     const isModerator = isParticipantModerator(participant);
 
     if (videoModeration && !isVideoForceMuted && !isModerator) {
-        conference.avModerationReject(MEDIA_TYPE.VIDEO, id);
+        conference?.avModerationReject(MEDIA_TYPE.VIDEO, id);
     }
 };
 

react/features/av-moderation/middleware.ts

@@ -2,8 +2,7 @@
 import { batch } from 'react-redux';
 
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
-// @ts-ignore
-import { getConferenceState } from '../base/conference';
+import { getConferenceState } from '../base/conference/functions';
 import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
 import { MEDIA_TYPE, MediaType } from '../base/media/constants';
 import { PARTICIPANT_UPDATED } from '../base/participants/actionTypes';
@@ -17,10 +16,8 @@ import {
 } from '../base/participants/functions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import StateListenerRegistry from '../base/redux/StateListenerRegistry';
-// @ts-ignore
-import { playSound, registerSound, unregisterSound } from '../base/sounds';
-// @ts-ignore
-import { hideNotification, showNotification } from '../notifications';
+import { playSound, registerSound, unregisterSound } from '../base/sounds/actions';
+import { hideNotification, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
 // @ts-ignore
 import { muteLocal } from '../video-menu/actions.any';
@@ -81,7 +78,7 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
     case LOCAL_PARTICIPANT_MODERATION_NOTIFICATION: {
         let descriptionKey;
         let titleKey;
-        let uid: string | undefined;
+        let uid = '';
         const localParticipant = getLocalParticipant(getState);
         const raisedHand = hasRaisedHand(localParticipant);
 
@@ -118,19 +115,19 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         break;
     }
     case REQUEST_DISABLE_AUDIO_MODERATION: {
-        conference.disableAVModeration(MEDIA_TYPE.AUDIO);
+        conference?.disableAVModeration(MEDIA_TYPE.AUDIO);
         break;
     }
     case REQUEST_DISABLE_VIDEO_MODERATION: {
-        conference.disableAVModeration(MEDIA_TYPE.VIDEO);
+        conference?.disableAVModeration(MEDIA_TYPE.VIDEO);
         break;
     }
     case REQUEST_ENABLE_AUDIO_MODERATION: {
-        conference.enableAVModeration(MEDIA_TYPE.AUDIO);
+        conference?.enableAVModeration(MEDIA_TYPE.AUDIO);
         break;
     }
     case REQUEST_ENABLE_VIDEO_MODERATION: {
-        conference.enableAVModeration(MEDIA_TYPE.VIDEO);
+        conference?.enableAVModeration(MEDIA_TYPE.VIDEO);
         break;
     }
     case PARTICIPANT_UPDATED: {

react/features/base/components/context-menu/ContextMenu.tsx

@@ -5,7 +5,6 @@ import React, { ReactNode, useEffect, useLayoutEffect, useRef, useState } from '
 import { useSelector } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';
 
-// @ts-ignore
 import { getComputedOuterHeight } from '../../../participants-pane/functions';
 // @ts-ignore
 import { Drawer, JitsiPortal } from '../../../toolbox/components/web';

react/features/base/conference/reducer.ts

@@ -1,7 +1,6 @@
 /* eslint-disable lines-around-comment */
 import { LOCKED_LOCALLY, LOCKED_REMOTELY } from '../../room-lock/constants';
 import { CONNECTION_WILL_CONNECT, SET_LOCATION_URL } from '../connection/actionTypes';
-// @ts-ignore
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { assign, set } from '../redux/functions';
@@ -26,7 +25,6 @@ import {
     SET_START_MUTED_POLICY,
     SET_START_REACTIONS_MUTED
 } from './actionTypes';
-// @ts-ignore
 import { isRoomValid } from './functions';
 
 const DEFAULT_STATE = {
@@ -42,6 +40,10 @@ const DEFAULT_STATE = {
 
 export interface IJitsiConference {
     addTrack: Function;
+    avModerationApprove: Function;
+    avModerationReject: Function;
+    disableAVModeration: Function;
+    enableAVModeration: Function;
     getBreakoutRooms: Function;
     getLocalTracks: Function;
     grantOwner: Function;

react/features/base/config/actions.ts

@@ -116,8 +116,6 @@ export function setConfig(config: Object = {}) {
                 // On Web the config also comes from the window.config global,
                 // but it is resolved in the loadConfig procedure.
                 config,
-
-                // @ts-ignore
                 window.interfaceConfig,
                 locationURL);
 
@@ -144,7 +142,6 @@ export function storeConfig(baseURL: string, config: Object) {
         let b = false;
 
         try {
-            // @ts-ignore
             if (typeof window.config === 'undefined' || window.config !== config) {
                 jitsiLocalStorage.setItem(`${_CONFIG_STORE_PREFIX}/${baseURL}`, JSON.stringify(config));
                 b = true;

react/features/base/config/middleware.ts

@@ -87,9 +87,7 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA
     // not be the global variable which is being modified anymore due to
     // different merge methods being used along the way. The global variable
     // must be synchronized with the final state resolved by the reducer.
-    // @ts-ignore
     if (typeof window.config !== 'undefined') {
-        // @ts-ignore
         window.config = state['features/base/config'];
     }
 

react/features/base/connection/actions.native.ts

@@ -3,7 +3,6 @@ import { Dispatch } from 'redux';
 
 // @ts-ignore
 import { conferenceLeft, conferenceWillLeave } from '../conference/actions';
-// @ts-ignore
 import { getCurrentConference } from '../conference/functions';
 import JitsiMeetJS, { JitsiConnectionEvents } from '../lib-jitsi-meet';
 

react/features/base/connection/reducer.ts

@@ -1,6 +1,5 @@
 /* eslint-disable lines-around-comment */
 import { SET_ROOM } from '../conference/actionTypes';
-// @ts-ignore
 import { JitsiConnectionErrors } from '../lib-jitsi-meet';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { assign, set } from '../redux/functions';
@@ -13,7 +12,6 @@ import {
     SET_LOCATION_URL,
     SHOW_CONNECTION_INFO
 } from './actionTypes';
-// @ts-ignore
 import { ConnectionFailedError } from './actions.native';
 
 export interface IConnectionState {

react/features/base/devices/reducer.ts

@@ -8,8 +8,6 @@ import {
     SET_VIDEO_INPUT_DEVICE,
     UPDATE_DEVICE_LIST
 } from './actionTypes';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { groupDevicesByKind } from './functions';
 import logger from './logger';
 

react/features/base/environment/environment.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 import JitsiMeetJS from '../lib-jitsi-meet';
 import Platform from '../react/Platform.web';
 

react/features/base/i18n/logger.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { getLogger } from '../logging/functions';
 
 export default getLogger('features/base/i18n');

react/features/base/i18n/middleware.ts

@@ -4,8 +4,6 @@ import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { I18NEXT_INITIALIZED, LANGUAGE_CHANGED } from './actionTypes';
 import { changeLanguageBundle } from './functions';
 import i18next from './i18next';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import logger from './logger';
 
 /**

react/features/base/lastn/middleware.ts

@@ -22,8 +22,6 @@ import {
     getParticipantCount
 } from '../participants/functions';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { isLocalVideoTrackDesktop } from '../tracks/functions';
 
 import { setLastN } from './actions';

react/features/base/lastn/reducer.ts

@@ -7,7 +7,6 @@ import ReducerRegistry from '../redux/ReducerRegistry';
 import { set } from '../redux/functions';
 
 import { SET_LAST_N } from './actionTypes';
-// @ts-ignore
 import { validateLastNLimits } from './functions';
 
 export interface ILastNState {

react/features/base/lib-jitsi-meet/actions.ts

@@ -14,8 +14,7 @@ import {
     LIB_WILL_DISPOSE,
     LIB_WILL_INIT
 } from './actionTypes';
-// @ts-ignore
-import { isAnalyticsEnabled } from './functions';
+import { isAnalyticsEnabled } from './functions.any';
 
 /**
  * Disposes (of) lib-jitsi-meet.

react/features/base/lib-jitsi-meet/middleware.ts

@@ -93,7 +93,6 @@ function _setErrorHandlers() {
     if (JitsiMeetJS.getGlobalOnErrorHandler) {
         const oldOnErrorHandler = window.onerror;
 
-        // @ts-ignore
         window.onerror = (message, source, lineno, colno, error) => { // eslint-disable-line max-params
             const errMsg = message || error?.message;
             const stack = error?.stack;

react/features/base/logging/JitsiMeetLogStorage.ts

@@ -1,10 +1,6 @@
-/* eslint-disable lines-around-comment */
-// @ts-ignore
 import RTCStats from '../../rtcstats/RTCStats';
-// @ts-ignore
 import { canSendRtcstatsData } from '../../rtcstats/functions';
-// @ts-ignore
-import { getCurrentConference } from '../conference';
+import { getCurrentConference } from '../conference/functions';
 
 /**
  * Implements log storage interface from the @jitsi/logger lib. Captured

react/features/base/logging/middleware.ts

@@ -4,16 +4,15 @@ import Logger from '@jitsi/logger';
 
 import { IStore } from '../../app/types';
 import { APP_WILL_MOUNT } from '../app/actionTypes';
-// @ts-ignore
-import { CONFERENCE_JOINED, getCurrentConference } from '../conference';
+import { CONFERENCE_JOINED } from '../conference/actionTypes';
+import { getCurrentConference } from '../conference/functions';
 import { SET_CONFIG } from '../config/actionTypes';
 import JitsiMeetJS, {
     JitsiConferenceEvents
 } from '../lib-jitsi-meet';
 import { LIB_WILL_INIT } from '../lib-jitsi-meet/actionTypes';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-// @ts-ignore
-import { isTestModeEnabled } from '../testing';
+import { isTestModeEnabled } from '../testing/functions';
 
 import buildExternalApiLogTransport from './ExternalApiLogTransport';
 import JitsiMeetInMemoryLogStorage from './JitsiMeetInMemoryLogStorage';

react/features/base/media/functions.ts

@@ -120,7 +120,7 @@ export function isVideoMutedByUser(stateful: IStateful) {
  * otherwise, false.
  */
 export function shouldRenderVideoTrack(
-        videoTrack: { muted: boolean; videoStarted: boolean; },
+        videoTrack: { muted: boolean; videoStarted: boolean; } | undefined,
         waitForVideoStarted: boolean) {
     return (
         videoTrack

react/features/base/media/middleware.web.ts

@@ -2,7 +2,6 @@
 import './middleware.any.js';
 
 import { IStore } from '../../app/types';
-// @ts-ignore
 import { showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import LocalRecordingManager from '../../recording/components/Recording/LocalRecordingManager.web';

react/features/base/participants/functions.ts

@@ -8,15 +8,12 @@ import { isStageFilmstripAvailable } from '../../filmstrip/functions';
 import { IStateful } from '../app/types';
 import { GRAVATAR_BASE_URL } from '../avatar/constants';
 import { isCORSAvatarURL } from '../avatar/functions';
-// @ts-ignore
-import { getMultipleVideoSupportFeatureFlag, getSourceNameSignalingFeatureFlag } from '../config';
+import { getMultipleVideoSupportFeatureFlag, getSourceNameSignalingFeatureFlag } from '../config/functions.any';
 import i18next from '../i18n/i18next';
 import { JitsiParticipantConnectionStatus, JitsiTrackStreamingStatus } from '../lib-jitsi-meet';
-// @ts-ignore
-import { shouldRenderVideoTrack } from '../media';
+import { shouldRenderVideoTrack } from '../media/functions';
 import { toState } from '../redux/functions';
-// @ts-ignore
-import { getScreenShareTrack, getVideoTrackByParticipant } from '../tracks';
+import { getScreenShareTrack, getVideoTrackByParticipant } from '../tracks/functions';
 import { createDeferred } from '../util/helpers';
 
 import { JIGASI_PARTICIPANT_ICON, MAX_DISPLAY_NAME_LENGTH, PARTICIPANT_ROLE } from './constants';
@@ -305,13 +302,14 @@ export function getFakeParticipants(stateful: IStateful) {
  * @returns {number}
  */
 export function getRemoteParticipantCount(stateful: IStateful) {
-    const state = toState(stateful)['features/base/participants'];
+    const state = toState(stateful);
+    const participantsState = state['features/base/participants'];
 
     if (getMultipleVideoSupportFeatureFlag(state)) {
-        return state.remote.size - state.sortedRemoteVirtualScreenshareParticipants.size;
+        return participantsState.remote.size - participantsState.sortedRemoteVirtualScreenshareParticipants.size;
     }
 
-    return state.remote.size;
+    return participantsState.remote.size;
 }
 
 /**

react/features/base/premeeting/components/web/ConnectionStatus.tsx

@@ -12,7 +12,6 @@ import { IconArrowDownSmall, IconWifi1Bar, IconWifi2Bars, IconWifi3Bars } from '
 import { connect } from '../../../redux/functions';
 import { PREJOIN_DEFAULT_CONTENT_WIDTH } from '../../../ui/components/variables';
 import { CONNECTION_TYPE } from '../../constants';
-// @ts-ignore
 import { getConnectionData } from '../../functions';
 
 interface Props extends WithTranslation {

react/features/base/settings/middleware.ts

@@ -9,7 +9,6 @@ import { setPrejoinPageVisibility } from '../../prejoin/actions';
 import { APP_WILL_MOUNT } from '../app/actionTypes';
 import { setAudioOnly } from '../audio-only/actions';
 import { SET_LOCATION_URL } from '../connection/actionTypes'; // minimize imports to avoid circular imports
-// @ts-ignore
 import { getJwtName } from '../jwt/functions';
 import { participantUpdated } from '../participants/actions';
 import { getLocalParticipant } from '../participants/functions';

react/features/base/sounds/reducer.ts

@@ -10,7 +10,6 @@ import {
     _ADD_AUDIO_ELEMENT,
     _REMOVE_AUDIO_ELEMENT
 } from './actionTypes';
-// @ts-ignore
 import logger from './logger';
 
 /**

react/features/notifications/actions.ts

@@ -97,6 +97,7 @@ interface INotificationProps {
     description?: string;
     descriptionKey?: string;
     icon?: string;
+    sticky?: boolean;
     title?: string;
     titleArguments?: {
         [key: string]: string;