Merge remote-tracking branch 'upstream/feature/miria_v2' into test_wi…

…ndows_build

.github/workflows/dart_test.yml

@@ -36,8 +36,9 @@ jobs:
 
       - name: Run flutter pub get
         run: flutter pub get
-
-      - run: flutter analyze --fatal-infos
+
+      # ゆくゆくは
+      # - run: flutter analyze --fatal-infos
 
       - name: Run flutter test with coverage
         run: flutter test --coverage --coverage-path=~/coverage/lcov.info

.github/workflows/deploy.yml

@@ -73,21 +73,21 @@ jobs:
               mkdir ./private_keys
               echo -n "$APPLE_API_AUTHKEY_P8_BASE64" | base64 --decode --output ./private_keys/AuthKey_$APPLE_API_KEY_ID.p8
 
-        - name: Create archive file
-          run: flutter build ipa --no-tree-shake-icons  --release --no-codesign
-
-        - name: Release by fastlane
-          env:
-            APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-            APPLE_API_ISSUER_ID: ${{ secrets.APPLE_API_ISSUER_ID }}
-            MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            MATCH_REPOSITORY_ACCESS_TOKEN: ${{ secrets.MATCH_REPOSITORY_ACCESS_TOKEN }}
-            MATCH_REPOSITORY_USERNAME: ${{ secrets.MATCH_REPOSITORY_USERNAME }}
-          run: |
-            cd ios
-            bundle install
-            fastlane release
+        # - name: Create archive file
+        #   run: flutter build ipa --no-tree-shake-icons  --release --no-codesign
+
+        # - name: Release by fastlane
+        #   env:
+        #     APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+        #     APPLE_API_ISSUER_ID: ${{ secrets.APPLE_API_ISSUER_ID }}
+        #     MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        #     MATCH_REPOSITORY_ACCESS_TOKEN: ${{ secrets.MATCH_REPOSITORY_ACCESS_TOKEN }}
+        #     MATCH_REPOSITORY_USERNAME: ${{ secrets.MATCH_REPOSITORY_USERNAME }}
+        #   run: |
+        #     cd ios
+        #     bundle install
+        #     fastlane release
 
         - name: Create apk file
           run: |

.vscode/launch.json

@@ -21,6 +21,13 @@
             "request": "launch",
             "type": "dart",
             "flutterMode": "release"
+        },
+        {
+            "name": "debug current file",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "debug",
+            "program": "${file}"
         }
     ]
 }

assets_builder/emoji_list/builder.mjs

@@ -11,40 +11,36 @@ async function main() {
     const kuroshiro = new Kuroshiro.default();
     await kuroshiro.init(new KuromojiAnalyzer());
 
-    let body = fs.readFileSync("../misskey/packages/frontend/src/emojilist.json");
+    const categories = ['face', 'people', 'animals_and_nature', 'food_and_drink', 'activity', 'travel_and_places', 'objects', 'symbols', 'flags'];
+
+    const body = fs.readFileSync("../misskey/packages/frontend-shared/js/emojilist.json");
     const emojiList = JSON.parse(body);
+    const jpHiraBody = fs.readFileSync("../misskey/packages/frontend/src/unicode-emoji-indexes/ja-JP_hira.json")
+    const jpHiraBodyList = JSON.parse(jpHiraBody);
+    const jpBody = fs.readFileSync("../misskey/packages/frontend/src/unicode-emoji-indexes/ja-JP.json");
+    const jpBodyList = JSON.parse(jpBody);
+    const enBody = fs.readFileSync("../misskey/packages/frontend/src/unicode-emoji-indexes/en-US.json");
+    const enBodyList = JSON.parse(enBody);
+
+    // let body2 = await requestPromise("https://raw.githubusercontent.com/yagays/emoji-ja/master/data/emoji_ja.json");
+    // const jpEmojiList = JSON.parse(body2);
 
-    let body2 = await requestPromise("https://raw.githubusercontent.com/yagays/emoji-ja/master/data/emoji_ja.json");
-    const jpEmojiList = JSON.parse(body2);
+    const emojis = [];
 
     for(var i=0;i<emojiList.length;i++) {
-        var findChar = emojiList[i].char;
-        if(jpEmojiList[findChar] === undefined) {
-            var isFound = false;
-            for(var j=findChar.length;j>0;j--) {
-
-                if(jpEmojiList[emojiList[i].char.substring(0, j)] !== undefined) {
-                    findChar = emojiList[i].char.substring(0, j);
-                    isFound = true;
-                    break;
-                }
-            }
-
-            if(!isFound) {
-                break;
-            }
-        }
-
-        var keywords = jpEmojiList[findChar].keywords;
-
-        for(var j=0;j<keywords.length;j++) {
-            keywords[j] = await kuroshiro.convert(keywords[j], {mode:"normal", to:"hiragana"});
-        }
-
-        emojiList[i].keywords = emojiList[i].keywords.concat(keywords);
+        emojis.push({
+            "category": categories[emojiList[i][2]],
+            "char": emojiList[i][0],
+            "name": emojiList[i][1],
+            "keywords": [
+                ...jpHiraBodyList[emojiList[i][0]],
+                ...jpBodyList[emojiList[i][0]],
+                ...enBodyList[emojiList[i][0]]
+            ]
+        });
     }
 
-    fs.writeFileSync( "../../assets/emoji_list.json", JSON.stringify(emojiList));
+    fs.writeFileSync( "../../assets/emoji_list.json", JSON.stringify(emojis));
 
 }
 

