Skip to content

Commit

Permalink
1.2.5+17: Fix Load More, profile page and commenting
Browse files Browse the repository at this point in the history
  • Loading branch information
@felipebueno
felipebueno committed Nov 10, 2023
1 parent c852f75 commit b26c219
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 23 deletions.
4 changes: 4 additions & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" />

<meta-data
android:name="flutter_deeplinking_enabled"
android:value="true" />

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
49 changes: 33 additions & 16 deletions lib/data/api.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: prefer_single_quotes

import 'dart:convert';
import 'dart:io';

Expand Down Expand Up @@ -27,12 +29,14 @@ final class Api {
if (statusCode == 403 || statusCode == 404) {
// Ignore 403 errors when unable to login with magic link
// Ignore 404 errors so we can update the build-id and re-fetch posts
handler.resolve(Response(
requestOptions: error.requestOptions,
statusCode: statusCode,
));
handler.resolve(
Response(
requestOptions: error.requestOptions,
statusCode: statusCode,
),
);
} else {
debugPrint(error.response?.data);
debugPrint(error.response?.data.toString());
handler.next(error);
}
},
Expand Down Expand Up @@ -165,16 +169,28 @@ final class Api {
throw Exception('Error fetching more');
}

final response = await _dio.post(
'https://stacker.news/api/graphql',
data: postType.getGraphQLBody(cursor),
);
try {
final response = await _dio.post(
'https://stacker.news/api/graphql',
data: postType.getGraphQLBody(cursor),
);

if (response.statusCode == 200) {
return await _parsePosts(response.data, postType);
if (response.statusCode == 200) {
return await _parsePosts(response.data, postType);
}
} catch (e, st) {
debugPrint(e.toString());
debugPrintStack(stackTrace: st);

final msg =
((e is DioException) ? e.response?.data.toString() : e.toString()) ??
'';
Utils.showException(msg, st);

rethrow;
}

throw Exception('Error fetching more');
throw Exception('Error fetching more posts');
}

Future<Post> fetchPostDetails(String id) async {
Expand Down Expand Up @@ -251,8 +267,9 @@ final class Api {
}

User _parseProfile(dynamic responseData) {
final userMap =
responseData['pageProps']['data']['user'] as Map<String, dynamic>;
final response = (responseData['pageProps'] ?? responseData);
final data = response['ssrData'] ?? response['data'];
final userMap = data['user'] as Map<String, dynamic>;

return User.fromJson(userMap);
}
Expand Down Expand Up @@ -466,7 +483,7 @@ final class Api {
// #endregion Zap Things

// #region Items & Comments
Future<Post?> createComment({
Future<Post?> upsertComment({
required String parentId,
required String text,
}) async {
Expand All @@ -475,7 +492,7 @@ final class Api {
final response = await _dio.post(
'https://stacker.news/api/graphql',
data:
'{"operationName":"createComment","variables":{"text":"$text","parentId":"$parentId"},"query":"fragment CommentFields on Item {\\n id\\n parentId\\n createdAt\\n deletedAt\\n text\\n user {\\n name\\n streak\\n hideCowboyHat\\n id\\n __typename\\n }\\n sats\\n upvotes\\n wvotes\\n boost\\n meSats\\n meDontLike\\n meBookmark\\n meSubscription\\n outlawed\\n freebie\\n path\\n commentSats\\n mine\\n otsHash\\n ncomments\\n __typename\\n}\\n\\nfragment CommentsRecursive on Item {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n}\\n\\nmutation createComment(\$text: String!, \$parentId: ID!) {\\n createComment(text: \$text, parentId: \$parentId) {\\n ...CommentFields\\n comments {\\n ...CommentsRecursive\\n __typename\\n }\\n __typename\\n }\\n}\\n"}',
"{\"operationName\":\"upsertComment\",\"variables\":{\"parentId\":\"$parentId\",\"text\":\"$text\"},\"query\":\"fragment CommentFields on Item {\\n id\\n parentId\\n createdAt\\n deletedAt\\n text\\n user {\\n name\\n streak\\n hideCowboyHat\\n id\\n meMute\\n __typename\\n }\\n sats\\n upvotes\\n wvotes\\n boost\\n meSats\\n meDontLike\\n meBookmark\\n meSubscription\\n outlawed\\n freebie\\n path\\n commentSats\\n mine\\n otsHash\\n ncomments\\n imgproxyUrls\\n __typename\\n}\\n\\nfragment CommentsRecursive on Item {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n comments {\\n ...CommentFields\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n }\\n __typename\\n}\\n\\nmutation upsertComment(\$text: String!, \$parentId: ID!, \$hash: String, \$hmac: String) {\\n upsertComment(text: \$text, parentId: \$parentId, hash: \$hash, hmac: \$hmac) {\\n ...CommentFields\\n comments {\\n ...CommentsRecursive\\n __typename\\n }\\n __typename\\n }\\n}\"}",
);

if (response.statusCode == 200) {
Expand Down
Loading

0 comments on commit b26c219

Please sign in to comment.