Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .storybook/mocks/meteor.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ export const Meteor = {
on: () => {},
removeListener: () => {},
}),
StreamerCentral: {
on: () => {},
removeListener: () => {},
},
startup: () => {},
methods: () => {},
call: () => {},
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks';
import { DocsPage, DocsContainer } from '@storybook/addon-docs';
import { addDecorator, addParameters } from '@storybook/react';

import { rocketChatDecorator } from './decorators';
Expand Down
3 changes: 0 additions & 3 deletions client/hooks/useCallbacks.js

This file was deleted.

2 changes: 1 addition & 1 deletion client/methods/updateMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import moment from 'moment';
import _ from 'underscore';

import { hasAtLeastOnePermission } from '../../app/authorization/client';
import { callbacks } from '../../app/callbacks/client';
import { callbacks } from '../../app/callbacks/lib/callbacks';
import { ChatMessage } from '../../app/models/client';
import { settings } from '../../app/settings/client';
import { t } from '../../app/utils/client';
Expand Down
2 changes: 1 addition & 1 deletion client/providers/UserProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import React, { useMemo, FC } from 'react';

import { callbacks } from '../../app/callbacks/client';
import { callbacks } from '../../app/callbacks/lib/callbacks';
import { Subscriptions, Rooms } from '../../app/models/client';
import { getUserPreference } from '../../app/utils/client';
import { IRoom } from '../../definition/IRoom';
Expand Down
2 changes: 1 addition & 1 deletion client/sidebar/header/UserDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { FlowRouter } from 'meteor/kadira:flow-router';
import React from 'react';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { popover, AccountBox, SideNav } from '../../../app/ui-utils/client';
import { userStatus } from '../../../app/user-status/client';
import MarkdownText from '../../components/MarkdownText';
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/autolinker.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/autotranslate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { hasPermission } from '../../../app/authorization/client';
import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/emoji.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { getUserPreference } from '../../../app/utils/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/hexcolor.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/highlightWords.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { getUserPreference } from '../../../app/utils/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/issuelink.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/katex.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/markdown.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderMessage/mentionsMessage.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { Users } from '../../../app/models/client';
import { settings } from '../../../app/settings/client';

Expand Down
2 changes: 1 addition & 1 deletion client/startup/renderNotification/markdown.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';

import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/streamMessage/autotranslate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { hasPermission } from '../../../app/authorization/client';
import { callbacks } from '../../../app/callbacks/client';
import { callbacks } from '../../../app/callbacks/lib/callbacks';
import { settings } from '../../../app/settings/client';

Meteor.startup(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/startup/userStatusManuallySet.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';

import { callbacks } from '../../app/callbacks/client';
import { callbacks } from '../../app/callbacks/lib/callbacks';
import { UserStatus } from '../../definition/UserStatus';
import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';

Expand Down
3 changes: 1 addition & 2 deletions client/views/setupWizard/steps/AdminUserInformationStep.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import {
import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
import React, { useMemo, useState, useEffect } from 'react';

import { callbacks } from '../../../../app/callbacks/lib/callbacks';
import { useMethod } from '../../../contexts/ServerContext';
import { useSessionDispatch } from '../../../contexts/SessionContext';
import { useSetting } from '../../../contexts/SettingsContext';
import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
import { useTranslation } from '../../../contexts/TranslationContext';
import { useLoginWithPassword } from '../../../contexts/UserContext';
import { useCallbacks } from '../../../hooks/useCallbacks';
import { Pager } from '../Pager';
import { Step } from '../Step';
import { StepHeader } from '../StepHeader';
Expand All @@ -27,7 +27,6 @@ function AdminUserInformationStep({ step, title, active }) {
const defineUsername = useMethod('setUsername');

const setForceLogin = useSessionDispatch('forceLogin');
const callbacks = useCallbacks();
const dispatchToastMessage = useToastMessageDispatch();

const registerAdminUser = async ({
Expand Down