interstellar: 0.11.1 -> 0.11.2

Author: kyehn

pkgs/by-name/in/interstellar/emoji_builder.patch

@@ -0,0 +1,82 @@
+--- a/lib/src/widgets/emoji_picker/emoji_builder.dart
++++ b/lib/src/widgets/emoji_picker/emoji_builder.dart
+@@ -1,7 +1,7 @@
+ import 'dart:convert';
++import 'dart:io';
+ 
+ import 'package:build/build.dart';
+-import 'package:http/http.dart' as http;
+ import 'package:interstellar/src/utils/trie.dart';
+ 
+ Builder emojiBuilder(BuilderOptions options) =>
+@@ -29,15 +29,9 @@
+   };
+ 
+   Future<String> _generateContent() async {
+-    final dataResponse = await http.get(
+-      Uri.parse('$_sourcePrefix/compact.raw.json'),
+-    );
+-    final dataJson = jsonDecode(dataResponse.body);
++    final dataJson = jsonDecode(await File('@compact.raw.json@').readAsString()) as List;
+ 
+-    final messagesResponse = await http.get(
+-      Uri.parse('$_sourcePrefix/messages.raw.json'),
+-    );
+-    final messagesJson = jsonDecode(messagesResponse.body);
++    final messagesJson = jsonDecode(await File('@messages.raw.json@').readAsString()) as Map<String, dynamic>;
+ 
+     final s = StringBuffer()
+       ..write('''
+@@ -53,8 +47,9 @@
+ 
+     final emojiGroups = <String>[];
+ 
+-    for (var i = 0; i < (messagesJson['groups'] as List).length; i++) {
+-      final group = messagesJson['groups'][i];
++    final groups = messagesJson['groups'] as List;
++    for (var i = 0; i < groups.length; i++) {
++      final group = groups[i] as Map<String, dynamic>;
+ 
+       assert(group['order'] == i, 'Emoji group order value should match index');
+ 
+@@ -61,4 +56,4 @@
+-      emojiGroups.add(group['message']);
++      emojiGroups.add(group['message'] as String);
+     }
+ 
+     s
+@@ -72,7 +67,8 @@
+ 
+     {
+       var i = 0;
+-      for (final emoji in dataJson) {
++      for (final emojiItem in dataJson) {
++        final emoji = emojiItem as Map<String, dynamic>;
+         if (emoji['group'] == null || emoji['order'] == null) continue;
+ 
+         assert(emoji['order'] == i + 1, 'Emoji order value should match index');
+@@ -84,9 +80,9 @@
+               : emoji['emoticon']),
+         ];
+ 
+-        trie.addChild(Trie.normalizeTerm(emoji['label']), {i});
++        trie.addChild(Trie.normalizeTerm(emoji['label'] as String), {i});
+         for (final tag in tags) {
+-          trie.addChild(Trie.normalizeTerm(tag), {i});
++          trie.addChild(Trie.normalizeTerm(tag as String), {i});
+         }
+ 
+         s
+@@ -93,9 +89,9 @@
+           ..write('const Emoji("')
+-          ..write(emoji['unicode'])
++          ..write(emoji['unicode'] as String)
+           ..write('","')
+-          ..write(emoji['label'])
++          ..write(emoji['label'] as String)
+           ..write('",')
+-          ..write(emoji['group'])
++          ..write(emoji['group'].toString())
+           ..write('),\n');
+ 
+         i++;

pkgs/by-name/in/interstellar/git-hashes.json

@@ -1,3 +1,4 @@
 {
+  "flutter_web_auth_2": "sha256-x3SVeFIYS+UtyNKr4ohq4dvktCgS6nECGrb2vMg9aZc=",
   "webcrypto": "sha256-HX8CcCRbDlVMLMbKGnqKlrkMT9XITLbQE/2OW9zO72w="
 }

pkgs/by-name/in/interstellar/package.nix

@@ -1,7 +1,8 @@
 {
   lib,
-  flutter338,
+  flutter341,
   fetchFromGitHub,
+  fetchurl,
   imagemagick,
   alsa-lib,
   libass,
@@ -13,25 +14,40 @@
   dart,
 }:
 
-let
+flutter341.buildFlutterApplication (finalAttrs: {
   pname = "interstellar";
-
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "interstellar-app";
     repo = "interstellar";
-    tag = "v${version}";
-    hash = "sha256-ZhZBy/KECz/Gs3RSuuXmTtI5pKPBMFQNG/kS8JvEaFc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WprvuIN7yS5yLR4eUF/M9yG25ZU1Sf1I1myujclF4oM=";
   };
-in
-flutter338.buildFlutterApplication {
-  inherit pname version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   gitHashes = lib.importJSON ./git-hashes.json;
 
+  patches = [ ./emoji_builder.patch ];
+
+  postPatch = ''
+    substituteInPlace lib/src/widgets/emoji_picker/emoji_builder.dart \
+        --replace-fail "@compact.raw.json@" "${
+          fetchurl {
+            url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/compact.raw.json";
+            hash = "sha256-OivCYjiBEooRx3zni9jAr3lR0rzpoa3HX2l/a0UwDpE=";
+          }
+        }" \
+        --replace-fail "@messages.raw.json@" "${
+          fetchurl {
+            url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/messages.raw.json";
+            hash = "sha256-ZQWXZJ5jXxDNQHaOAsxApAt6oanvaEwZ6VXbDA0YeMs=";
+          }
+        }"
+    sed -i 's/const Color.from(alpha: 1, red: 1, green: 1, blue: 1).value32bit/0xFFFFFFFF/g; s/const Color.from(alpha: 1, red: 0, green: 0, blue: 0).value32bit/0xFF000000/g' lib/src/controller/database/database.dart
+  '';
+
   nativeBuildInputs = [ imagemagick ];
 
   buildInputs = [
@@ -54,14 +70,14 @@ flutter338.buildFlutterApplication {
   '';
 
   extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : $out/app/${pname}/lib
+    --prefix LD_LIBRARY_PATH : $out/app/${finalAttrs.pname}/lib
   '';
 
   passthru = {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          inherit src;
+          inherit (finalAttrs) src;
           nativeBuildInputs = [ yq-go ];
         }
         ''
@@ -96,4 +112,4 @@ flutter338.buildFlutterApplication {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ JollyDevelopment ];
   };
-}
+})