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

Add invite requests support #46

Open
wants to merge 3 commits into
base: main
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
9 changes: 9 additions & 0 deletions lib/clients/notification_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:collection/collection.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart' as fln;
import 'package:recon/auxiliary.dart';
import 'package:recon/models/invite_request.dart';
import 'package:recon/models/message.dart';
import 'package:recon/models/session.dart';

Expand Down Expand Up @@ -77,6 +78,14 @@ class NotificationClient {
case MessageType.object:
content = "Asset";
break;
case MessageType.inviteRequest:
try {
final request = InviteRequest.fromMap(jsonDecode(message.content));
content = "${request.usernameToInvite} Requested an Invite";
} catch (e) {
content = "Invite Request";
}
break;
}
return fln.Message(
content,
Expand Down
98 changes: 98 additions & 0 deletions lib/models/invite_request.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
class InviteRequest {
final String inviteRequestId;
final String userIdToInvite;
final String usernameToInvite;
final String requestingFromUserId;
final String requestingFromUsername;
final String? forSessionId;
final String? forSessionName;
final bool? isContactOfHost;
final String? response;
final String? invite;

InviteRequest({
required this.inviteRequestId,
required this.userIdToInvite,
required this.usernameToInvite,
required this.requestingFromUserId,
required this.requestingFromUsername,
required this.forSessionId,
required this.forSessionName,
required this.isContactOfHost,
required this.response,
required this.invite,

});

factory InviteRequest.none() {
return InviteRequest(
inviteRequestId: "",
userIdToInvite: "",
usernameToInvite: "",
requestingFromUserId: "",
requestingFromUsername: "",
forSessionId: null,
forSessionName: null,
isContactOfHost: null,
response: null,
invite: null,
);
}

factory InviteRequest.fromMap(Map? map) {
if (map == null) return InviteRequest.none();
return InviteRequest(
inviteRequestId: map["inviteRequestId"],
userIdToInvite: map["userIdToInvite"],
usernameToInvite: map["usernameToInvite"],
requestingFromUserId: map["requestingFromUserId"],
requestingFromUsername: map["requestingFromUsername"],
forSessionId: map["forSessionId"],
forSessionName: map["forSessionName"],
isContactOfHost: map["isContactOfHost"],
response: map["response"],
invite: map["invite"],
);
}

Map toMap({bool shallow = false}) {
return {
"inviteRequestId": inviteRequestId,
"userIdToInvite": userIdToInvite,
"usernameToInvite": usernameToInvite,
"requestingFromUserId": requestingFromUserId,
"requestingFromUsername": requestingFromUsername,
"forSessionId": forSessionId,
"forSessionName": forSessionName,
"isContactOfHost": isContactOfHost,
"response": response,
"invite": invite,
};
}

InviteRequest copyWith({
String? inviteRequestId,
String? userIdToInvite,
String? usernameToInvite,
String? requestingFromUserId,
String? requestingFromUsername,
String? forSessionId,
String? forSessionName,
bool? isContactOfHost,
String? response,
String? invite,
}) {
return InviteRequest(
inviteRequestId: inviteRequestId ?? this.inviteRequestId,
userIdToInvite: userIdToInvite ?? this.userIdToInvite,
usernameToInvite: usernameToInvite ?? this.usernameToInvite,
requestingFromUserId: requestingFromUserId ?? this.requestingFromUserId,
requestingFromUsername: requestingFromUsername ?? this.requestingFromUsername,
forSessionId: forSessionId ?? this.forSessionId,
forSessionName: forSessionName ?? this.forSessionName,
isContactOfHost: isContactOfHost ?? this.isContactOfHost,
response: response ?? this.response,
invite: invite ?? this.invite,
);
}
}
4 changes: 3 additions & 1 deletion lib/models/message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ enum MessageType {
text,
sound,
sessionInvite,
object;
object,
inviteRequest;

static const Map<MessageType, String> _mapper = {
MessageType.text: "Text",
MessageType.sound: "Sound",
MessageType.sessionInvite: "SessionInvite",
MessageType.object: "Object",
MessageType.inviteRequest: "InviteRequest",
};

factory MessageType.fromName(String name) {
Expand Down
2 changes: 2 additions & 0 deletions lib/widgets/messages/message_bubble.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:recon/models/message.dart';
import 'package:recon/widgets/messages/message_asset.dart';
import 'package:recon/widgets/messages/message_audio_player.dart';
import 'package:recon/widgets/messages/message_session_invite.dart';
import 'package:recon/widgets/messages/message_invite_request.dart';
import 'package:recon/widgets/messages/message_text.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -32,6 +33,7 @@ class MessageBubble extends StatelessWidget {
MessageType.sessionInvite => MessageSessionInvite(message: message, foregroundColor: foregroundColor,),
MessageType.object => MessageAsset(message: message, foregroundColor: foregroundColor,),
MessageType.sound => MessageAudioPlayer(message: message, foregroundColor: foregroundColor,),
MessageType.inviteRequest => MessageInviteRequest(message: message, foregroundColor: foregroundColor,),
MessageType.unknown || MessageType.text => MessageText(message: message, foregroundColor: foregroundColor,)
},
),
Expand Down
70 changes: 70 additions & 0 deletions lib/widgets/messages/message_invite_request.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import 'dart:convert';

import 'package:flutter/material.dart';
import 'package:recon/client_holder.dart';
import 'package:recon/models/invite_request.dart';
import 'package:recon/models/message.dart';
import 'package:recon/string_formatter.dart';
import 'package:recon/widgets/formatted_text.dart';
import 'package:recon/widgets/messages/message_state_indicator.dart';

class MessageInviteRequest extends StatelessWidget {
const MessageInviteRequest({required this.message, this.foregroundColor, super.key});

final Color? foregroundColor;
final Message message;
@override
Widget build(BuildContext context) {
final inviteInfo = InviteRequest.fromMap(jsonDecode(message.content));
final bool fromSelf = message.senderId == ClientHolder.of(context).apiClient.userId;
final bool selfRequest = fromSelf && inviteInfo.forSessionName == null;
String text;
if (selfRequest) {
//if the sender is the logged in user and the session name isn't included; this is the user requesting for an invite themselves.
text ='''Requested invite''';
} else if (fromSelf) {
//Forwarded invite request
text = '''Forwarded invite request from "${inviteInfo.usernameToInvite}" to session "${inviteInfo.forSessionName}"''';
} else if (inviteInfo.forSessionName != null) {
//Another user requested an invite from you.
text = '''${inviteInfo.usernameToInvite} would like to join you in "${inviteInfo.forSessionName}"''';
} else {
text = '''${inviteInfo.usernameToInvite} would like to join you''';
}

final formattedText = FormatNode.fromText(text);

return Container(
constraints: const BoxConstraints(maxWidth: 300),
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
constraints: const BoxConstraints(maxWidth: 300),
padding: const EdgeInsets.symmetric(horizontal: 8),
child:
FormattedText(
formattedText,
softWrap: true,
maxLines: null,
style: Theme
.of(context)
.textTheme
.bodyLarge
?.copyWith(color: foregroundColor),),
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [
MessageStateIndicator(
message: message,
foregroundColor: foregroundColor,
),
],
),
],
),
);
}
}