Skip to content

Commit

Permalink
Merge pull request #306 from shiosyakeyakini-info/feature/fix_211
Browse files Browse the repository at this point in the history
#211 対応
  • Loading branch information
shiosyakeyakini-info authored Sep 9, 2023
2 parents 9287e89 + 539b466 commit f34172c
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/repository/note_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ class NoteRepository extends ChangeNotifier {
renote: note.renote ?? _notes[note.renoteId],
reply: note.reply ?? _notes[note.replyId],
poll: note.poll ?? registeredNote?.poll,
myReaction: note.myReaction ?? registeredNote?.myReaction,
myReaction: note.myReaction ??
(note.reactions.isNotEmpty ? registeredNote?.myReaction : null),
);
_noteStatuses[note.id] ??= const NoteStatus(
isCwOpened: false,
Expand Down
10 changes: 10 additions & 0 deletions lib/view/common/misskey_notes/misskey_note.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import 'package:miria/view/common/misskey_notes/note_vote.dart';
import 'package:miria/view/common/misskey_notes/reaction_button.dart';
import 'package:miria/view/common/misskey_notes/renote_modal_sheet.dart';
import 'package:miria/view/common/misskey_notes/renote_user_dialog.dart';
import 'package:miria/view/dialogs/simple_confirm_dialog.dart';
import 'package:miria/view/reaction_picker_dialog/reaction_picker_dialog.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:miria/view/themes/app_theme.dart';
Expand Down Expand Up @@ -736,6 +737,15 @@ class MisskeyNoteState extends ConsumerState<MisskeyNote> {
return;
}
if (displayNote.myReaction != null && requestEmoji == null) {
if (await SimpleConfirmDialog.show(
context: context,
message: "リアクション取り消してもええか?",
primary: "取り消す",
secondary: "やっぱりやめる") !=
true) {
return;
}

await ref
.read(misskeyProvider(account))
.notes
Expand Down
10 changes: 10 additions & 0 deletions lib/view/common/misskey_notes/reaction_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:miria/model/account.dart';
import 'package:miria/model/misskey_emoji_data.dart';
import 'package:miria/providers.dart';
import 'package:miria/view/common/account_scope.dart';
import 'package:miria/view/dialogs/simple_confirm_dialog.dart';
import 'package:miria/view/themes/app_theme.dart';
import 'package:miria/view/common/misskey_notes/custom_emoji.dart';
import 'package:miria/view/common/misskey_notes/reaction_user_dialog.dart';
Expand Down Expand Up @@ -65,6 +66,15 @@ class ReactionButtonState extends ConsumerState<ReactionButton> {
// リアクション取り消し
final account = AccountScope.of(context);
if (isMyReaction) {
if (await SimpleConfirmDialog.show(
context: context,
message: "リアクション取り消してもええか?",
primary: "取り消す",
secondary: "やっぱりやめる") !=
true) {
return;
}

await ref
.read(misskeyProvider(account))
.notes
Expand Down
10 changes: 10 additions & 0 deletions lib/view/user_page/user_control_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:miria/model/account.dart';
import 'package:miria/providers.dart';
import 'package:miria/view/common/error_notification.dart';
import 'package:miria/view/common/futurable.dart';
import 'package:miria/view/dialogs/simple_confirm_dialog.dart';
import 'package:misskey_dart/misskey_dart.dart';
import 'package:url_launcher/url_launcher.dart';

Expand Down Expand Up @@ -95,6 +96,15 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
}

Future<void> blockingCreate() async {
if (await SimpleConfirmDialog.show(
context: context,
message: "ブロックしてもええか?",
primary: "ブロックする",
secondary: "やっぱりやめる") !=
true) {
return;
}

await ref
.read(misskeyProvider(widget.account))
.blocking
Expand Down
12 changes: 11 additions & 1 deletion lib/view/user_page/user_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:miria/view/common/avatar_icon.dart';
import 'package:miria/view/common/constants.dart';
import 'package:miria/view/common/misskey_notes/mfm_text.dart';
import 'package:miria/view/common/misskey_notes/misskey_note.dart';
import 'package:miria/view/dialogs/simple_confirm_dialog.dart';
import 'package:miria/view/themes/app_theme.dart';
import 'package:miria/view/user_page/update_memo_dialog.dart';
import 'package:miria/view/user_page/user_control_dialog.dart';
Expand Down Expand Up @@ -58,11 +59,20 @@ class UserDetailState extends ConsumerState<UserDetail> {

Future<void> followDelete() async {
if (isFollowEditing) return;
final account = AccountScope.of(context);
if (await SimpleConfirmDialog.show(
context: context,
message: "フォロー解除してもええか?",
primary: "解除する",
secondary: "やっぱりやめる") !=
true) {
return;
}
setState(() {
isFollowEditing = true;
});
await ref
.read(misskeyProvider(AccountScope.of(context)))
.read(misskeyProvider(account))
.following
.delete(FollowingDeleteRequest(userId: response.id));
if (!mounted) return;
Expand Down

0 comments on commit f34172c

Please sign in to comment.