✨ Channel invite friends

lib/main.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/chat.dart';
+import 'package:solian/providers/friend.dart';
 import 'package:solian/providers/navigation.dart';
 import 'package:solian/providers/notify.dart';
 import 'package:solian/router.dart';
@@ -42,6 +43,7 @@ class SolianApp extends StatelessWidget {
                   Provider(create: (_) => AuthProvider()),
                   Provider(create: (_) => ChatProvider()),
                   ChangeNotifierProvider(create: (_) => NotifyProvider()),
+                  ChangeNotifierProvider(create: (_) => FriendProvider()),
                 ],
                 child: NotificationNotifier(child: child ?? Container()),
               );

lib/models/channel.dart

@@ -63,3 +63,47 @@ class Channel {
     "realm_id": realmId,
   };
 }
+
+class ChannelMember {
+  int id;
+  DateTime createdAt;
+  DateTime updatedAt;
+  DateTime? deletedAt;
+  int channelId;
+  int accountId;
+  Account account;
+  int notify;
+
+  ChannelMember({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    this.deletedAt,
+    required this.channelId,
+    required this.accountId,
+    required this.account,
+    required this.notify,
+  });
+
+  factory ChannelMember.fromJson(Map<String, dynamic> json) => ChannelMember(
+    id: json["id"],
+    createdAt: DateTime.parse(json["created_at"]),
+    updatedAt: DateTime.parse(json["updated_at"]),
+    deletedAt: json["deleted_at"],
+    channelId: json["channel_id"],
+    accountId: json["account_id"],
+    account: Account.fromJson(json["account"]),
+    notify: json["notify"],
+  );
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "created_at": createdAt.toIso8601String(),
+    "updated_at": updatedAt.toIso8601String(),
+    "deleted_at": deletedAt,
+    "channel_id": channelId,
+    "account_id": accountId,
+    "account": account.toJson(),
+    "notify": notify,
+  };
+}

lib/models/friendship.dart

@@ -50,4 +50,12 @@ class Friendship {
     "related": related.toJson(),
     "status": status,
   };
+
+  Account getOtherside(int selfId) {
+    if (accountId != selfId) {
+      return account;
+    } else {
+      return related;
+    }
+  }
 }

lib/providers/friend.dart

@@ -0,0 +1,26 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:solian/models/friendship.dart';
+import 'package:solian/providers/auth.dart';
+import 'package:solian/utils/service_url.dart';
+
+class FriendProvider extends ChangeNotifier {
+  List<Friendship> friends = List.empty();
+
+  Future<void> fetch(AuthProvider auth) async {
+    if (!await auth.isAuthorized()) return;
+
+    var uri = getRequestUri('passport', '/api/users/me/friends?status=1');
+
+    var res = await auth.client!.get(uri);
+    if (res.statusCode == 200) {
+      final result = jsonDecode(utf8.decode(res.bodyBytes)) as List<dynamic>;
+     friends = result.map((x) => Friendship.fromJson(x)).toList();
+     notifyListeners();
+    } else {
+      var message = utf8.decode(res.bodyBytes);
+      throw Exception(message);
+    }
+  }
+}

lib/router.dart

@@ -6,7 +6,8 @@ import 'package:solian/screens/account/friend.dart';
 import 'package:solian/screens/chat/chat.dart';
 import 'package:solian/screens/chat/index.dart';
 import 'package:solian/screens/chat/manage.dart';
-import 'package:solian/screens/chat/channel/channel_editor.dart';
+import 'package:solian/screens/chat/channel/editor.dart';
+import 'package:solian/screens/chat/channel/member.dart';
 import 'package:solian/screens/explore.dart';
 import 'package:solian/screens/notification.dart';
 import 'package:solian/screens/posts/comment_editor.dart';
@@ -46,6 +47,11 @@ final router = GoRouter(
       name: 'chat.channel.manage',
       builder: (context, state) => ChatManageScreen(channel: state.extra as Channel),
     ),
