Skip to content

Commit b0d30f5

Browse files
authored
Merge pull request #704 from GetStream/remove-setUser
Fix broken docs
2 parents 9b88f44 + cc59435 commit b0d30f5

File tree

16 files changed

+46
-50
lines changed

16 files changed

+46
-50
lines changed

examples/tutorial/step1.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { StreamChat } from 'stream-chat';
1111

1212
import 'stream-chat-react/dist/css/index.css';
1313

14-
const chatClient = new StreamChat('qk4nn7rpcn75');
14+
const chatClient = StreamChat.getInstance('qk4nn7rpcn75');
1515

16-
chatClient.setUser(
16+
chatClient.connectUser(
1717
{
1818
id: 'thierry',
1919
name: 'Thierry',

examples/tutorial/step2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { StreamChat } from 'stream-chat';
1313

1414
import 'stream-chat-react/dist/css/index.css';
1515

16-
const chatClient = new StreamChat('qk4nn7rpcn75');
16+
const chatClient = StreamChat.getInstance('qk4nn7rpcn75');
1717

18-
chatClient.setUser(
18+
chatClient.connectUser(
1919
{
2020
id: 'thierry',
2121
name: 'Thierry',

examples/tutorial/step3.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { StreamChat } from 'stream-chat';
1313

1414
import 'stream-chat-react/dist/css/index.css';
1515

16-
const chatClient = new StreamChat('qk4nn7rpcn75');
16+
const chatClient = StreamChat.getInstance('qk4nn7rpcn75');
1717

1818
class MyChannelPreview extends React.Component {
1919
render() {
@@ -35,14 +35,14 @@ class MyChannelPreview extends React.Component {
3535
}
3636
}
3737

38-
// the most minimalistic message component
38+
// the most minimalist message component
3939
class MyMessage extends React.Component {
4040
render() {
4141
return <div>{this.props.message.text}</div>;
4242
}
4343
}
4444

45-
chatClient.setUser(
45+
chatClient.connectUser(
4646
{
4747
id: 'thierry',
4848
name: 'Thierry',

examples/tutorial/step4.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { StreamChat } from 'stream-chat';
1414

1515
import 'stream-chat-react/dist/css/index.css';
1616

17-
const chatClient = new StreamChat('qk4nn7rpcn75');
17+
const chatClient = StreamChat.getInstance('qk4nn7rpcn75');
1818

19-
chatClient.setUser(
19+
chatClient.connectUser(
2020
{
2121
id: 'thierry',
2222
name: 'Thierry',

examples/tutorial/step5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { StreamChat } from 'stream-chat';
1313

1414
import 'stream-chat-react/dist/css/index.css';
1515

16-
const chatClient = new StreamChat('qk4nn7rpcn75');
16+
const chatClient = StreamChat.getInstance('qk4nn7rpcn75');
1717

1818
class MyAttachment extends React.Component {
1919
render() {
@@ -43,7 +43,7 @@ class MyAttachment extends React.Component {
4343
}
4444
}
4545

46-
chatClient.setUser(
46+
chatClient.connectUser(
4747
{
4848
id: 'thierry',
4949
name: 'Thierry',

scripts/send-messages.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ function sleep(ms) {
1212
}
1313
console.log(process.env.REACT_APP_CHAT_SERVER_ENDPOINT);
1414
async function main() {
15-
const chatClient = new StreamChat(process.env.REACT_APP_CHAT_API_KEY);
15+
const chatClient = StreamChat.getInstance(process.env.REACT_APP_CHAT_API_KEY);
1616
chatClient.setBaseURL(process.env.REACT_APP_CHAT_SERVER_ENDPOINT);
17-
chatClient.setUser(
17+
chatClient.connectUser(
1818
{
1919
id: user,
2020
},

src/components/Chat/hooks/useChat.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ export const useChat = ({ client, initialNavOpen, i18nInstance }) => {
2626
const clientMutes = client?.user?.mutes;
2727

2828
useEffect(() => {
29-
const userAgent = client.getUserAgent();
30-
if (!userAgent.includes('stream-chat-react')) {
31-
/**
32-
* results in something like: 'stream-chat-react-2.3.2-stream-chat-javascript-client-browser-2.2.2'
33-
*/
34-
client.setUserAgent(`stream-chat-react-${version}-${userAgent}`);
29+
if (client) {
30+
const userAgent = client.getUserAgent();
31+
if (!userAgent.includes('stream-chat-react')) {
32+
/**
33+
* results in something like: 'stream-chat-react-2.3.2-stream-chat-javascript-client-browser-2.2.2'
34+
*/
35+
client.setUserAgent(`stream-chat-react-${version}-${userAgent}`);
36+
}
3537
}
36-
}, []); // eslint-disable-line react-hooks/exhaustive-deps
38+
}, [client]);
3739

3840
useEffect(() => {
3941
setMutes(clientMutes || []);

src/components/ChatAutoComplete/ChatAutoComplete.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@ const ChatAutoComplete = (props) => {
1818

1919
const members = channel?.state?.members;
2020
const watchers = channel?.state?.watchers;
21-
const { emojiData, EmojiIndex } = emojiConfig;
21+
const { emojiData, EmojiIndex } = emojiConfig || {};
2222

23-
const emojiIndex = useMemo(() => new EmojiIndex(emojiData), [
24-
emojiData,
25-
EmojiIndex,
26-
]);
23+
const emojiIndex = useMemo(() => {
24+
if (EmojiIndex) {
25+
return new EmojiIndex(emojiData);
26+
}
27+
return null;
28+
}, [emojiData, EmojiIndex]);
2729

2830
/** @param {string} word */
2931
const emojiReplace = (word) => {
30-
const found = emojiIndex.search(word) || [];
32+
const found = emojiIndex?.search(word) || [];
3133
const emoji = found.slice(0, 10).find(
3234
/** @type {{ ({ emoticons } : import('emoji-mart').EmojiData): boolean }} */
3335
({ emoticons }) => !!emoticons?.includes(word),
@@ -91,7 +93,7 @@ const ChatAutoComplete = (props) => {
9193
if (q.length === 0 || q.charAt(0).match(/[^a-zA-Z0-9+-]/)) {
9294
return [];
9395
}
94-
const emojis = emojiIndex.search(q) || [];
96+
const emojis = emojiIndex?.search(q) || [];
9597
const result = emojis.slice(0, 10);
9698

9799
if (onReady) onReady(result, q);

src/components/MessageInput/EmojiPicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const EmojiPicker = ({
2222
const { emojiConfig } = useContext(ChannelContext);
2323
const { t } = useContext(TranslationContext);
2424

25-
const { emojiData, EmojiPicker: Picker } = emojiConfig;
25+
const { emojiData, EmojiPicker: Picker } = emojiConfig || {};
2626

2727
if (emojiPickerIsOpen) {
2828
const className = small

src/components/Reactions/ReactionSelector.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ const ReactionSelectorWithRef = (
2727
) => {
2828
const { emojiConfig } = useContext(ChannelContext);
2929

30-
const {
31-
defaultMinimalEmojis,
32-
Emoji,
33-
emojiData: fullEmojiData,
34-
emojiSetDef,
35-
} = emojiConfig;
30+
const { defaultMinimalEmojis, Emoji, emojiData: fullEmojiData, emojiSetDef } =
31+
emojiConfig || {};
3632

3733
const emojiData = getStrippedEmojiData(fullEmojiData);
3834
const reactionOptions = reactionOptionsProp || defaultMinimalEmojis;

0 commit comments

Comments
 (0)