⬆️ Support some new server stuff

lib/widgets/account/account_avatar.dart

@@ -1,7 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:solian/utils/platform.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 
 class AccountAvatar extends StatelessWidget {
   final String source;

lib/widgets/chat/channel_action.dart

@@ -7,7 +7,7 @@ import 'package:solian/models/channel.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/chat.dart';
 import 'package:solian/router.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 
 class ChannelCallAction extends StatefulWidget {

lib/widgets/chat/channel_deletion.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/models/channel.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 
 class ChannelDeletion extends StatefulWidget {

lib/widgets/chat/message_content.dart

@@ -10,19 +10,23 @@ class ChatMessageContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Markdown(
-      data: item.content,
-      shrinkWrap: true,
-      selectable: true,
-      physics: const NeverScrollableScrollPhysics(),
-      padding: const EdgeInsets.all(0),
-      onTapLink: (text, href, title) async {
-        if (href == null) return;
-        await launchUrlString(
-          href,
-          mode: LaunchMode.externalApplication,
-        );
-      },
-    );
+    if (item.type == 'm.text') {
+      return Markdown(
+        data: item.decodedContent['value'],
+        shrinkWrap: true,
+        selectable: true,
+        physics: const NeverScrollableScrollPhysics(),
+        padding: const EdgeInsets.all(0),
+        onTapLink: (text, href, title) async {
+          if (href == null) return;
+          await launchUrlString(
+            href,
+            mode: LaunchMode.externalApplication,
+          );
+        },
+      );
+    }
+
+    return Container();
   }
 }

lib/widgets/chat/message_deletion.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/models/message.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 
 class ChatMessageDeletionDialog extends StatefulWidget {

lib/widgets/chat/message_editor.dart

@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/models/message.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 import 'package:solian/widgets/posts/attachment_editor.dart';
 import 'package:badges/badges.dart' as badge;
@@ -55,6 +55,10 @@ class _ChatMessageEditorState extends State<ChatMessageEditor> {
     );
   }
 
+  Map<String, dynamic> buildContentBody(String content, {String algorithm = 'plain'}) {
+    return {'value': content, 'algorithm': algorithm};
+  }
+
   Future<void> sendMessage(BuildContext context) async {
     _focusNode.requestFocus();
 
@@ -68,7 +72,8 @@ class _ChatMessageEditorState extends State<ChatMessageEditor> {
     final req = Request(widget.editing == null ? 'POST' : 'PUT', uri);
     req.headers['Content-Type'] = 'application/json';
     req.body = jsonEncode(<String, dynamic>{
-      'content': _textController.value.text,
+      'type': 'm.text',
+      'content': buildContentBody(_textController.value.text),
       'attachments': _attachments,
       'reply_to': widget.replying?.id,
     });
@@ -106,7 +111,10 @@ class _ChatMessageEditorState extends State<ChatMessageEditor> {
       setState(() {
         _prevEditingId = widget.editing!.id;
         _attachments = widget.editing!.attachments ?? List.empty(growable: true);
-        _textController.text = widget.editing!.content;
+
+        if (widget.editing!.type == 'm.text') {
+          _textController.text = widget.editing!.decodedContent['value'];
+        }
       });
     }
   }

lib/widgets/notification_notifier.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:solian/models/packet.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/providers/notify.dart';
 import 'package:solian/router.dart';
@@ -35,9 +36,13 @@ class _NotificationNotifierState extends State<NotificationNotifier> {
       nty.connect(auth).then((snapshot) {
         snapshot!.stream.listen(
           (event) {
-            final result = model.Notification.fromJson(jsonDecode(event));
-            nty.onRemoteMessage(result);
-            nty.notifyMessage(result.subject, result.content);
+            final result = NetworkPackage.fromJson(jsonDecode(event));
+            switch (result.method) {
+              case 'notifications.new':
+                final result = model.Notification.fromJson(jsonDecode(event));
+                nty.onRemoteMessage(result);
+                nty.notifyMessage(result.subject, result.content);
+            }
           },
           onError: (_, __) => connect(),
           onDone: () => connect(),

lib/widgets/posts/attachment_editor.dart

@@ -11,7 +11,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:solian/utils/file.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/widgets/exts.dart';
 

lib/widgets/posts/comment_list.dart

@@ -9,7 +9,7 @@ import 'package:http/http.dart' as http;
 import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/posts/comment_editor.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/posts/post.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 

lib/widgets/posts/content/article.dart

@@ -4,7 +4,7 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:solian/models/post.dart';
 import 'package:markdown/markdown.dart' as markdown;
 import 'package:solian/utils/platform.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class ArticleContent extends StatelessWidget {

lib/widgets/posts/content/attachment.dart

@@ -4,7 +4,7 @@ import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/utils/platform.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:flutter_carousel_widget/flutter_carousel_widget.dart';
 import 'package:solian/widgets/posts/attachment_screen.dart';
 import 'package:uuid/uuid.dart';

lib/widgets/posts/post_deletion.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/models/post.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 
 class ItemDeletionDialog extends StatefulWidget {

lib/widgets/posts/reaction_action.dart

@@ -5,7 +5,7 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:provider/provider.dart';
 import 'package:solian/models/reaction.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/widgets/exts.dart';
 

lib/widgets/realms/realm_deletion.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/models/realm.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/utils/service_url.dart';
+import 'package:solian/utils/services_url.dart';
 import 'package:solian/widgets/exts.dart';
 
 class RealmDeletion extends StatefulWidget {