poppingmoon · poppingmoon · Mar 25, 2025 · Dec 10, 2024 · Mar 22, 2025 · Mar 24, 2025
diff --git a/lib/model/miauth_state.dart b/lib/model/miauth_state.dart
@@ -5,7 +5,7 @@ part 'miauth_state.freezed.dart';
 @freezed
 abstract class MiAuthState with _$MiAuthState {
   const factory MiAuthState({
-    required String host,
+    required Uri serverUrl,
     required String sessionId,
     required Uri url,
   }) = _MiAuthState;

diff --git a/lib/model/miauth_state.freezed.dart b/lib/model/miauth_state.freezed.dart
diff --git a/lib/provider/accounts_notifier_provider.dart b/lib/provider/accounts_notifier_provider.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 
-import 'package:flutter/foundation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../model/account.dart';
 import 'dio_provider.dart';
+import 'server_url_notifier_provider.dart';
 import 'shared_preferences_provider.dart';
 import 'tokens_notifier_provider.dart';
 import 'user_ids_notifier_provider.dart';
@@ -33,11 +33,36 @@ class AccountsNotifier extends _$AccountsNotifier {
         .setStringList(_key, state.map((e) => jsonEncode(e)).toList());
   }
 
-  Future<({bool added})> login(
-    Account account,
-    String token,
-    String userId,
-  ) async {
+  Future<({bool added})> login({
+    required Uri serverUrl,
+    required String username,
+    required String token,
+    required String userId,
+  }) async {
+    String host = serverUrl.authority.toLowerCase();
+    if (await ref
+            .read(serverUrlNotifierProvider(host).notifier)
+            .getSavedUrl() !=
+        serverUrl) {
+      try {
+        final meta = await ref
+            .read(dioProvider)
+            .postUri<Map<String, dynamic>>(
+              serverUrl.replace(pathSegments: ['api', 'meta']),
+              data: {},
+            );
+        if (meta.data?['uri'] case final String uri) {
+          final url = Uri.tryParse(uri);
+          if (url?.authority case final authority?) {
+            host = authority;
+          }
+        }
+      } catch (_) {}
+      await ref
+          .read(serverUrlNotifierProvider(host).notifier)
+          .updateUrl(serverUrl);
+    }
+    final account = Account(host: host, username: username);
     await ref.read(tokensNotifierProvider.notifier).add(account, token);
     await ref.read(userIdsNotifierProvider.notifier).add(account, userId);
     if (state.contains(account)) {
@@ -48,38 +73,18 @@ class AccountsNotifier extends _$AccountsNotifier {
     return (added: true);
   }
 
-  Future<({bool added})> loginWithToken(String host, String token) async {
-    if (kDebugMode) {
-      if (host.startsWith('localhost')) {
-        final i = await ref
-            .read(dioProvider)
-            .postUri<Map<String, dynamic>>(
-              Uri.http(host, 'api/i'),
-              data: {'i': token},
-            );
-        return login(
-          Account(
-            host: host.toLowerCase(),
-            username: i.data!['username'] as String,
-          ),
-          token,
-          i.data!['id'] as String,
-        );
-      }
-    }
+  Future<({bool added})> loginWithToken(Uri serverUrl, String token) async {
     final i = await ref
         .read(dioProvider)
         .postUri<Map<String, dynamic>>(
-          Uri.https(host, 'api/i'),
+          serverUrl.replace(pathSegments: ['api', 'i']),
           data: {'i': token},
         );
     return login(
-      Account(
-        host: host.toLowerCase(),
-        username: i.data!['username'] as String,
-      ),
-      token,
-      i.data!['id'] as String,
+      serverUrl: serverUrl,
+      username: i.data!['username'] as String,
+      token: token,
+      userId: i.data!['id'] as String,
     );
   }
 

diff --git a/lib/provider/accounts_notifier_provider.g.dart b/lib/provider/accounts_notifier_provider.g.dart
diff --git a/lib/provider/api/misskey_provider.dart b/lib/provider/api/misskey_provider.dart
@@ -1,24 +1,17 @@
-import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../../model/account.dart';
+import '../server_url_notifier_provider.dart';
 import '../token_provider.dart';
 
 part 'misskey_provider.g.dart';
 
 @Riverpod(keepAlive: true)
 Misskey misskey(Ref ref, Account account) {
+  final serverUrl = ref.watch(serverUrlNotifierProvider(account.host));
   final token = ref.watch(tokenProvider(account));
-  if (kDebugMode) {
-    if (account.host.startsWith('localhost')) {
-      return Misskey(
-        host: account.host,
-        token: token,
-        apiUrl: 'http://${account.host}/api/',
-      );
-    }
-  }
-  return Misskey(host: account.host, token: token);
+
+  return Misskey(serverUrl: serverUrl, token: token);
 }
diff --git a/lib/provider/api/misskey_provider.g.dart b/lib/provider/api/misskey_provider.g.dart
diff --git a/lib/provider/api/skeb_status_provider.dart b/lib/provider/api/skeb_status_provider.dart
@@ -5,6 +5,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../../model/account.dart';
 import '../dio_provider.dart';
+import '../server_url_notifier_provider.dart';
 import '../user_agent_provider.dart';
 
 part 'skeb_status_provider.g.dart';
@@ -16,12 +17,14 @@ FutureOr<UsersGetSkebStatusResponse> skebStatus(
   String userId,
 ) async {
   final userAgent = await ref.watch(userAgentProvider.future);
+  final serverUrl = ref.watch(serverUrlNotifierProvider(account.host));
   final response = await ref
       .watch(dioProvider)
       .getUri<Map<String, dynamic>>(
-        Uri.https(account.host, 'api/users/get-skeb-status', {
-          'userId': userId,
-        }),
+        serverUrl.replace(
+          pathSegments: ['api', 'users', 'get-skeb-status'],
+          queryParameters: {'userId': userId},
+        ),
         options:
             userAgent != null
                 ? Options(headers: {'User-Agent': userAgent})

diff --git a/lib/provider/api/skeb_status_provider.g.dart b/lib/provider/api/skeb_status_provider.g.dart
diff --git a/lib/provider/emoji_url_provider.dart b/lib/provider/emoji_url_provider.dart
@@ -4,6 +4,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import '../model/account.dart';
 import 'emoji_provider.dart';
 import 'proxied_image_url_provider.dart';
+import 'server_url_notifier_provider.dart';
 
 part 'emoji_url_provider.g.dart';
 
@@ -31,9 +32,8 @@ part 'emoji_url_provider.g.dart';
       rawUrl = ref.watch(emojiProvider(account.host, emoji))?.url;
     }
   }
-  rawUrl ??= Uri(
-    scheme: 'https',
-    host: account.host,
+  final serverUrl = ref.watch(serverUrlNotifierProvider(account.host));
+  rawUrl ??= serverUrl.replace(
     pathSegments: [
       'emoji',
       if (host != null)
@@ -42,16 +42,12 @@ part 'emoji_url_provider.g.dart';
         '$customEmojiName.webp',
     ],
   );
-  if (!rawUrl.isAbsolute) {
-    rawUrl = rawUrl.replace(scheme: 'https', host: account.host);
+  if (!rawUrl.hasScheme) {
+    rawUrl = serverUrl.resolveUri(rawUrl);
   }
 
   final proxied = ref.watch(
-    proxiedImageUrlProvider(
-      account.host,
-      rawUrl.toString(),
-      emoji: !useOriginalSize,
-    ),
+    proxiedImageUrlProvider(account.host, rawUrl, emoji: !useOriginalSize),
   );
 
   return (proxied.toString(), rawUrl.toString());

diff --git a/lib/provider/emoji_url_provider.g.dart b/lib/provider/emoji_url_provider.g.dart