ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: only pass one emoji match option per token in emoji match activity (#3844)

Browse source
This commit is contained in:
ggurdin 2025-09-02 14:06:57 -04:00 • committed by GitHub
parent 728f9efd4c
commit cb3f4d191c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pangea/message_token_text/message_token_button.dart
View file

@ -312,7 +312,14 @@ class MessageTokenButtonContent extends StatelessWidget {
return SizedBox(
height: height,
child: Text(
token.vocabConstructID.userSetEmoji.firstOrNull ?? '',
activity?.record.responses
.firstWhereOrNull(
(res) =>
res.cId == token.vocabConstructID && res.isCorrect,
)
?.text ??
token.vocabConstructID.userSetEmoji.firstOrNull ??
'',
style: _emojiStyle,
),
);

14
lib/pangea/practice_activities/emoji_activity_generator.dart
View file

@ -1,4 +1,5 @@
import 'package:fluffychat/pangea/constructs/construct_form.dart';
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
import 'package:fluffychat/pangea/lemmas/lemma_info_response.dart';
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
import 'package:fluffychat/pangea/practice_activities/message_activity_request.dart';
@ -20,16 +21,17 @@ class EmojiActivityGenerator {
MessageActivityRequest req,
) async {
final Map<ConstructForm, List<String>> matchInfo = {};
final List<PangeaToken> missingEmojis = [];
for (final token in req.targetTokens) {
final List<String> userSavedEmojis = token.vocabConstructID.userSetEmoji;
if (userSavedEmojis.isNotEmpty) {
matchInfo[token.vocabForm] = userSavedEmojis;
matchInfo[token.vocabForm] = [userSavedEmojis.first];
} else {
matchInfo[token.vocabForm] = [];
missingEmojis.add(token);
}
}
final List<Future<LemmaInfoResponse>> lemmaInfoFutures = req.targetTokens
final List<Future<LemmaInfoResponse>> lemmaInfoFutures = missingEmojis
.map((token) => token.vocabConstructID.getLemmaInfo())
.toList();
@ -38,8 +40,12 @@ class EmojiActivityGenerator {
for (int i = 0; i < req.targetTokens.length; i++) {
final formKey = req.targetTokens[i].vocabForm;
if (matchInfo[formKey] != null && matchInfo[formKey]!.isNotEmpty) {
continue; // Skip if user has already set emojis
}
matchInfo[formKey] ??= [];
matchInfo[formKey]!.addAll(lemmaInfos[i].emoji);
matchInfo[formKey]!.add(lemmaInfos[i].emoji.first);
}
return MessageActivityResponse(