lib/providers/sn_sticker.dart

@@ -1,17 +1,11 @@
-import 'dart:convert';
-
-import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:surface/database/database.dart';
 import 'package:surface/logger.dart';
-import 'package:surface/providers/database.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/attachment.dart';
 
 class SnStickerProvider {
   late final SnNetworkProvider _sn;
-  late final DatabaseProvider _dt;
   final Map<String, SnSticker?> _cache = {};
 
   final Map<int, List<SnSticker>> stickersByPack = {};
@@ -21,7 +15,6 @@ class SnStickerProvider {
 
   SnStickerProvider(BuildContext context) {
     _sn = context.read<SnNetworkProvider>();
-    _dt = context.read<DatabaseProvider>();
   }
 
   bool hasNotSticker(String alias) {
@@ -38,32 +31,22 @@ class SnStickerProvider {
     }
   }
 
-  void putSticker(Iterable<SnSticker> stickers) {
-    for (final ele in stickers) {
+  void putSticker(Iterable<SnSticker> sticker) {
+    for (final ele in sticker) {
       _cacheSticker(ele);
     }
-    _saveStickerToLocal(stickers);
-    _saveStickerPackToLocal(stickers.map((ele) => ele.pack).toSet());
   }
 
   Future<SnSticker?> lookupSticker(String alias) async {
-    // In-memory cache
     if (_cache.containsKey(alias)) {
       return _cache[alias];
     }
-    // On-disk cache
-    final localStickers = await (_dt.db.snLocalSticker.select()
-          ..where((e) => e.fullAlias.equals(alias)))
-        .getSingleOrNull();
-    if (localStickers != null) {
-      _cache[alias] = localStickers.content;
-      return localStickers.content;
-    }
-    // Remote server
+
     try {
       final resp = await _sn.client.get('/cgi/uc/stickers/lookup/$alias');
       final sticker = SnSticker.fromJson(resp.data);
-      putSticker([sticker]);
+      _cacheSticker(sticker);
+
       return sticker;
     } catch (err) {
       _cache[alias] = null;
@@ -74,18 +57,6 @@ class SnStickerProvider {
   }
 
   Future<void> listSticker() async {
-    final localPacks = await _dt.db.snLocalStickerPack.select().get();
-    final localStickers = await _dt.db.snLocalSticker.select().get();
-    final local = localStickers.map((ele) {
-      return ele.content.copyWith(
-        pack: localPacks
-            .firstWhere((pk) => pk.content.id == ele.content.packId)
-            .content,
-      );
-    });
-    for (final sticker in local) {
-      _cacheSticker(sticker);
-    }
     try {
       final resp = await _sn.client.get('/cgi/uc/stickers');
       final data = resp.data;
@@ -98,35 +69,4 @@ class SnStickerProvider {
       rethrow;
     }
   }
-
-  Future<void> _saveStickerToLocal(Iterable<SnSticker> stickers) async {
-    await _dt.db.snLocalSticker.insertAll(
-      stickers.map(
-        (ele) => SnLocalStickerCompanion.insert(
-          id: Value(ele.id),
-          alias: ele.alias,
-          fullAlias: '${ele.pack.prefix}${ele.alias}',
-          content: ele,
-          createdAt: Value(ele.createdAt),
-        ),
-      ),
-      onConflict: DoNothing(),
-    );
-  }
-
-  Future<void> _saveStickerPackToLocal(Iterable<SnStickerPack> packs) async {
-    final queries = packs
-        .map(
-          (ele) => _dt.db.snLocalStickerPack.insertOne(
-              SnLocalStickerPackCompanion.insert(
-                id: Value(ele.id),
-                content: ele,
-                createdAt: Value(ele.createdAt),
-              ),
-              onConflict: DoUpdate((_) => SnLocalStickerPackCompanion.custom(
-                  content: Constant(jsonEncode(ele.toJson()))))),
-        )
-        .toList();
-    await Future.wait(queries);
-  }
 }

lib/screens/chat/channel_detail.dart

@@ -59,7 +59,6 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
     try {
       final ct = context.read<ChatChannelProvider>();
       final resp = await ct.getChannelProfile(_channel!);
-      _profile = resp;
       _notifyLevel = resp.notify;
       if (!mounted) return;
       final ud = context.read<UserDirectoryProvider>();
@@ -133,11 +132,10 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
     try {
       final ct = context.read<ChatChannelProvider>();
       final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.put(
+      await sn.client.put(
         '/cgi/im/channels/${_channel!.keyPath}/members/me/notify',
         data: {'notify_level': value},
       );
-      _profile = SnChannelMember.fromJson(resp.data);
       _notifyLevel = value;
       await ct.updateChannelProfile(_profile!);
       if (!mounted) return;
@@ -411,14 +409,11 @@ class _ChannelProfileDetailDialogState
     setState(() => _isBusy = true);
 
     try {
-      final ct = context.read<ChatChannelProvider>();
       final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.put(
+      await sn.client.put(
         '/cgi/im/channels/${widget.channel.keyPath}/members/me',
         data: {'nick': _nickController.text},
       );
-      final out = SnChannelMember.fromJson(resp.data);
-      await ct.updateChannelProfile(out);
       if (!mounted) return;
       Navigator.pop(context, true);
     } catch (err) {

lib/screens/stickers.dart

@@ -284,10 +284,7 @@ class _StickerPackAddPopupState extends State<_StickerPackAddPopup> {
       );
       if (!mounted) return;
       context.showSnackbar('stickersAdded'.tr());
-      if (_pack?.stickers != null) {
-        stickers.putSticker(
-            _pack!.stickers!.map((ele) => ele.copyWith(pack: _pack!)));
-      }
+      if (_pack?.stickers != null) stickers.putSticker(_pack!.stickers!);
       Navigator.pop(context, true);
     } catch (err) {
       if (!mounted) return;