more elegantly handle empty displaynames
This commit is contained in:
parent
130dbac879
commit
eb87cbc17b
4 changed files with 30 additions and 18 deletions
|
|
@ -231,10 +231,10 @@ class ClientController extends AsyncNotifier<int> {
|
||||||
Future<Paginate> paginate(PaginateRequest request) async =>
|
Future<Paginate> paginate(PaginateRequest request) async =>
|
||||||
Paginate.fromJson(await _sendCommand("paginate", request.toJson()));
|
Paginate.fromJson(await _sendCommand("paginate", request.toJson()));
|
||||||
|
|
||||||
Future<Profile> getProfile(String userId) async => Profile.fromJsonWithCatch({
|
Future<Profile> getProfile(String userId) async {
|
||||||
...(await _sendCommand("get_profile", {"user_id": userId})),
|
final json = await _sendCommand("get_profile", {"user_id": userId});
|
||||||
"id": userId,
|
return Profile.fromJsonWithCatch({...json, "id": userId});
|
||||||
});
|
}
|
||||||
|
|
||||||
Future<void> reportEvent(ReportRequest request) =>
|
Future<void> reportEvent(ReportRequest request) =>
|
||||||
_sendCommand("report_event", request.toJson());
|
_sendCommand("report_event", request.toJson());
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,6 @@ class ProfileController extends AsyncNotifier<Profile> {
|
||||||
return client.getProfile(userId);
|
return client.getProfile(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
static final provider =
|
static final provider = AsyncNotifierProvider.family
|
||||||
AsyncNotifierProvider.family<ProfileController, Profile, String>(
|
.autoDispose<ProfileController, Profile, String>(ProfileController.new);
|
||||||
ProfileController.new,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,16 @@ part "membership.g.dart";
|
||||||
@freezed
|
@freezed
|
||||||
abstract class MembershipContent extends Content with _$MembershipContent {
|
abstract class MembershipContent extends Content with _$MembershipContent {
|
||||||
MembershipContent._();
|
MembershipContent._();
|
||||||
|
|
||||||
|
static String? displaynameFromJson(String? displayName) =>
|
||||||
|
displayName?.isEmpty == true ? null : displayName;
|
||||||
|
|
||||||
factory MembershipContent({
|
factory MembershipContent({
|
||||||
@JsonKey(name: "displayname") required String? displayName,
|
@JsonKey(
|
||||||
|
name: "displayname",
|
||||||
|
fromJson: MembershipContent.displaynameFromJson,
|
||||||
|
)
|
||||||
|
required String? displayName,
|
||||||
@JsonKey(name: "membership") required MembershipStatus status,
|
@JsonKey(name: "membership") required MembershipStatus status,
|
||||||
Uri? avatarUrl,
|
Uri? avatarUrl,
|
||||||
String? reason,
|
String? reason,
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,32 @@
|
||||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||||
import "package:freezed_annotation/freezed_annotation.dart";
|
import "package:freezed_annotation/freezed_annotation.dart";
|
||||||
|
import "package:nexus/models/content/membership.dart";
|
||||||
part "profile.freezed.dart";
|
part "profile.freezed.dart";
|
||||||
part "profile.g.dart";
|
part "profile.g.dart";
|
||||||
|
|
||||||
Object? readPronouns(Map<dynamic, dynamic> map, _) =>
|
|
||||||
map["m.pronouns"] ?? map["io.fsky.nyx.pronouns"];
|
|
||||||
|
|
||||||
Object? readTimezone(Map<dynamic, dynamic> map, _) =>
|
|
||||||
map["m.tz"] ?? map["us.cloke.msc4175.tz"];
|
|
||||||
|
|
||||||
@freezed
|
@freezed
|
||||||
abstract class Profile with _$Profile {
|
abstract class Profile with _$Profile {
|
||||||
|
static Object? readPronouns(Map<dynamic, dynamic> map, _) =>
|
||||||
|
map["m.pronouns"] ?? map["io.fsky.nyx.pronouns"];
|
||||||
|
|
||||||
|
static Object? readTimezone(Map<dynamic, dynamic> map, _) =>
|
||||||
|
map["m.tz"] ?? map["us.cloke.msc4175.tz"];
|
||||||
|
|
||||||
const factory Profile({
|
const factory Profile({
|
||||||
required String id,
|
required String id,
|
||||||
String? parseError,
|
String? parseError,
|
||||||
Uri? avatarUrl,
|
Uri? avatarUrl,
|
||||||
@JsonKey(name: "displayname") String? displayName,
|
|
||||||
|
|
||||||
@JsonKey(readValue: readTimezone, name: "m.tz") String? timezone,
|
@JsonKey(
|
||||||
|
name: "displayname",
|
||||||
|
fromJson: MembershipContent.displaynameFromJson,
|
||||||
|
)
|
||||||
|
String? displayName,
|
||||||
|
|
||||||
|
@JsonKey(readValue: Profile.readTimezone, name: "m.tz") String? timezone,
|
||||||
|
|
||||||
@Default(IList.empty())
|
@Default(IList.empty())
|
||||||
@JsonKey(readValue: readPronouns, name: "io.fsky.nyx.pronouns")
|
@JsonKey(readValue: Profile.readPronouns, name: "io.fsky.nyx.pronouns")
|
||||||
IList<Pronoun> pronouns,
|
IList<Pronoun> pronouns,
|
||||||
}) = _Profile;
|
}) = _Profile;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue