mirror of
https://github.com/HChaZZY/PiliPlus.git
synced 2025-12-06 09:13:48 +08:00
fix: reply message
opt: pm share Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
@@ -648,7 +648,7 @@ class _ArticlePageState extends State<ArticlePage>
|
||||
children: [
|
||||
Icon(Icons.forward_to_inbox, size: 19),
|
||||
SizedBox(width: 10),
|
||||
Text('分享至动态'),
|
||||
Text('分享至消息'),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -246,7 +246,14 @@ class _HistoryPageState extends State<HistoryPage>
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
controller: _historyController.scrollController,
|
||||
slivers: [
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(
|
||||
top: StyleString.safeSpace - 5,
|
||||
bottom: MediaQuery.of(context).padding.bottom + 80,
|
||||
),
|
||||
sliver:
|
||||
Obx(() => _buildBody(_historyController.loadingState.value)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -263,12 +270,7 @@ class _HistoryPageState extends State<HistoryPage>
|
||||
),
|
||||
),
|
||||
Success() => loadingState.response?.isNotEmpty == true
|
||||
? SliverPadding(
|
||||
padding: EdgeInsets.only(
|
||||
top: StyleString.safeSpace - 5,
|
||||
bottom: MediaQuery.of(context).padding.bottom + 80,
|
||||
),
|
||||
sliver: SliverGrid(
|
||||
? SliverGrid(
|
||||
gridDelegate: Grid.videoCardHDelegate(context),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
@@ -286,7 +288,6 @@ class _HistoryPageState extends State<HistoryPage>
|
||||
},
|
||||
childCount: loadingState.response!.length,
|
||||
),
|
||||
),
|
||||
)
|
||||
: HttpError(
|
||||
onReload: _historyController.onReload,
|
||||
|
||||
@@ -25,7 +25,6 @@ import 'package:PiliPlus/utils/feed_back.dart';
|
||||
import 'package:PiliPlus/utils/storage.dart';
|
||||
import 'package:PiliPlus/utils/url_utils.dart';
|
||||
import 'package:PiliPlus/utils/utils.dart';
|
||||
import 'package:html/parser.dart' show parse;
|
||||
|
||||
class ReplyItemGrpc extends StatelessWidget {
|
||||
const ReplyItemGrpc({
|
||||
@@ -618,7 +617,6 @@ class ReplyItemGrpc extends StatelessWidget {
|
||||
});
|
||||
message = message.replaceAll(RegExp(r"\{vote:\d+?\}"), "");
|
||||
}
|
||||
message = parse(message).body?.text ?? message;
|
||||
// 构建正则表达式
|
||||
final List<String> specialTokens = [
|
||||
...content.emote.keys,
|
||||
|
||||
@@ -43,12 +43,11 @@ class RequestUtils {
|
||||
required int receiverId,
|
||||
required Map content,
|
||||
String? message,
|
||||
ValueChanged<bool>? callback,
|
||||
}) async {
|
||||
SmartDialog.showLoading();
|
||||
|
||||
final ownerMid = Accounts.main.mid;
|
||||
final videoRes = await GrpcRepo.sendMsg(
|
||||
final contentRes = await GrpcRepo.sendMsg(
|
||||
senderUid: ownerMid,
|
||||
receiverId: receiverId,
|
||||
content: jsonEncode(content),
|
||||
@@ -57,26 +56,26 @@ class RequestUtils {
|
||||
: MsgType.EN_MSG_TYPE_SHARE_V2,
|
||||
);
|
||||
|
||||
if (videoRes['status']) {
|
||||
if (contentRes['status']) {
|
||||
if (message?.isNotEmpty == true) {
|
||||
var textRes = await MsgHttp.sendMsg(
|
||||
var msgRes = await MsgHttp.sendMsg(
|
||||
senderUid: ownerMid,
|
||||
receiverId: receiverId,
|
||||
content: jsonEncode({"content": message}),
|
||||
msgType: 1,
|
||||
);
|
||||
Get.back();
|
||||
if (textRes['status']) {
|
||||
if (msgRes['status']) {
|
||||
SmartDialog.showToast('分享成功');
|
||||
} else {
|
||||
SmartDialog.showToast('视频分享成功,但消息分享失败: ${textRes['msg']}');
|
||||
SmartDialog.showToast('内容分享成功,但消息分享失败: ${msgRes['msg']}');
|
||||
}
|
||||
} else {
|
||||
Get.back();
|
||||
SmartDialog.showToast('分享成功');
|
||||
}
|
||||
} else {
|
||||
SmartDialog.showToast('分享失败: ${videoRes['msg']}');
|
||||
SmartDialog.showToast('分享失败: ${contentRes['msg']}');
|
||||
}
|
||||
SmartDialog.dismiss();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user