ios/Podfile.lock

@@ -75,7 +75,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
-  - receive_sharing_intent (0.0.1):
+  - receive_sharing_intent (1.5.3):
     - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
@@ -92,7 +92,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - SwiftyGif (5.4.4)
@@ -104,6 +104,7 @@ PODS:
     - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
@@ -124,11 +125,11 @@ DEPENDENCIES:
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preference_app_group (from `.symlinks/plugins/shared_preference_app_group/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
 
 SPEC REPOS:
   trunk:
@@ -177,16 +178,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preference_app_group/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   volume_controller:
     :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
   webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 
 SPEC CHECKSUMS:
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
@@ -203,22 +204,22 @@ SPEC CHECKSUMS:
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
+  receive_sharing_intent: 753f808c6be5550247f6a20f2a14972466a5f33c
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: f9258c58221ed854cfa0e2b80ee4033710b1c6d3
   SDWebImageWebPCoder: 633b813fca24f1de5e076bcd7f720c038b23892b
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preference_app_group: 46aee3873e1da581d4904bece9876596d7f66725
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
-  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
+  webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
 
 PODFILE CHECKSUM: d5874a33c7eb4fc3858c862b5f42e17c95cb2c37
 

ios/PrivacyInfo.xcprivacy

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>

ios/Runner.xcodeproj/project.pbxproj

@@ -18,6 +18,8 @@
 		B670FC9B2BB4D1230071C2AC /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B670FC932BB4CC110071C2AC /* Flutter.xcframework */; };
 		B670FC9C2BB4D1230071C2AC /* Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B670FC932BB4CC110071C2AC /* Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B6A604652B6F867200DF5E0A /* ShareExtensionPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A604642B6F867200DF5E0A /* ShareExtensionPluginRegistrant.m */; };
+		B6D30E6E2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B6D30E6D2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy */; };
+		B6D30E6F2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B6D30E6D2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy */; };
 		B6E32F982A29F16500F51621 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E32F972A29F16500F51621 /* ShareViewController.swift */; };
 		B6E32F9B2A29F16500F51621 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6E32F992A29F16500F51621 /* MainInterface.storyboard */; };
 		B6E32F9F2A29F16500F51621 /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = B6E32F952A29F16500F51621 /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -97,6 +99,7 @@
 		B6A604632B6F862900DF5E0A /* ShareExtensionPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareExtensionPluginRegistrant.h; sourceTree = "<group>"; };
 		B6A604642B6F867200DF5E0A /* ShareExtensionPluginRegistrant.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareExtensionPluginRegistrant.m; sourceTree = "<group>"; };
 		B6A6046A2B6F895700DF5E0A /* ShareExtension-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ShareExtension-Bridging-Header.h"; sourceTree = "<group>"; };
+		B6D30E6D2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		B6E32F952A29F16500F51621 /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6E32F972A29F16500F51621 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		B6E32F9A2A29F16500F51621 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
@@ -155,6 +158,7 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
+				B6D30E6D2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				B6E32F962A29F16500F51621 /* ShareExtension */,
@@ -314,6 +318,7 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				B6D30E6E2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -322,6 +327,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B6D30E6F2CC2F993002CCBB1 /* PrivacyInfo.xcprivacy in Resources */,
 				B6E32F9B2A29F16500F51621 /* MainInterface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ios/ShareExtension/ShareExtensionPluginRegistrant.m

@@ -81,12 +81,13 @@
 @import shared_preference_app_group;
 #endif
 
-#if __has_include(<sqflite/SqflitePlugin.h>)
-#import <sqflite/SqflitePlugin.h>
+#if __has_include(<sqflite_darwin/SqflitePlugin.h>)
+#import <sqflite_darwin/SqflitePlugin.h>
 #else
-@import sqflite;
+@import sqflite_darwin;
 #endif
 
+
 #if __has_include(<wakelock_plus/WakelockPlusPlugin.h>)
 #import <wakelock_plus/WakelockPlusPlugin.h>
 #else