Skip to content
Draft
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
17 changes: 10 additions & 7 deletions lib/src/api/users.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:http/http.dart' as http;
import 'package:http_parser/http_parser.dart';
import 'package:image_picker/image_picker.dart';
import 'package:interstellar/src/api/client.dart';
import 'package:interstellar/src/api/community.dart';
Expand All @@ -8,8 +6,6 @@ import 'package:interstellar/src/models/user.dart';
import 'package:interstellar/src/screens/explore/explore_screen.dart';
import 'package:interstellar/src/utils/models.dart';
import 'package:interstellar/src/utils/utils.dart';
import 'package:mime/mime.dart';
import 'package:path/path.dart';

class APIUsers {
APIUsers(this.client);
Expand Down Expand Up @@ -187,10 +183,10 @@ class APIUsers {
}
}

Future<DetailedUserModel> follow(int userId, bool state) async {
Future<DetailedUserModel> follow(DetailedUserModel user, bool state) async {
switch (client.software) {
case ServerSoftware.mbin:
final path = '/users/$userId/${state ? 'follow' : 'unfollow'}';
final path = '/users/${user.id}/${state ? 'follow' : 'unfollow'}';

final response = await client.put(path);

Expand All @@ -200,7 +196,14 @@ class APIUsers {
throw Exception('User follow not allowed on lemmy');

case ServerSoftware.piefed:
throw Exception('User follow not allowed on piefed');
final path = '/user/${state ? 'follow' : 'unfollow'}';

final response = await client.post(
path,
body: {'user_id': user.id.toString()},
);

return user;
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/explore/explore_screen_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class ExploreScreenItem extends StatelessWidget {
},
final DetailedUserModel i => (bool selected) async {
final newValue = await context.read<AppController>().api.users.follow(
i.id,
i,
selected,
);

Expand Down
4 changes: 2 additions & 2 deletions lib/src/screens/explore/user_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,14 @@ class _UserScreenState extends State<UserScreen> {
child: Text(l(context).account_edit),
),
if (!isMyUser &&
ac.serverSoftware == ServerSoftware.mbin)
ac.serverSoftware != ServerSoftware.lemmy)
SubscriptionButton(
isSubscribed: user.isFollowedByUser,
subscriptionCount:
user.followersCount ?? 0,
onSubscribe: (selected) async {
final newValue = await ac.api.users
.follow(user.id, selected);
.follow(user, selected);
setState(() {
_data = newValue;
});
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/settings/account_migration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class _AccountMigrationScreenState extends State<AccountMigrationScreen> {
denormalizeName(item, destAccountHost),
);
if (res.isFollowedByUser == false) {
await destAPI.users.follow(res.id, true);
await destAPI.users.follow(res, true);
}
_migrateUserFollows.complete.add(item);
} catch (e) {
Expand Down
5 changes: 3 additions & 2 deletions lib/src/screens/settings/account_reset.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:auto_route/annotations.dart';
import 'package:flutter/material.dart';
import 'package:interstellar/src/controller/controller.dart';
import 'package:interstellar/src/controller/server.dart';
import 'package:interstellar/src/models/user.dart';
import 'package:interstellar/src/screens/explore/explore_screen.dart';
import 'package:interstellar/src/screens/settings/account_migration.dart';
import 'package:interstellar/src/screens/settings/account_selection.dart';
Expand All @@ -25,7 +26,7 @@ class _AccountResetScreenState extends State<AccountResetScreen> {

final _resetCommunitySubscriptions = MigrationOrResetType<int>();
final _resetCommunityBlocks = MigrationOrResetType<int>();
final _resetUserFollows = MigrationOrResetType<int>();
final _resetUserFollows = MigrationOrResetType<DetailedUserModel>();
final _resetUserBlocks = MigrationOrResetType<int>();

@override
Expand Down Expand Up @@ -93,7 +94,7 @@ class _AccountResetScreenState extends State<AccountResetScreen> {
filter: ExploreFilter.subscribed,
);

_resetUserFollows.found.addAll(res.items.map((e) => e.id));
_resetUserFollows.found.addAll(res.items.map((e) => e));
nextPage = res.nextPage;

if (progressAndCheckCancel()) return;
Expand Down
4 changes: 2 additions & 2 deletions lib/src/widgets/menus/user_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ Future<void> showUserMenu(

return ContextMenu(
actions: [
if (!isMe && ac.serverSoftware == ServerSoftware.mbin)
if (!isMe && ac.serverSoftware != ServerSoftware.lemmy)
ContextMenuAction(
child: SubscriptionButton(
isSubscribed: user.isFollowedByUser,
subscriptionCount: user.followersCount,
onSubscribe: (selected) async {
final newValue = await ac.api.users.follow(user.id, selected);
final newValue = await ac.api.users.follow(user, selected);
if (update != null) {
update(newValue);
}
Expand Down
Loading