Skip to content

Commit 1f33395

Browse files
provokateurinprovokateurin
committed
feat(nextcloud)!: Support spreed 21
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent cbc8d30 commit 1f33395

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+14945
-5660
lines changed

‎external/nextcloud-spreed‎

Submodule nextcloud-spreed updated 740 files

‎packages/neon_framework/packages/talk_app/lib/src/blocs/room.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class _TalkRoomBloc extends InteractiveBloc implements TalkRoomBloc {
102102
..lastActivity = lastMessage.timestamp
103103
..lastMessage = (
104104
baseMessage: null,
105-
builtListNever: null,
106105
// TODO: This manual conversion is only necessary because the interface isn't used everywhere: https://github.com/nextcloud/neon/issues/1995
107106
chatMessage: spreed.ChatMessage.fromJson(lastMessage.toJson()),
108107
)

‎packages/neon_framework/packages/talk_app/lib/src/utils/helpers.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ extension $ReactionInterfaceHelpers on spreed.$ReactionInterface {
4242
/// Returns if the Talk [feature] is supported on the instance.
4343
bool hasFeature(BuildContext context, String feature) {
4444
final capabilitiesBloc = NeonProvider.of<CapabilitiesBloc>(context);
45-
final capabilities = capabilitiesBloc
46-
.capabilities.valueOrNull?.data?.capabilities.spreedPublicCapabilities?.spreedPublicCapabilities0?.spreed;
45+
final capabilities = capabilitiesBloc.capabilities.valueOrNull?.data?.capabilities.spreedPublicCapabilities?.spreed;
4746

4847
if (capabilities == null) {
4948
return false;

‎packages/neon_framework/packages/talk_app/lib/src/widgets/actor_avatar.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:nextcloud/spreed.dart' as spreed;
77

88
/// Displays an avatar for the actor.
99
///
10-
/// In case the [actorType] is [spreed.ActorType.users] the user avatar will be shown, otherwise an appropriate icon is displayed.
10+
/// In case the [actorType] is [spreed.ActorTypes.users] the user avatar will be shown, otherwise an appropriate icon is displayed.
1111
class TalkActorAvatar extends StatelessWidget {
1212
/// Creates a new Talk actor avatar.
1313
const TalkActorAvatar({
@@ -20,22 +20,22 @@ class TalkActorAvatar extends StatelessWidget {
2020
final String actorId;
2121

2222
/// The type of the actor.
23-
final spreed.ActorType actorType;
23+
final spreed.ActorTypes actorType;
2424

2525
@override
2626
Widget build(BuildContext context) {
2727
return switch (actorType) {
28-
spreed.ActorType.users => NeonUserAvatar(
28+
spreed.ActorTypes.users => NeonUserAvatar(
2929
username: actorId,
3030
account: NeonProvider.of<Account>(context),
3131
),
32-
spreed.ActorType.groups || spreed.ActorType.circles => CircleAvatar(
32+
spreed.ActorTypes.groups || spreed.ActorTypes.circles => CircleAvatar(
3333
child: Icon(AdaptiveIcons.group),
3434
),
35-
spreed.ActorType.emails => CircleAvatar(
35+
spreed.ActorTypes.emails => CircleAvatar(
3636
child: Icon(AdaptiveIcons.email),
3737
),
38-
spreed.ActorType.bots => CircleAvatar(
38+
spreed.ActorTypes.bots => CircleAvatar(
3939
child: Icon(AdaptiveIcons.automation),
4040
),
4141
_ => CircleAvatar(

‎packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ typedef TalkMessageAction = ({Widget icon, Widget child, VoidCallback onPressed}
3030
String getActorDisplayName(TalkLocalizations localizations, spreed.$ChatMessageInterface chatMessage) {
3131
final actorDisplayName = chatMessage.actorDisplayName;
3232

33-
if (actorDisplayName.isEmpty && chatMessage.actorType == spreed.ActorType.guests) {
33+
if (actorDisplayName.isEmpty && chatMessage.actorType == spreed.ActorTypes.guests) {
3434
return localizations.actorGuest;
3535
}
3636

‎packages/neon_framework/packages/talk_app/test/actor_avatar_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ void main() {
1212
FakeNeonStorage.setup();
1313
});
1414

15-
for (final type in spreed.ActorType.values) {
16-
final avatarMatcher = type == spreed.ActorType.users ? findsOne : findsNothing;
17-
final iconMatcher = type == spreed.ActorType.users ? findsNothing : findsOne;
15+
for (final type in spreed.ActorTypes.values) {
16+
final avatarMatcher = type == spreed.ActorTypes.users ? findsOne : findsNothing;
17+
final iconMatcher = type == spreed.ActorTypes.users ? findsNothing : findsOne;
1818

1919
testWidgets('$type', (tester) async {
2020
final account = MockAccount();

‎packages/neon_framework/packages/talk_app/test/main_page_test.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void main() {
8383
});
8484

8585
testWidgets('Open room', (tester) async {
86-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: null));
86+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: null));
8787
when(() => room.unreadMessages).thenReturn(0);
8888

8989
final navigatorObserver = MockNavigatorObserver();
@@ -108,7 +108,7 @@ void main() {
108108
});
109109

110110
testWidgets('Without message preview', (tester) async {
111-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: null));
111+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: null));
112112
when(() => room.unreadMessages).thenReturn(0);
113113

114114
await tester.pumpWidgetWithAccessibility(
@@ -136,7 +136,7 @@ void main() {
136136
when(() => chatMessage.messageParameters).thenReturn(BuiltMap());
137137
when(() => chatMessage.timestamp).thenReturn(tz.TZDateTime.now(tz.UTC).secondsSinceEpoch - 60 * 60);
138138

139-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: chatMessage));
139+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: chatMessage));
140140
when(() => room.unreadMessages).thenReturn(1);
141141

142142
await tester.pumpWidgetWithAccessibility(
@@ -171,7 +171,7 @@ void main() {
171171
when(() => chatMessage.id).thenReturn(0);
172172
when(() => chatMessage.timestamp).thenReturn(tz.TZDateTime.now(tz.UTC).secondsSinceEpoch - 60 * 60);
173173

174-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: chatMessage));
174+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: chatMessage));
175175
when(() => room.unreadMessages).thenReturn(0);
176176
when(() => room.lastCommonReadMessage).thenReturn(0);
177177

@@ -207,7 +207,7 @@ void main() {
207207
when(() => chatMessage.id).thenReturn(0);
208208
when(() => chatMessage.timestamp).thenReturn(tz.TZDateTime.now(tz.UTC).secondsSinceEpoch - 60 * 60);
209209

210-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: chatMessage));
210+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: chatMessage));
211211
when(() => room.unreadMessages).thenReturn(0);
212212
when(() => room.lastCommonReadMessage).thenReturn(0);
213213

@@ -236,7 +236,7 @@ void main() {
236236
});
237237

238238
testWidgets('Create room', (tester) async {
239-
when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: null));
239+
when(() => room.lastMessage).thenReturn((baseMessage: null, chatMessage: null));
240240
when(() => room.unreadMessages).thenReturn(0);
241241

242242
await tester.pumpWidgetWithAccessibility(

‎packages/neon_framework/packages/talk_app/test/message_test.dart‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data buildCapabilities(core.S
6666
spreedCapabilities: null,
6767
spreedPublicCapabilities: (
6868
builtListNever: null,
69-
spreedPublicCapabilities0: core.SpreedPublicCapabilities0(
69+
spreedPublicCapabilities: core.SpreedPublicCapabilities(
7070
(b) => b.spreed.replace(spreedCapabilities),
7171
),
7272
) as core.SpreedPublicCapabilities,
@@ -158,7 +158,7 @@ void main() {
158158
test('Guest without name', () {
159159
final chatMessage = MockChatMessage();
160160
when(() => chatMessage.actorDisplayName).thenReturn('');
161-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.guests);
161+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.guests);
162162

163163
expect(getActorDisplayName(localizations, chatMessage), localizations.actorGuest);
164164
});
@@ -315,7 +315,7 @@ void main() {
315315
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
316316
when(() => chatMessage.timestamp).thenReturn(0);
317317
when(() => chatMessage.actorId).thenReturn('');
318-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
318+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
319319
when(() => chatMessage.actorDisplayName).thenReturn('');
320320
when(() => chatMessage.message).thenReturn('');
321321
when(() => chatMessage.reactions).thenReturn(BuiltMap());
@@ -397,7 +397,7 @@ void main() {
397397
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
398398
when(() => chatMessage.timestamp).thenReturn(0);
399399
when(() => chatMessage.actorId).thenReturn('test');
400-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
400+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
401401
when(() => chatMessage.actorDisplayName).thenReturn('test');
402402
when(() => chatMessage.message).thenReturn('abc');
403403
when(() => chatMessage.reactions).thenReturn(BuiltMap());
@@ -432,7 +432,7 @@ void main() {
432432
final chatMessage = MockChatMessage();
433433
when(() => chatMessage.timestamp).thenReturn(0);
434434
when(() => chatMessage.actorId).thenReturn('test');
435-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
435+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
436436
when(() => chatMessage.actorDisplayName).thenReturn('test');
437437
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
438438
when(() => chatMessage.message).thenReturn('abc');
@@ -484,7 +484,7 @@ void main() {
484484
final chatMessage = MockChatMessage();
485485
when(() => chatMessage.timestamp).thenReturn(0);
486486
when(() => chatMessage.actorId).thenReturn('test');
487-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
487+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
488488
when(() => chatMessage.actorDisplayName).thenReturn('test');
489489
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
490490
when(() => chatMessage.message).thenReturn('abc');
@@ -536,7 +536,7 @@ void main() {
536536
final chatMessage = MockChatMessage();
537537
when(() => chatMessage.timestamp).thenReturn(0);
538538
when(() => chatMessage.actorId).thenReturn('test');
539-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
539+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
540540
when(() => chatMessage.actorDisplayName).thenReturn('test');
541541
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.commentDeleted);
542542
when(() => chatMessage.message).thenReturn('abc');
@@ -624,7 +624,7 @@ void main() {
624624
final chatMessage = MockChatMessageWithParent();
625625
when(() => chatMessage.timestamp).thenReturn(0);
626626
when(() => chatMessage.actorId).thenReturn('test');
627-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
627+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
628628
when(() => chatMessage.actorDisplayName).thenReturn('test');
629629
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
630630
when(() => chatMessage.message).thenReturn('abc');
@@ -695,7 +695,7 @@ void main() {
695695
when(() => chatMessage.id).thenReturn(0);
696696
when(() => chatMessage.timestamp).thenReturn(0);
697697
when(() => chatMessage.actorId).thenReturn('test');
698-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
698+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
699699
when(() => chatMessage.actorDisplayName).thenReturn('test');
700700
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
701701
when(() => chatMessage.message).thenReturn('a b c');
@@ -760,7 +760,7 @@ void main() {
760760
final chatMessage = MockChatMessage();
761761
when(() => chatMessage.timestamp).thenReturn(0);
762762
when(() => chatMessage.actorId).thenReturn('test');
763-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
763+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
764764
when(() => chatMessage.actorDisplayName).thenReturn('test');
765765
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
766766
when(() => chatMessage.message).thenReturn('abc');
@@ -810,7 +810,7 @@ void main() {
810810
final chatMessage = MockChatMessage();
811811
when(() => chatMessage.timestamp).thenReturn(300);
812812
when(() => chatMessage.actorId).thenReturn('test');
813-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
813+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
814814
when(() => chatMessage.actorDisplayName).thenReturn('test');
815815
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
816816
when(() => chatMessage.message).thenReturn('abc');
@@ -859,7 +859,7 @@ void main() {
859859
final chatMessage = MockChatMessage();
860860
when(() => chatMessage.timestamp).thenReturn(0);
861861
when(() => chatMessage.actorId).thenReturn('test');
862-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
862+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
863863
when(() => chatMessage.actorDisplayName).thenReturn('test');
864864
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
865865
when(() => chatMessage.message).thenReturn('abc');
@@ -909,7 +909,7 @@ void main() {
909909
final chatMessage = MockChatMessage();
910910
when(() => chatMessage.timestamp).thenReturn(0);
911911
when(() => chatMessage.actorId).thenReturn('test');
912-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
912+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
913913
when(() => chatMessage.actorDisplayName).thenReturn('test');
914914
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
915915
when(() => chatMessage.message).thenReturn('abc');
@@ -964,7 +964,7 @@ void main() {
964964
chatMessage = MockChatMessage();
965965
when(() => chatMessage.timestamp).thenReturn(0);
966966
when(() => chatMessage.actorId).thenReturn('test');
967-
when(() => chatMessage.actorType).thenReturn(spreed.ActorType.users);
967+
when(() => chatMessage.actorType).thenReturn(spreed.ActorTypes.users);
968968
when(() => chatMessage.actorDisplayName).thenReturn('test');
969969
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment);
970970
when(() => chatMessage.message).thenReturn('abc');

‎packages/neon_framework/packages/talk_app/test/reactions_overview_dialog_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ void main() {
3535
when(() => chatMessage.systemMessage).thenReturn('');
3636

3737
final reaction1 = MockReaction();
38-
when(() => reaction1.actorType).thenReturn(spreed.ActorType.users);
38+
when(() => reaction1.actorType).thenReturn(spreed.ActorTypes.users);
3939
when(() => reaction1.actorId).thenReturn('user1');
4040
when(() => reaction1.actorDisplayName).thenReturn('User One');
4141
when(() => reaction1.timestamp).thenReturn(60);
4242

4343
final reaction2 = MockReaction();
44-
when(() => reaction2.actorType).thenReturn(spreed.ActorType.users);
44+
when(() => reaction2.actorType).thenReturn(spreed.ActorTypes.users);
4545
when(() => reaction2.actorId).thenReturn('user2');
4646
when(() => reaction2.actorDisplayName).thenReturn('User Two');
4747
when(() => reaction2.timestamp).thenReturn(120);
4848

4949
final reaction3 = MockReaction();
50-
when(() => reaction3.actorType).thenReturn(spreed.ActorType.users);
50+
when(() => reaction3.actorType).thenReturn(spreed.ActorTypes.users);
5151
when(() => reaction3.actorId).thenReturn('user3');
5252
when(() => reaction3.actorDisplayName).thenReturn('User Three');
5353
when(() => reaction3.timestamp).thenReturn(180);

‎packages/neon_framework/packages/talk_app/test/reactions_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import 'testing.dart';
2121

2222
spreed.Reaction getReaction() {
2323
final reaction = MockReaction();
24-
when(() => reaction.actorType).thenReturn(spreed.ActorType.users);
24+
when(() => reaction.actorType).thenReturn(spreed.ActorTypes.users);
2525
when(() => reaction.actorId).thenReturn('actorId');
2626
when(() => reaction.actorDisplayName).thenReturn('actorDisplayName');
2727
when(() => reaction.timestamp).thenReturn(0);

0 commit comments

Comments
 (0)