ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved merge conflict

Browse source
This commit is contained in:
ggurdin 2024-11-04 13:46:22 -05:00
commit eab4a314fd
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
11 changed files with 193 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

180
lib/pages/chat/input_bar.dart
View file

@ -8,13 +8,10 @@ import 'package:fluffychat/widgets/mxc_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
import 'package:matrix/matrix.dart';
import 'package:pasteboard/pasteboard.dart';
import 'package:slugify/slugify.dart';
import '../../widgets/matrix.dart';
class InputBar extends StatelessWidget {
final Room room;
final int? minLines;
@ -23,7 +20,7 @@ class InputBar extends StatelessWidget {
final TextInputAction? textInputAction;
final ValueChanged<String>? onSubmitted;
final ValueChanged<Uint8List?>? onSubmitImage;
final FocusNode? focusNode;
final FocusNode focusNode;
// #Pangea
// final TextEditingController? controller;
final PangeaTextController? controller;
@ -40,7 +37,7 @@ class InputBar extends StatelessWidget {
this.keyboardType,
this.onSubmitted,
this.onSubmitImage,
this.focusNode,
required this.focusNode,
this.controller,
this.decoration,
this.onChanged,
@ -463,100 +460,103 @@ class InputBar extends StatelessWidget {
// #Pangea
child: CompositedTransformTarget(
link: controller!.choreographer.inputLayerLinkAndKey.link,
// Pangea#
child: TypeAheadField<Map<String, String?>>(
direction: VerticalDirection.up,
hideOnEmpty: true,
hideOnLoading: true,
// child: TypeAheadField<Map<String, String?>>(
// direction: VerticalDirection.up,
// hideOnEmpty: true,
// hideOnLoading: true,
// controller: controller,
// focusNode: focusNode,
// hideOnSelect: false,
// debounceDuration: const Duration(milliseconds: 50),
// // show suggestions after 50ms idle time (default is 300)
// // #Pangea
// // key: controller?.choreographer.inputLayerLinkAndKey.key,
// // builder: (context, controller, focusNode) => TextField(
// builder: (context, _, focusNode) =>
child: TextField(
key: controller?.choreographer.inputLayerLinkAndKey.key,
enableSuggestions: false,
readOnly:
controller != null && controller!.choreographer.isRunningIT,
// Pangea#
controller: controller,
focusNode: focusNode,
hideOnSelect: false,
debounceDuration: const Duration(milliseconds: 50),
// show suggestions after 50ms idle time (default is 300)
// #Pangea
key: controller?.choreographer.inputLayerLinkAndKey.key,
// builder: (context, controller, focusNode) => TextField(
builder: (context, _, focusNode) => TextField(
enableSuggestions: false,
readOnly:
controller != null && controller!.choreographer.isRunningIT,
// Pangea#
controller: controller,
focusNode: focusNode,
contentInsertionConfiguration: ContentInsertionConfiguration(
onContentInserted: (KeyboardInsertedContent content) {
final data = content.data;
if (data == null) return;
contentInsertionConfiguration: ContentInsertionConfiguration(
onContentInserted: (KeyboardInsertedContent content) {
final data = content.data;
if (data == null) return;
final file = MatrixFile(
mimeType: content.mimeType,
bytes: data,
name: content.uri.split('/').last,
);
room.sendFileEvent(
file,
shrinkImageMaxDimension: 1600,
);
},
),
minLines: minLines,
maxLines: maxLines,
keyboardType: keyboardType!,
textInputAction: textInputAction,
autofocus: autofocus!,
inputFormatters: [
//#Pangea
//LengthLimitingTextInputFormatter((maxPDUSize / 3).floor()),
//setting max character count to 1000
//after max, nothing else can be typed
LengthLimitingTextInputFormatter(1000),
//Pangea#
],
onSubmitted: (text) {
// fix for library for now
// it sets the types for the callback incorrectly
onSubmitted!(text);
},
// #Pangea
style: controller?.exceededMaxLength ?? false
? const TextStyle(color: Colors.red)
: null,
onTap: () {
controller?.onInputTap(
context,
fNode: focusNode,
final file = MatrixFile(
mimeType: content.mimeType,
bytes: data,
name: content.uri.split('/').last,
);
room.sendFileEvent(
file,
shrinkImageMaxDimension: 1600,
);
},
// Pangea#
decoration: decoration!,
onChanged: (text) {
// fix for the library for now
// it sets the types for the callback incorrectly
onChanged!(text);
},
textCapitalization: TextCapitalization.sentences,
),
suggestionsCallback: getSuggestions,
itemBuilder: (c, s) =>
buildSuggestion(c, s, Matrix.of(context).client),
onSelected: (Map<String, String?> suggestion) =>
insertSuggestion(context, suggestion),
errorBuilder: (BuildContext context, Object? error) =>
const SizedBox.shrink(),
loadingBuilder: (BuildContext context) => const SizedBox.shrink(),
// fix loading briefly flickering a dark box
emptyBuilder: (BuildContext context) => const SizedBox
.shrink(), // fix loading briefly showing no suggestions
minLines: minLines,
maxLines: maxLines,
keyboardType: keyboardType!,
textInputAction: textInputAction,
autofocus: autofocus!,
inputFormatters: [
//#Pangea
//LengthLimitingTextInputFormatter((maxPDUSize / 3).floor()),
//setting max character count to 1000
//after max, nothing else can be typed
LengthLimitingTextInputFormatter(1000),
//Pangea#
],
onSubmitted: (text) {
// fix for library for now
// it sets the types for the callback incorrectly
onSubmitted!(text);
},
// #Pangea
// If we ever want to change the suggestion background color
// here is the code for it
// decorationBuilder: (context, child) => Material(
// borderRadius: BorderRadius.circular(AppConfig.borderRadius),
// color: Theme.of(context).colorScheme.surfaceContainerHigh,
// child: child,
// ),
style: controller?.exceededMaxLength ?? false
? const TextStyle(color: Colors.red)
: null,
onTap: () {
controller?.onInputTap(
context,
fNode: focusNode,
);
},
// Pangea#
decoration: decoration!,
onChanged: (text) {
// fix for the library for now
// it sets the types for the callback incorrectly
onChanged!(text);
},
textCapitalization: TextCapitalization.sentences,
),
// #Pangea
// suggestionsCallback: getSuggestions,
// itemBuilder: (c, s) =>
// buildSuggestion(c, s, Matrix.of(context).client),
// onSelected: (Map<String, String?> suggestion) =>
// insertSuggestion(context, suggestion),
// errorBuilder: (BuildContext context, Object? error) =>
// const SizedBox.shrink(),
// loadingBuilder: (BuildContext context) => const SizedBox.shrink(),
// // fix loading briefly flickering a dark box
// emptyBuilder: (BuildContext context) => const SizedBox
// .shrink(), // fix loading briefly showing no suggestions
// If we ever want to change the suggestion background color
// here is the code for it
// decorationBuilder: (context, child) => Material(
// borderRadius: BorderRadius.circular(AppConfig.borderRadius),
// color: Theme.of(context).colorScheme.surfaceContainerHigh,
// child: child,
// ),
// ),
// Pangea#
),
),
);

1
lib/pangea/config/environment.dart
View file

@ -56,6 +56,7 @@ class Environment {
return dotenv.env["RC_IOS_KEY"] ?? 'appl_DUPqnxuLjkBLzhBPTWeDjqNENuv';
}
// This is a public key
static String get rcStripeKey {
return dotenv.env["RC_STRIPE_KEY"] ?? 'strp_YWZxWUeEfvagiefDNoofinaRCOl';
}

5
lib/pangea/controllers/subscription_controller.dart
View file

@ -327,7 +327,10 @@ class SubscriptionController extends BaseController {
SubscriptionDuration duration, {
bool isPromo = false,
}) async {
final Requests req = Requests(baseUrl: PApiUrls.baseAPI);
final Requests req = Requests(
choreoApiKey: Environment.choreoApiKey,
accessToken: _pangeaController.userController.accessToken,
);
final String reqUrl = Uri.encodeFull(
"${PApiUrls.paymentLink}?pangea_user_id=$userID&duration=${duration.value}&redeem=$isPromo",
);

21
lib/pangea/controllers/user_controller.dart
View file

@ -10,7 +10,6 @@ import 'package:jwt_decode/jwt_decode.dart';
import 'package:matrix/matrix.dart' as matrix;
import '../models/user_model.dart';
import '../repo/user_repo.dart';
/// Controller that manages saving and reading of user/profile information
class UserController extends BaseController {
@ -124,26 +123,6 @@ class UserController extends BaseController {
// wait for account data to load
// as long as it's not null, then this we've already migrated the profile
await _pangeaController.matrixState.client.waitForAccountData();
if (profile.userSettings.dateOfBirth != null) {
return;
}
// we used to store the user's profile in the pangea server
// we now store it in the matrix account data
final PangeaProfileResponse? resp = await PUserRepo.fetchPangeaUserInfo(
userID: userId!,
matrixAccessToken: _matrixAccessToken!,
);
// if it's null, we don't have a profile in the pangea server
if (resp?.profile == null) {
return;
}
// if we have a profile in the pangea server, we need to migrate it to the matrix account data
final userSetting = UserSettings.fromJson(resp!.profile.toJson());
final newProfile = Profile(userSettings: userSetting);
await newProfile.saveProfileData(waitForDataInSync: true);
}
/// Reinitializes the user's profile

69
lib/pangea/network/urls.dart
View file

@ -9,58 +9,65 @@ import 'package:fluffychat/pangea/config/environment.dart';
///
/// https://api.staging.pangea.chat/api/v1/
class PApiUrls {
static String baseAPI = Environment.baseAPI;
static String choreoPrefix = "/choreo";
static String subscriptionPrefix = "/subscription";
static String accountPrefix = "/account";
static String choreoEndpoint =
"${Environment.choreoApi}${PApiUrls.choreoPrefix}";
static String subscriptionEndpoint =
"${Environment.choreoApi}${PApiUrls.subscriptionPrefix}";
static String accountEndpoint =
"${Environment.choreoApi}${PApiUrls.accountPrefix}";
/// ---------------------- Languages --------------------------------------
static String getLanguages = "/languages";
static String getLanguages = "${PApiUrls.choreoEndpoint}/languages";
/// ---------------------- Users --------------------------------------
static String createUser = "/account/create";
static String userDetails = "/account/get_user_access_token?pangea_user_id=";
static String updateUserProfile = "/account/update";
static String paymentLink = "/account/payment_link";
static String subscriptionExpiration = "/account/premium_expires_date";
static String paymentLink = "${PApiUrls.subscriptionEndpoint}/payment_link";
/// ---------------------- Conversation Partner -------------------------
static String searchUserProfiles = "/account/search";
/// PTODO: Migrate or remove
static String searchUserProfiles = "${PApiUrls.accountEndpoint}/search";
///-------------------------------- choreo --------------------------
static String igc = "${Environment.choreoApi}/grammar";
static String igc = "${PApiUrls.choreoEndpoint}/grammar";
static String languageDetection =
"${Environment.choreoApi}/language_detection";
"${PApiUrls.choreoEndpoint}/language_detection";
static String igcLite = "${Environment.choreoApi}/grammar_lite";
static String spanDetails = "${Environment.choreoApi}/span_details";
static String igcLite = "${PApiUrls.choreoEndpoint}/grammar_lite";
static String spanDetails = "${PApiUrls.choreoEndpoint}/span_details";
static String wordNet = "${Environment.choreoApi}/wordnet";
static String wordNet = "${PApiUrls.choreoEndpoint}/wordnet";
static String contextualizedTranslation =
"${Environment.choreoApi}/translation/contextual";
"${PApiUrls.choreoEndpoint}/translation/contextual";
static String simpleTranslation =
"${Environment.choreoApi}/translation/direct";
static String tokenize = "${Environment.choreoApi}/tokenize";
"${PApiUrls.choreoEndpoint}/translation/direct";
static String tokenize = "${PApiUrls.choreoEndpoint}/tokenize";
static String contextualDefinition =
"${Environment.choreoApi}/contextual_definition";
static String similarity = "${Environment.choreoApi}/similarity";
static String topicInfo = "${Environment.choreoApi}/vocab_list";
"${PApiUrls.choreoEndpoint}/contextual_definition";
static String similarity = "${PApiUrls.choreoEndpoint}/similarity";
static String topicInfo = "${PApiUrls.choreoEndpoint}/vocab_list";
static String itFeedback = "${Environment.choreoApi}/translation/feedback";
static String itFeedback = "${PApiUrls.choreoEndpoint}/translation/feedback";
static String firstStep = "/it_initialstep";
static String subseqStep = "/it_step";
static String firstStep = "${PApiUrls.choreoEndpoint}/it_initialstep";
static String subseqStep = "${PApiUrls.choreoEndpoint}/it_step";
static String textToSpeech = "${Environment.choreoApi}/text_to_speech";
static String speechToText = "${Environment.choreoApi}/speech_to_text";
static String textToSpeech = "${PApiUrls.choreoEndpoint}/text_to_speech";
static String speechToText = "${PApiUrls.choreoEndpoint}/speech_to_text";
static String messageActivityGeneration =
"${Environment.choreoApi}/practice/message";
"${PApiUrls.choreoEndpoint}/practice/message";
///-------------------------------- revenue cat --------------------------
static String rcApiV1 = "https://api.revenuecat.com/v1";
static String rcApiV2 =
"https://api.revenuecat.com/v2/projects/${Environment.rcProjectId}";
static String rcApps = "$rcApiV2/apps";
static String rcProducts = "$rcApiV2/offerings?expand=items.package.product";
static String rcSubscribers = "$rcApiV1/subscribers";
static String rcApiV1 = "https://api.revenuecat.com/v1";
static String rcAppsChoreo = "${PApiUrls.subscriptionEndpoint}/app_ids";
static String rcProductsChoreo =
"${PApiUrls.subscriptionEndpoint}/all_products";
static String rcSubscription = "$rcApiV1/subscribers";
}

13
lib/pangea/repo/image_repo.dart
View file

@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:developer';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart';
@ -44,9 +45,12 @@ class GenerateImageRequest {
class ImageRepo {
static Future<GenerateImageeResponse> fetchImage(
GenerateImageRequest request) async {
final Requests req =
Requests(baseUrl: Environment.choreoApi); // Set your API base URL
GenerateImageRequest request,
) async {
final Requests req = Requests(
choreoApiKey: Environment.choreoApiKey,
accessToken: MatrixState.pangeaController.userController.accessToken,
); // Set your API base URL
final requestBody = request.toJson();
try {
@ -58,7 +62,8 @@ class ImageRepo {
if (res.statusCode == 200) {
final decodedBody = jsonDecode(utf8.decode(res.bodyBytes));
return GenerateImageeResponse.fromJson(
decodedBody); // Convert response to ImageModel
decodedBody,
); // Convert response to ImageModel
} else {
throw Exception('Failed to load image');
}

7
lib/pangea/repo/interactive_translation_repo.dart
View file

@ -1,8 +1,9 @@
import 'dart:convert';
import 'package:fluffychat/pangea/config/environment.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:http/http.dart';
import 'package:fluffychat/pangea/config/environment.dart';
import '../models/custom_input_translation_model.dart';
import '../models/it_response_model.dart';
import '../models/system_choice_translation_model.dart';
@ -14,8 +15,8 @@ class ITRepo {
CustomInputRequestModel initalText,
) async {
final Requests req = Requests(
baseUrl: Environment.choreoApi,
choreoApiKey: Environment.choreoApiKey,
accessToken: MatrixState.pangeaController.userController.accessToken,
);
final Response res =
await req.post(url: PApiUrls.firstStep, body: initalText.toJson());
@ -29,8 +30,8 @@ class ITRepo {
SystemChoiceRequestModel subseqText,
) async {
final Requests req = Requests(
baseUrl: Environment.choreoApi,
choreoApiKey: Environment.choreoApiKey,
accessToken: MatrixState.pangeaController.userController.accessToken,
);
final Response res =

6
lib/pangea/repo/language_repo.dart
View file

@ -1,18 +1,20 @@
import 'dart:convert';
import 'dart:developer';
import 'package:fluffychat/pangea/config/environment.dart';
import 'package:fluffychat/pangea/models/language_model.dart';
import 'package:fluffychat/pangea/network/urls.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart';
import '../config/environment.dart';
import '../network/requests.dart';
class LanguageRepo {
static Future<List<LanguageModel>> fetchLanguages() async {
final Requests req = Requests(baseUrl: Environment.choreoApi);
final Requests req = Requests(
choreoApiKey: Environment.choreoApiKey,
);
final Response res = await req.get(url: PApiUrls.getLanguages);
final decodedBody =

76
lib/pangea/repo/subscription_repo.dart
View file

@ -3,28 +3,30 @@ import 'dart:convert';
import 'package:collection/collection.dart';
import 'package:fluffychat/pangea/config/environment.dart';
import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
import 'package:fluffychat/pangea/network/requests.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:fluffychat/pangea/utils/subscription_app_id.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import '../network/urls.dart';
class SubscriptionRepo {
static final Map<String, String> requestHeaders = {
'Content-type': 'application/json',
'Accept': 'application/json',
'Authorization': 'Bearer ${Environment.rcKey}',
};
static Future<SubscriptionAppIds?> getAppIds() async {
try {
final http.Response res = await http.get(
Uri.parse(PApiUrls.rcApps),
headers: SubscriptionRepo.requestHeaders,
final Requests req = Requests(
choreoApiKey: Environment.choreoApiKey,
accessToken: MatrixState.pangeaController.userController.accessToken,
);
final http.Response res = await req.get(
url: PApiUrls.rcAppsChoreo,
);
return SubscriptionAppIds.fromJson(
jsonDecode(res.body),
);
final json = jsonDecode(res.body);
return SubscriptionAppIds.fromJson(json);
} catch (err) {
ErrorHandler.logError(
m: "Failed to fetch app information for revenuecat API",
@ -36,19 +38,19 @@ class SubscriptionRepo {
static Future<List<SubscriptionDetails>?> getAllProducts() async {
try {
final http.Response res = await http.get(
Uri.parse(PApiUrls.rcProducts),
headers: SubscriptionRepo.requestHeaders,
final Requests req = Requests(
choreoApiKey: Environment.choreoApiKey,
accessToken: MatrixState.pangeaController.userController.accessToken,
);
final http.Response res = await req.get(
url: PApiUrls.rcProductsChoreo,
);
final Map<String, dynamic> json = jsonDecode(res.body);
final RCProductsResponseModel resp =
RCProductsResponseModel.fromJson(json);
return resp.allProducts;
} catch (err) {
ErrorHandler.logError(
m: "Failed to fetch entitlement information for revenuecat API",
s: StackTrace.current,
);
} catch (err, s) {
ErrorHandler.logError(e: err, s: s);
return null;
}
}
@ -62,7 +64,7 @@ class SubscriptionRepo {
'Accept': 'application/json',
'Authorization': 'Bearer ${Environment.rcStripeKey}',
};
final String url = "${PApiUrls.rcSubscribers}/$userId";
final String url = "${PApiUrls.rcSubscription}/$userId";
final http.Response res = await http.get(
Uri.parse(url),
headers: stripeHeaders,
@ -88,26 +90,20 @@ class RCProductsResponseModel {
Map<String, dynamic> json,
) {
final List<dynamic> offerings = json["items"] as List<dynamic>;
final offering = offerings.firstWhereOrNull(
Environment.isStaging
? (offering) => !(offering['is_current'] as bool)
: (offering) => offering['is_current'] as bool,
);
final Map<String, dynamic> metadata = offering['metadata'];
final List<SubscriptionDetails> allProducts = [];
for (final packageDetails in offering['packages']['items']) {
final String packageId = packageDetails['id'];
final List<SubscriptionDetails> products =
RCProductsResponseModel.productsFromPackageDetails(
packageDetails,
packageId,
metadata,
);
allProducts.addAll(products);
}
return RCProductsResponseModel(allProducts: allProducts);
final res = offerings
.map(
(offering) => SubscriptionDetails(
price: offering['price'],
duration: SubscriptionDuration.values.firstWhereOrNull(
(duration) => duration.value == offering['duration'],
),
id: offering['id'],
appId: offering['appId'],
),
)
.toList()
.cast<SubscriptionDetails>();
return RCProductsResponseModel(allProducts: res);
}
static List<SubscriptionDetails> productsFromPackageDetails(

56
lib/pangea/repo/user_repo.dart
View file

@ -1,66 +1,14 @@
import 'dart:convert';
import 'dart:developer';
import 'package:fluffychat/pangea/config/environment.dart';
import 'package:fluffychat/pangea/constants/model_keys.dart';
import 'package:http/http.dart';
import '../models/user_model.dart';
import '../models/user_profile_search_model.dart';
import '../network/requests.dart';
import '../network/urls.dart';
class PUserRepo {
// static Future<PangeaProfileResponse?> repoCreatePangeaUser({
// required String userID,
// required String dob,
// required fullName,
// required String matrixAccessToken,
// }) async {
// try {
// final Requests req = Requests(
// baseUrl: PApiUrls.baseAPI,
// matrixAccessToken: matrixAccessToken,
// );
// final Map<String, dynamic> body = {
// ModelKey.userFullName: fullName,
// ModelKey.userPangeaUserId: userID,
// ModelKey.userDateOfBirth: dob,
// };
// final resp = await req.post(
// url: PApiUrls.createUser,
// body: body,
// );
// return PangeaProfileResponse.fromJson(jsonDecode(resp.body));
// } catch (err, s) {
// ErrorHandler.logError(e: err, s: s);
// return null;
// }
// }
static Future<PangeaProfileResponse?> fetchPangeaUserInfo({
required String userID,
required String matrixAccessToken,
}) async {
Response res;
try {
final Requests req = Requests(
baseUrl: PApiUrls.baseAPI,
matrixAccessToken: matrixAccessToken,
);
res = await req.get(
url: PApiUrls.userDetails,
objectId: userID,
);
return PangeaProfileResponse.fromJson(jsonDecode(res.body));
} catch (err) {
//status code should be 400 - PTODO - check ffor this.
log("Most likely a first signup and needs to make an account");
return null;
}
}
static Future<UserProfileSearchResponse> searchUserProfiles({
// List<String>? interests,
String? targetLanguage,
@ -72,8 +20,8 @@ class PUserRepo {
required int limit,
}) async {
final Requests req = Requests(
baseUrl: PApiUrls.baseAPI,
accessToken: accessToken,
choreoApiKey: Environment.choreoApiKey,
);
final Map<String, dynamic> body = {};
// if (interests != null) body[ModelKey.userInterests] = interests.toString();

23
lib/pangea/utils/subscription_app_id.dart
View file

@ -22,24 +22,11 @@ class SubscriptionAppIds {
return null;
}
factory SubscriptionAppIds.fromJson(json) {
final SubscriptionAppIds appIds = SubscriptionAppIds();
for (final appInfo in (json['items'] as List<dynamic>)) {
final String platform = appInfo['type'];
final String appId = appInfo['id'];
switch (platform) {
case 'stripe':
appIds.stripeId = appId;
continue;
case 'app_store':
appIds.appleId = appId;
continue;
case 'play_store':
appIds.androidId = appId;
continue;
}
}
return appIds;
factory SubscriptionAppIds.fromJson(Map<String, dynamic> json) {
return SubscriptionAppIds()
..stripeId = json['stripe_id']
..androidId = json['android_id']
..appleId = json['apple_id'];
}
}