fix(llc): fix ownReactions population
This commit is contained in:
@@ -840,9 +840,15 @@ class Channel {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Inserting at the 0th index as it's the latest reaction
|
// Inserting at the 0th index as it's the latest reaction
|
||||||
latestReactions.insert(0, newReaction);
|
latestReactions
|
||||||
final ownReactions = [...latestReactions]
|
..insert(0, newReaction)
|
||||||
..removeWhere((it) => it.userId != user!.id);
|
..take(10);
|
||||||
|
final ownReactions = enforceUnique
|
||||||
|
? <Reaction>[newReaction]
|
||||||
|
: <Reaction>[
|
||||||
|
...message.ownReactions ?? [],
|
||||||
|
newReaction,
|
||||||
|
];
|
||||||
|
|
||||||
final newMessage = message.copyWith(
|
final newMessage = message.copyWith(
|
||||||
reactionCounts: {...message.reactionCounts ?? <String, int>{}}
|
reactionCounts: {...message.reactionCounts ?? <String, int>{}}
|
||||||
@@ -882,7 +888,6 @@ class Channel {
|
|||||||
Reaction reaction,
|
Reaction reaction,
|
||||||
) async {
|
) async {
|
||||||
final type = reaction.type;
|
final type = reaction.type;
|
||||||
final user = _client.state.currentUser;
|
|
||||||
|
|
||||||
final reactionCounts = {...message.reactionCounts ?? <String, int>{}};
|
final reactionCounts = {...message.reactionCounts ?? <String, int>{}};
|
||||||
if (reactionCounts.containsKey(type)) {
|
if (reactionCounts.containsKey(type)) {
|
||||||
@@ -899,8 +904,11 @@ class Channel {
|
|||||||
r.type == reaction.type &&
|
r.type == reaction.type &&
|
||||||
r.messageId == reaction.messageId);
|
r.messageId == reaction.messageId);
|
||||||
|
|
||||||
final ownReactions = [...latestReactions]
|
final ownReactions = message.ownReactions
|
||||||
..removeWhere((it) => it.userId != user!.id);
|
?..removeWhere((r) =>
|
||||||
|
r.userId == reaction.userId &&
|
||||||
|
r.type == reaction.type &&
|
||||||
|
r.messageId == reaction.messageId);
|
||||||
|
|
||||||
final newMessage = message.copyWith(
|
final newMessage = message.copyWith(
|
||||||
reactionCounts: reactionCounts..removeWhere((_, value) => value == 0),
|
reactionCounts: reactionCounts..removeWhere((_, value) => value == 0),
|
||||||
@@ -1605,10 +1613,10 @@ class ChannelClientState {
|
|||||||
|
|
||||||
void _listenReactionDeleted() {
|
void _listenReactionDeleted() {
|
||||||
_subscriptions.add(_channel.on(EventType.reactionDeleted).listen((event) {
|
_subscriptions.add(_channel.on(EventType.reactionDeleted).listen((event) {
|
||||||
final userId = _channel.client.state.currentUser!.id;
|
final oldMessage =
|
||||||
|
messages.firstWhereOrNull((it) => it.id == event.message?.id);
|
||||||
final message = event.message!.copyWith(
|
final message = event.message!.copyWith(
|
||||||
ownReactions: [...event.message!.latestReactions!]
|
ownReactions: oldMessage?.ownReactions,
|
||||||
..removeWhere((it) => it.userId != userId),
|
|
||||||
);
|
);
|
||||||
addMessage(message);
|
addMessage(message);
|
||||||
}));
|
}));
|
||||||
@@ -1616,10 +1624,10 @@ class ChannelClientState {
|
|||||||
|
|
||||||
void _listenReactions() {
|
void _listenReactions() {
|
||||||
_subscriptions.add(_channel.on(EventType.reactionNew).listen((event) {
|
_subscriptions.add(_channel.on(EventType.reactionNew).listen((event) {
|
||||||
final userId = _channel.client.state.currentUser!.id;
|
final oldMessage =
|
||||||
|
messages.firstWhereOrNull((it) => it.id == event.message?.id);
|
||||||
final message = event.message!.copyWith(
|
final message = event.message!.copyWith(
|
||||||
ownReactions: [...event.message!.latestReactions!]
|
ownReactions: oldMessage?.ownReactions,
|
||||||
..removeWhere((it) => it.userId != userId),
|
|
||||||
);
|
);
|
||||||
addMessage(message);
|
addMessage(message);
|
||||||
}));
|
}));
|
||||||
@@ -1632,10 +1640,11 @@ class ChannelClientState {
|
|||||||
EventType.reactionUpdated,
|
EventType.reactionUpdated,
|
||||||
)
|
)
|
||||||
.listen((event) {
|
.listen((event) {
|
||||||
final userId = _channel.client.state.currentUser!.id;
|
final oldMessage =
|
||||||
|
messages.firstWhereOrNull((it) => it.id == event.message?.id);
|
||||||
|
|
||||||
final message = event.message!.copyWith(
|
final message = event.message!.copyWith(
|
||||||
ownReactions: [...event.message!.latestReactions!]
|
ownReactions: oldMessage?.ownReactions,
|
||||||
..removeWhere((it) => it.userId != userId),
|
|
||||||
);
|
);
|
||||||
addMessage(message);
|
addMessage(message);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user