+    GoRoute(
+      path: '/chat/c/:channel/member',
+      name: 'chat.channel.member',
+      builder: (context, state) => ChatMemberScreen(channel: state.extra as Channel),
+    ),
     GoRoute(
       path: '/account',
       name: 'account',

lib/screens/account.dart

@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
 import 'package:solian/utils/service_url.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/common_wrapper.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -98,7 +99,7 @@ class NameCard extends StatelessWidget {
   Future<Widget> renderAvatar(BuildContext context) async {
     final auth = context.read<AuthProvider>();
     final profiles = await auth.getProfiles();
-    return CircleAvatar(backgroundImage: NetworkImage(profiles["picture"]));
+    return AccountAvatar(source: profiles["picture"], direct: true);
   }
 
   Future<Column> renderLabel(BuildContext context) async {

lib/screens/account/friend.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:provider/provider.dart';
-import 'package:solian/models/account.dart';
 import 'package:solian/models/friendship.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/utils/service_url.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/indent_wrapper.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -20,7 +20,7 @@ class FriendScreen extends StatefulWidget {
 class _FriendScreenState extends State<FriendScreen> {
   bool _isSubmitting = false;
 
-  int _currentSideId = 0;
+  int _selfId = 0;
   List<Friendship> _friendships = List.empty();
 
   Future<void> fetchFriendships() async {
@@ -28,7 +28,7 @@ class _FriendScreenState extends State<FriendScreen> {
     final prof = await auth.getProfiles();
     if (!await auth.isAuthorized()) return;
 
-    _currentSideId = prof['id'];
+    _selfId = prof['id'];
 
     var uri = getRequestUri('passport', '/api/users/me/friends');
 
@@ -59,6 +59,9 @@ class _FriendScreenState extends State<FriendScreen> {
       getRequestUri('passport', '/api/users/me/friends?related=$username'),
     );
     if (res.statusCode == 200) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context)!.friendAddDone)),
+      );
       await fetchFriendships();
     } else {
       var message = utf8.decode(res.bodyBytes);
@@ -73,7 +76,7 @@ class _FriendScreenState extends State<FriendScreen> {
   Future<void> updateFriendship(Friendship relation, int status) async {
     setState(() => _isSubmitting = true);
 
-    final otherside = getOtherside(relation);
+    final otherside = relation.getOtherside(_selfId);
 
     final auth = context.read<AuthProvider>();
     if (!await auth.isAuthorized()) {
@@ -91,9 +94,6 @@ class _FriendScreenState extends State<FriendScreen> {
       }),
     );
     if (res.statusCode == 200) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(AppLocalizations.of(context)!.friendAddDone)),
-      );
       await fetchFriendships();
     } else {
       var message = utf8.decode(res.bodyBytes);
@@ -160,22 +160,10 @@ class _FriendScreenState extends State<FriendScreen> {
   DismissDirection getDismissDirection(Friendship relation) {
     if (relation.status == 2) return DismissDirection.endToStart;
     if (relation.status == 1) return DismissDirection.startToEnd;
-    if (relation.status == 0 && relation.relatedId != _currentSideId) return DismissDirection.startToEnd;
+    if (relation.status == 0 && relation.relatedId != _selfId) return DismissDirection.startToEnd;
     return DismissDirection.horizontal;
   }
 
-  Account getOtherside(Friendship relation) {
-    if (relation.accountId != _currentSideId) {
-      return relation.account;
-    } else {
-      return relation.related;
-    }
-  }
-
-  String getAvatarUrl(String uuid) {
-    return getRequestUri('passport', '/api/avatar/$uuid').toString();
-  }
-
   @override
   void initState() {
     super.initState();
@@ -189,7 +177,7 @@ class _FriendScreenState extends State<FriendScreen> {
   Widget build(BuildContext context) {
     Widget friendshipTileBuilder(context, index, status) {
       final element = filterWithStatus(status)[index];
-      final otherside = getOtherside(element);
+      final otherside = element.getOtherside(_selfId);
 
       final randomId = DateTime.now().microsecondsSinceEpoch >> 10;
 
@@ -211,9 +199,7 @@ class _FriendScreenState extends State<FriendScreen> {
         child: ListTile(
           title: Text(otherside.nick),
           subtitle: Text(otherside.name),
-          leading: CircleAvatar(
-            backgroundImage: NetworkImage(getAvatarUrl(otherside.avatar)),
-          ),
+          leading: AccountAvatar(source: otherside.avatar),
         ),
         onDismissed: (direction) {
           if (direction == DismissDirection.startToEnd) {

lib/screens/chat/channel/member.dart

@@ -0,0 +1,195 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:provider/provider.dart';
+import 'package:solian/models/account.dart';
+import 'package:solian/models/channel.dart';
+import 'package:solian/providers/auth.dart';
+import 'package:solian/utils/service_url.dart';
+import 'package:solian/widgets/account/avatar.dart';
+import 'package:solian/widgets/account/friend_picker.dart';
+import 'package:solian/widgets/indent_wrapper.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class ChatMemberScreen extends StatefulWidget {
+  final Channel channel;
+
+  const ChatMemberScreen({super.key, required this.channel});
+
+  @override
+  State<ChatMemberScreen> createState() => _ChatMemberScreenState();
+}
+
+class _ChatMemberScreenState extends State<ChatMemberScreen> {
+  bool _isSubmitting = false;
+
+  List<ChannelMember> _members = List.empty();
+
+  int _selfId = 0;
+
+  Future<void> fetchMemberships() async {
+    final auth = context.read<AuthProvider>();
+    final prof = await auth.getProfiles();
+    if (!await auth.isAuthorized()) return;
+
+    _selfId = prof['id'];
+
+    var uri = getRequestUri('messaging', '/api/channels/${widget.channel.alias}/members');
+
+    var res = await auth.client!.get(uri);
+    if (res.statusCode == 200) {
+      final result = jsonDecode(utf8.decode(res.bodyBytes)) as List<dynamic>;
+      setState(() {
+        _members = result.map((x) => ChannelMember.fromJson(x)).toList();
+      });
+    } else {
+      var message = utf8.decode(res.bodyBytes);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Something went wrong... $message")),
+      );
+    }
+  }
+
+  Future<void> kickMember(ChannelMember item) async {
+    setState(() => _isSubmitting = true);
+
+    final auth = context.read<AuthProvider>();
+    if (!await auth.isAuthorized()) {
+      setState(() => _isSubmitting = false);
+      return;
+    }
+
+    var uri = getRequestUri('messaging', '/api/channels/${widget.channel.alias}/kick');
+
+    var res = await auth.client!.post(
+      uri,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: jsonEncode({
+        'account_name': item.account.name,
+      }),
+    );
+    if (res.statusCode == 200) {
+      await fetchMemberships();
+    } else {
+      var message = utf8.decode(res.bodyBytes);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Something went wrong... $message")),
+      );
+    }
+
+    setState(() => _isSubmitting = false);
+  }
+
+  Future<void> inviteMember(String username) async {
+    setState(() => _isSubmitting = true);
+
+    final auth = context.read<AuthProvider>();
+    if (!await auth.isAuthorized()) {
+      setState(() => _isSubmitting = false);
+      return;
+    }
+
+    var uri = getRequestUri('messaging', '/api/channels/${widget.channel.alias}/invite');
+
+    var res = await auth.client!.post(
+      uri,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: jsonEncode({
+        'account_name': username,
+      }),
+    );
+    if (res.statusCode == 200) {
+      await fetchMemberships();
+    } else {
+      var message = utf8.decode(res.bodyBytes);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Something went wrong... $message")),
+      );
+    }
+
+    setState(() => _isSubmitting = false);
+  }
+
+  void promptInviteMember() async {
+    final input = await showModalBottomSheet(
+      context: context,
+      builder: (context) {
+        return const FriendPicker();
+      },
+    );
+    if (input == null) return;
+
+    await inviteMember((input as Account).name);
+  }
+
+  bool getKickable(ChannelMember item) {
+    if (_selfId != widget.channel.account.externalId) return false;
+    if (item.accountId == widget.channel.accountId) return false;
+    if (item.account.externalId == _selfId) return false;
+    return true;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    Future.delayed(Duration.zero, () => fetchMemberships());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return IndentWrapper(
+      title: AppLocalizations.of(context)!.chatMember,
+      noSafeArea: true,
+      hideDrawer: true,
+      appBarActions: [
+        IconButton(
+          icon: const Icon(Icons.add),
+          onPressed: () => promptInviteMember(),
+        ),
+      ],
+      child: RefreshIndicator(
+        onRefresh: () => fetchMemberships(),
+        child: CustomScrollView(
+          slivers: [
+            SliverToBoxAdapter(
+              child: _isSubmitting ? const LinearProgressIndicator().animate().scaleX() : Container(),
+            ),
+            SliverList.builder(
+              itemCount: _members.length,
+              itemBuilder: (context, index) {
+                final element = _members[index];
+
+                final randomId = DateTime.now().microsecondsSinceEpoch >> 10;
+
+                return Dismissible(
+                  key: Key(randomId.toString()),
+                  direction: getKickable(element) ? DismissDirection.startToEnd : DismissDirection.none,
+                  background: Container(
+                    color: Colors.red,
+                    padding: const EdgeInsets.symmetric(horizontal: 20),
+                    alignment: Alignment.centerLeft,
+                    child: const Icon(Icons.remove, color: Colors.white),
+                  ),
+                  child: ListTile(
+                    leading: AccountAvatar(source: element.account.avatar, direct: true),
+                    title: Text(element.account.nick),
+                    subtitle: Text(element.account.name),
+                  ),
+                  onDismissed: (_) {
+                    kickMember(element);
+                  },
+                );
+              },
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/chat/manage.dart

@@ -83,7 +83,13 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                 ListTile(
                   leading: const Icon(Icons.supervisor_account),
                   title: Text(AppLocalizations.of(context)!.chatMember),
-                  onTap: () {},
+                  onTap: () {
+                    router.pushNamed(
+                      'chat.channel.member',
+                      extra: widget.channel,
+                      pathParameters: {'channel': widget.channel.alias},
+                    );
+                  },
                 ),
                 ...(isOwned ? authorizedItems : List.empty()),
               ],

lib/screens/posts/comment_editor.dart

@@ -9,6 +9,7 @@ import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
 import 'package:solian/utils/service_url.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/indent_wrapper.dart';
 import 'package:solian/widgets/posts/attachment_editor.dart';
 
@@ -145,8 +146,9 @@ class _CommentEditorScreenState extends State<CommentEditorScreen> {
                       subtitle: Text(
                         AppLocalizations.of(context)!.postIdentityNotify,
                       ),
-                      leading: CircleAvatar(
-                        backgroundImage: NetworkImage(userinfo["picture"]),
+                      leading: AccountAvatar(
+                        source: userinfo["picture"],
+                        direct: true,
                       ),
                     );
                   } else {

lib/screens/posts/moment_editor.dart

@@ -9,6 +9,7 @@ import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
 import 'package:solian/utils/service_url.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/indent_wrapper.dart';
 import 'package:solian/widgets/posts/attachment_editor.dart';
 
@@ -135,8 +136,9 @@ class _MomentEditorScreenState extends State<MomentEditorScreen> {
                       subtitle: Text(
                         AppLocalizations.of(context)!.postIdentityNotify,
                       ),
-                      leading: CircleAvatar(
-                        backgroundImage: NetworkImage(userinfo["picture"]),
+                      leading: AccountAvatar(
+                        source: userinfo["picture"],
+                        direct: true,
                       ),
                     );
                   } else {

lib/widgets/account/avatar.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:solian/utils/service_url.dart';
+
+class AccountAvatar extends StatelessWidget {
+  final String source;
+  final double? radius;
+  final bool? direct;
+  final Color? backgroundColor;
+
+  const AccountAvatar({
+    super.key,
+    required this.source,
+    this.radius,
+    this.direct,
+    this.backgroundColor,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final detectRegex = RegExp(r'https://.*/api/avatar/');
+
+    if (source.isEmpty || source.replaceAll(detectRegex, '').isEmpty) {
+      return CircleAvatar(
+        radius: radius,
+        backgroundColor: backgroundColor,
+        child: const Icon(Icons.account_circle),
+      );
+    }
+    if (direct == true) {
+      return CircleAvatar(
+        radius: radius,
+        backgroundColor: backgroundColor,
+        backgroundImage: NetworkImage(source),
+      );
+    } else {
+      final url = getRequestUri('passport', '/api/avatar/$source').toString();
+      return CircleAvatar(
+        radius: radius,
+        backgroundColor: backgroundColor,
+        backgroundImage: NetworkImage(url),
+      );
+    }
+  }
+}

lib/widgets/account/friend_picker.dart

@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/friend.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:solian/widgets/account/avatar.dart';
+
+class FriendPicker extends StatefulWidget {
+  const FriendPicker({super.key});
+
+  @override
+  State<FriendPicker> createState() => _FriendPickerState();
+}
+
+class _FriendPickerState extends State<FriendPicker> {
+  int _selfId = 0;
+
+  @override
+  void initState() {
+    super.initState();
+
+    Future.delayed(Duration.zero, () async {
+      final auth = context.read<AuthProvider>();
+      final friends = context.read<FriendProvider>();
+      friends.fetch(auth);
+
+      final prof = await auth.getProfiles();
+      _selfId = prof['id'];
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final dict = context.watch<FriendProvider>();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          padding: const EdgeInsets.only(left: 16, right: 16, top: 32, bottom: 12),
+          child: Text(
+            AppLocalizations.of(context)!.friend,
+            style: Theme.of(context).textTheme.headlineSmall,
+          ),
+        ),
+        Expanded(
+          child: ListView.builder(
+            itemCount: dict.friends.length,
+            itemBuilder: (context, index) {
+              var element = dict.friends[index].getOtherside(_selfId);
+              return ListTile(
+                title: Text(element.nick),
+                subtitle: Text(element.name),
+                leading: AccountAvatar(source: element.avatar),
+                onTap: () {
+                  Navigator.pop(context, element);
+                },
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/widgets/chat/message.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:solian/models/message.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/chat/content.dart';
 import 'package:solian/widgets/posts/content/attachment.dart';
 import 'package:timeago/timeago.dart' as timeago;
@@ -38,9 +39,10 @@ class ChatMessage extends StatelessWidget {
                   child: const Icon(Icons.reply, size: 16),
                 ),
                 const SizedBox(width: 8),
-                CircleAvatar(
+                AccountAvatar(
                   radius: 10,
-                  backgroundImage: NetworkImage(item.replyTo!.sender.account.avatar),
+                  source: item.replyTo!.sender.account.avatar,
+                  direct: true,
                 ),
               ],
             ),
@@ -102,8 +104,9 @@ class ChatMessage extends StatelessWidget {
           Row(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              CircleAvatar(
-                backgroundImage: NetworkImage(item.sender.account.avatar),
+              AccountAvatar(
+                source: item.sender.account.avatar,
+                direct: true,
               ),
               Expanded(
                 child: Column(

lib/widgets/posts/attachment_editor.dart

@@ -254,7 +254,7 @@ class _AttachmentEditorState extends State<AttachmentEditor> {
                 ),
               );
             },
-            separatorBuilder: (context, index) => const Divider(),
+            separatorBuilder: (context, index) => const Divider(thickness: 0.3),
           ),
         ),
       ],

lib/widgets/posts/item.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:solian/models/post.dart';
+import 'package:solian/widgets/account/avatar.dart';
 import 'package:solian/widgets/posts/comment_list.dart';
 import 'package:solian/widgets/posts/content/article.dart';
 import 'package:solian/widgets/posts/content/attachment.dart';
@@ -166,8 +167,9 @@ class _PostItemState extends State<PostItem> {
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CircleAvatar(
-                  backgroundImage: NetworkImage(widget.item.author.avatar),
+                AccountAvatar(
+                  source: widget.item.author.avatar,
+                  direct: true,
                 ),
                 Expanded(
                   child: Column(
@@ -196,8 +198,9 @@ class _PostItemState extends State<PostItem> {
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CircleAvatar(
-                  backgroundImage: NetworkImage(widget.item.author.avatar),
+                AccountAvatar(
+                  source: widget.item.author.avatar,
+                  direct: true,
                 ),
                 Expanded(
                   child: Column(