Skip to content

Commit

Permalink
Merge branch 'master' into fix/search-thread-participants
Browse files Browse the repository at this point in the history
  • Loading branch information
kanat authored Dec 17, 2024
2 parents bbe618c + 24f1c73 commit 0cf1ff9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [8.47.0](https://github.com/GetStream/stream-chat-js/compare/v8.46.1...v8.47.0) (2024-12-13)


### Features

* add team to channel template ([#1416](https://github.com/GetStream/stream-chat-js/issues/1416)) ([56bc83e](https://github.com/GetStream/stream-chat-js/commit/56bc83ee94d5f9859ebb24edd5f20f9a3b86aaca))


### Bug Fixes

* revert membership initialization behavior ([#1417](https://github.com/GetStream/stream-chat-js/issues/1417)) ([12aa4af](https://github.com/GetStream/stream-chat-js/commit/12aa4af73cade951dec21ec9b94b343eb36ec296))

### [8.46.1](https://github.com/GetStream/stream-chat-js/compare/v8.46.0...v8.46.1) (2024-12-11)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stream-chat",
"version": "8.46.1",
"version": "8.47.0",
"description": "JS SDK for the Stream Chat API",
"author": "GetStream",
"homepage": "https://getstream.io/chat/",
Expand Down
5 changes: 1 addition & 4 deletions src/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1722,10 +1722,7 @@ export class Channel<StreamChatGenerics extends ExtendableGenerics = DefaultGene
}
}

this.state.membership = {
...this.state.membership,
...state.membership,
};
this.state.membership = state.membership || {};

const messages = state.messages || [];
if (!this.state.messages) {
Expand Down
1 change: 1 addition & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2975,6 +2975,7 @@ export type CampaignData = {
custom?: {};
id?: string;
members?: string[];
team?: string;
};
create_channels?: boolean;
deleted_at?: string;
Expand Down

0 comments on commit 0cf1ff9

Please sign in to comment.