Skip to content

Commit bbafc53

Browse files
committed
Fixed unnecessary changes introduced by merge commit
1 parent 38d5a9a commit bbafc53

4 files changed

Lines changed: 8 additions & 25 deletions

File tree

src/pages/docs/chat/rooms/messages.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ fun MyComponent(room: Room) {
231231
## Get a single message <a id="get-by-serial"/>
232232

233233
<If lang="javascript,swift,kotlin,jetpack">
234-
Use the <If lang="javascript">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Messages.html#get)</If><If lang="swift">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/messages/get%28withserial:%29)</If><If lang="kotlin">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-messages/get.html)</If> method to get a message in a chat room using message serial.
234+
Use the <If lang="javascript">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Messages.html#get)</If><If lang="swift">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/messages/get%28withserial:%29)</If><If lang="kotlin,jetpack">[`messages.get()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-messages/get.html)</If> method to get a message in a chat room using message serial.
235235
</If>
236236

237237
<If lang="react">

src/pages/docs/chat/rooms/occupancy.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Occupancy generates messages on any client entering/leaving a room, and so incre
1111

1212
## Subscribe to room occupancy <a id="subscribe"/>
1313

14-
<If lang="javascript,swift,kotlin,jetpack">
15-
Subscribe to a room's occupancy by registering a listener. Occupancy events are emitted whenever the number of online users within a room changes. Use the <If lang="javascript">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Occupancy.html#subscribe)</If><If lang="swift">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/occupancy/subscribe%28%29-3loon)</If><If lang="kotlin">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-occupancy/subscribe.html)</If><If lang="jetpack">[`collectAsOccupancy()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/jetpack/chat-extensions-compose/com.ably.chat.extensions.compose/collect-as-occupancy.html)</If> method in a room to receive updates:
14+
<If lang="javascript,swift,kotlin">
15+
Subscribe to a room's occupancy by registering a listener. Occupancy events are emitted whenever the number of online users within a room changes. Use the <If lang="javascript">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Occupancy.html#subscribe)</If><If lang="swift">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/occupancy/subscribe%28%29-3loon)</If><If lang="kotlin">[`occupancy.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-occupancy/subscribe.html)</If> method in a room to receive updates:
1616
</If>
1717

1818
<If lang="jetpack">

src/pages/docs/chat/rooms/presence.mdx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ The presence feature of a chat room enables online users to advertise to others
77

88
## Subscribe to presence <a id="subscribe"/>
99

10-
<If lang="javascript,swift,kotlin,jetpack">
11-
Subscribe to users' presence status by registering a listener. Presence events are emitted whenever a member enters or leaves the presence set, or updates their user data. Use the <If lang="javascript">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Presence.html#subscribe)</If><If lang="swift">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/presence/subscribe%28_%3A%29)</If><If lang="kotlin">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-presence/subscribe.html)</If><If lang="jetpack">[`collectAsPresenceMembers()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/jetpack/chat-extensions-compose/com.ably.chat.extensions.compose/collect-as-presence-members.html)</If> method in a room to receive updates:
10+
<If lang="javascript,swift,kotlin">
11+
Subscribe to users' presence status by registering a listener. Presence events are emitted whenever a member enters or leaves the presence set, or updates their user data. Use the <If lang="javascript">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.Presence.html#subscribe)</If><If lang="swift">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/presence/subscribe%28_%3A%29)</If><If lang="kotlin">[`presence.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-presence/subscribe.html)</If> method in a room to receive updates:
1212
</If>
1313

1414
<If lang="jetpack">
@@ -83,23 +83,6 @@ import androidx.compose.runtime.*
8383
import com.ably.chat.Room
8484
import com.ably.chat.extensions.compose.collectAsPresenceMembers
8585
86-
@Composable
87-
fun PresenceComponent(room: Room) {
88-
val presenceMembers by room.collectAsPresenceMembers()
89-
90-
Text("Present members: ${presenceMembers.size}")
91-
presenceMembers.forEach { member ->
92-
Text("${member.clientId} is present with data: ${member.data}")
93-
}
94-
}
95-
```
96-
97-
```jetpack
98-
import androidx.compose.material.*
99-
import androidx.compose.runtime.*
100-
import com.ably.chat.Room
101-
import com.ably.chat.extensions.compose.collectAsPresenceMembers
102-
10386
@Composable
10487
fun PresenceComponent(room: Room) {
10588
val presenceMembers by room.collectAsPresenceMembers()

src/pages/docs/chat/rooms/reactions.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Room reactions are ephemeral and not stored or aggregated by Ably. The intention
99

1010
## Subscribe to room reactions <a id="subscribe"/>
1111

12-
<If lang="javascript,swift,kotlin,jetpack">
13-
Subscribe to room reactions by registering a listener. Use the <If lang="javascript">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.RoomReactions.html#subscribe)</If><If lang="swift">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/roomreactions/subscribe%28%29-64gdf)</If><If lang="kotlin,jetpack">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-room-reactions/subscribe.html)</If> method in a room to receive reactions:
12+
<If lang="javascript,swift,kotlin">
13+
Subscribe to room reactions by registering a listener. Use the <If lang="javascript">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-js/main/typedoc/interfaces/chat-js.RoomReactions.html#subscribe)</If><If lang="swift">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-swift/main/AblyChat/documentation/ablychat/roomreactions/subscribe%28%29-64gdf)</If><If lang="kotlin">[`reactions.subscribe()`](https://sdk.ably.com/builds/ably/ably-chat-kotlin/main/dokka/chat/com.ably.chat/-room-reactions/subscribe.html)</If> method in a room to receive reactions:
1414
</If>
1515

1616
<If lang="jetpack">
@@ -39,7 +39,7 @@ const MyComponent = () => {
3939
console.log('Received reaction: ', reactionEvent.reaction);
4040
},
4141
});
42-
42+
4343
return <div>Room Reactions Component</div>;
4444
};
4545
```

0 commit comments

Comments
 (0)