Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ノートの非表示に対応 #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions lib/src/converters/hide_before_converter.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:misskey_dart/misskey_dart.dart';

class HideBeforeConverter extends JsonConverter<HideBefore, int> {
const HideBeforeConverter();

@override
HideBefore fromJson(int json) {
if (json <= 0) {
return HideBeforeDuration(Duration(seconds: json));
} else {
return HideBeforeDateTime(
DateTime.fromMillisecondsSinceEpoch(json * 1000),
);
}
}

@override
int toJson(HideBefore object) => switch (object) {
HideBeforeDuration(:final duration) => duration.inSeconds,
HideBeforeDateTime(:final date) => date.millisecondsSinceEpoch ~/ 1000,
};
}
30 changes: 30 additions & 0 deletions lib/src/data/base/user.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:misskey_dart/misskey_dart.dart';
import 'package:misskey_dart/src/converters/date_time_converter.dart';
import 'package:misskey_dart/src/converters/emojis_converter.dart';
import 'package:misskey_dart/src/converters/hide_before_converter.dart';
import 'package:misskey_dart/src/converters/mute_words_converter.dart';
import 'package:misskey_dart/src/converters/uri_converter.dart';

Expand All @@ -22,6 +23,9 @@ abstract class User {
bool get isCat;
bool get isBot;
Map<String, String> get emojis;
bool? get requireSigninToViewContents;
HideBefore? get makeNotesFollowersOnlyBefore;
HideBefore? get makeNotesHiddenBefore;

factory User.fromJson(Map<String, Object?> json) {
if (json.containsKey("url")) {
Expand Down Expand Up @@ -106,6 +110,9 @@ class UserLite with _$UserLite implements User {
@EmojisConverter() @Default({}) Map<String, String> emojis,
@OnlineStatusJsonConverter() OnlineStatus? onlineStatus,
@Default([]) List<UserBadgeRole> badgeRoles,
bool? requireSigninToViewContents,
@HideBeforeConverter() HideBefore? makeNotesFollowersOnlyBefore,
@HideBeforeConverter() HideBefore? makeNotesHiddenBefore,
}) = _UserLite;

factory UserLite.fromJson(Map<String, Object?> json) =>
Expand All @@ -128,6 +135,9 @@ class UserDetailedNotMe with _$UserDetailedNotMe implements UserDetailed {
@EmojisConverter() @Default({}) Map<String, String> emojis,
@OnlineStatusJsonConverter() OnlineStatus? onlineStatus,
@Default([]) List<UserBadgeRole> badgeRoles,
bool? requireSigninToViewContents,
@HideBeforeConverter() HideBefore? makeNotesFollowersOnlyBefore,
@HideBeforeConverter() HideBefore? makeNotesHiddenBefore,
@NullableUriConverter() Uri? url,
@NullableUriConverter() Uri? uri,
@NullableUriConverter() Uri? movedTo,
Expand Down Expand Up @@ -187,6 +197,9 @@ class UserDetailedNotMeWithRelations
@EmojisConverter() @Default({}) Map<String, String> emojis,
@OnlineStatusJsonConverter() OnlineStatus? onlineStatus,
@Default([]) List<UserBadgeRole> badgeRoles,
bool? requireSigninToViewContents,
@HideBeforeConverter() HideBefore? makeNotesFollowersOnlyBefore,
@HideBeforeConverter() HideBefore? makeNotesHiddenBefore,
@NullableUriConverter() Uri? url,
@NullableUriConverter() Uri? uri,
@NullableUriConverter() Uri? movedTo,
Expand Down Expand Up @@ -255,6 +268,9 @@ class MeDetailed with _$MeDetailed implements UserDetailed {
@EmojisConverter() @Default({}) Map<String, String> emojis,
@OnlineStatusJsonConverter() OnlineStatus? onlineStatus,
@Default([]) List<UserBadgeRole> badgeRoles,
bool? requireSigninToViewContents,
@HideBeforeConverter() HideBefore? makeNotesFollowersOnlyBefore,
@HideBeforeConverter() HideBefore? makeNotesHiddenBefore,
@NullableUriConverter() Uri? url,
@NullableUriConverter() Uri? uri,
@NullableUriConverter() Uri? movedTo,
Expand Down Expand Up @@ -373,6 +389,20 @@ class UserBadgeRole with _$UserBadgeRole {
_$UserBadgeRoleFromJson(json);
}

sealed class HideBefore {}

class HideBeforeDuration implements HideBefore {
const HideBeforeDuration(this.duration);

final Duration duration;
}

class HideBeforeDateTime implements HideBefore {
const HideBeforeDateTime(this.date);

final DateTime date;
}

@freezed
class UserRole with _$UserRole {
const factory UserRole({
Expand Down
Loading
Loading