mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：评论区HTML实体转义；逻辑错误短路

Browse Source
This commit is contained in:
orz12
2024-02-02 00:34:52 +08:00
parent 81371c5a31
commit 0b349e102e
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@ -540,20 +540,6 @@ InlineSpan buildContent(
// replyReply 查看二楼回复（回复详情）回调 // replyReply 查看二楼回复（回复详情）回调
// fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
final content = replyItem.content; final content = replyItem.content;
if (content.emote.isEmpty &&
content.atNameToMid.isEmpty &&
content.jumpUrl.isEmpty &&
content.vote.isEmpty &&
content.pictures.isEmpty &&
content.message.isNotEmpty &&
!RegExp(r'\b[0-9]{1,2}[:：][0-9]{2}\b').hasMatch(content.message)) {
return TextSpan(
text: content.message,
recognizer: TapGestureRecognizer()
..onTap =
() => replyReply(replyItem.root == 0 ? replyItem : fReplyItem),
);
}
final List<InlineSpan> spanChilds = <InlineSpan>[]; final List<InlineSpan> spanChilds = <InlineSpan>[];
bool hasMatchMember = false; bool hasMatchMember = false;
@ -585,10 +571,13 @@ InlineSpan buildContent(
}); });
} }
// content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' '); // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
if (content.message.contains('&amp;')) { content.message = content.message.replaceAll('&amp;', '&')
content.message = content.message.replaceAll('&amp;', '&'); .replaceAll('&lt;', '<')
} .replaceAll('&gt;', '>')
print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString()); .replaceAll('&quot;', '"')
.replaceAll('&apos;', "'")
.replaceAll('&nbsp;', ' ');
// print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString());
// 构建正则表达式 // 构建正则表达式
final List<String> specialTokens = [ final List<String> specialTokens = [
...content.emote.keys, ...content.emote.keys,
@ -674,7 +663,7 @@ InlineSpan buildContent(
), ),
); );
} else { } else {
print("matchStr=$matchStr"); // print("matchStr=$matchStr");
String appUrlSchema = ''; String appUrlSchema = '';
final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
defaultValue: false) as bool; defaultValue: false) as bool;