Skip to content

refactor(neon_framework): Cleanup user statuses Bloc #1390

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.

Sign up for GitHub

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

Merged
provokateurin merged 1 commit into from
Dec 29, 2023
Merged

refactor(neon_framework): Cleanup user statuses Bloc #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions packages/neon_framework/lib/src/blocs/user_statuses.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sealed class UserStatusesBloc implements Disposable {
void load(final String username, {final bool force = false});

/// All user status mapped by username.
BehaviorSubject<Map<String, Result<user_status.$PublicInterface?>>> get statuses;
BehaviorSubject<Map<String, Result<user_status.$PublicInterface>>> get statuses;
}

class _UserStatusesBloc extends InteractiveBloc implements UserStatusesBloc {
Expand All @@ -46,23 +46,21 @@ class _UserStatusesBloc extends InteractiveBloc implements UserStatusesBloc {
}

@override
BehaviorSubject<Map<String, Result<user_status.$PublicInterface?>>> statuses = BehaviorSubject.seeded({});
final statuses = BehaviorSubject<Map<String, Result<user_status.$PublicInterface>>>.seeded({});

@override
Future<void> refresh() async {
for (final username in statuses.value.keys) {
await load(username, force: true);
}
await Future.wait(statuses.value.keys.map((final username) => load(username, force: true)));
}

@override
Future<void> load(final String username, {final bool force = false}) async {
if (!force && statuses.value.containsKey(username)) {
if (!force && statuses.value.containsKey(username) && !statuses.value[username]!.hasError) {
return;
}

try {
updateStatus(username, Result.loading());
updateStatus(username, statuses.value[username]?.asLoading() ?? Result.loading());

user_status.$PublicInterface? data;

Expand Down Expand Up @@ -93,17 +91,13 @@ class _UserStatusesBloc extends InteractiveBloc implements UserStatusesBloc {

updateStatus(username, Result.success(data));
} catch (e, s) {
if (e is DynamiteApiException && e.statusCode == 404) {
updateStatus(username, Result.success(null));
return;
}
debugPrint(e.toString());
debugPrint(s.toString());
updateStatus(username, Result.error(e));
}
}

void updateStatus(final String username, final Result<user_status.$PublicInterface?> result) {
void updateStatus(final String username, final Result<user_status.$PublicInterface> result) {
statuses.add({
...statuses.value,
username: result,
Expand Down
7 changes: 4 additions & 3 deletions packages/neon_framework/lib/src/widgets/user_avatar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:neon_framework/src/widgets/image.dart';
import 'package:neon_framework/src/widgets/server_icon.dart';
import 'package:nextcloud/core.dart' as core;
import 'package:nextcloud/user_status.dart' as user_status;
import 'package:rxdart/rxdart.dart';

/// A circle that contains the user profile image and status.
class NeonUserAvatar extends StatefulWidget {
Expand Down Expand Up @@ -95,15 +94,17 @@ class _UserAvatarState extends State<NeonUserAvatar> {
children: [
avatar,
ResultBuilder(
stream: _userStatusBloc.statuses.mapNotNull((final statuses) => statuses[widget.username]),
stream: _userStatusBloc.statuses.map(
(final statuses) => statuses[widget.username] ?? Result<user_status.$PublicInterface>.loading(),
),
builder: _userStatusIconBuilder,
),
],
);
},
);

Widget _userStatusIconBuilder(final BuildContext context, final Result<user_status.$PublicInterface?> result) {
Widget _userStatusIconBuilder(final BuildContext context, final Result<user_status.$PublicInterface> result) {
final hasEmoji = result.data?.icon != null;
final scaledSize = size / (hasEmoji ? 2 : 2.5);

Expand Down