Merge branch 'main' into weblate-fluffychat-translations

.github/workflows/completed_issue_comment.yaml

@@ -1,24 +0,0 @@
-name: Completed Issue Comment
-
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  completed_issue_comment:
-    if: github.event.label.name == 'status:completed'
-    runs-on: ubuntu-latest
-    env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - run: |
-          gh issue comment ${{ github.event.issue.number }} --body "$(cat <<EOF
-          Thank you so much for reporting this issue and helping us improve FluffyChat! 💬💖
-
-          This project is built and maintained by volunteers in their free time.
-          If you enjoyed using FluffyChat and want to support the people behind it,
-          you can say thanks by buying us a coffee or chipping in:
-          ☕ https://ko-fi.com/krille  
-          💜 https://liberapay.com/KrilleChritzelius
-          EOF
-          )"

.github/workflows/integrate.yaml

@@ -96,7 +96,9 @@ jobs:
           xcode-version: latest
       - run: brew install sqlcipher
       - uses: moonrepo/setup-rust@v1
-      - name: Add Firebase Key
-        run: echo '${{secrets.GOOGLE_SERVICES_INFO_PLIST}}' | base64 -d > ios/Runner/GoogleService-Info.plist
+      - name: Add Firebase Messaging
+        run: |
+          flutter pub add fcm_shared_isolate:0.1.0
+          sed -i '' 's,//<GOOGLE_SERVICES>,,g' lib/utils/background_push.dart
       - run: flutter pub get
       - run: flutter build ios --no-codesign

ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,34 @@
+<?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>CLIENT_ID</key>
+	<string>865731724731-ofdr7e6m04murgb1bvchlj9oaos0q5i3.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.865731724731-ofdr7e6m04murgb1bvchlj9oaos0q5i3</string>
+	<key>API_KEY</key>
+	<string>AIzaSyA8ZUBcuny0HjPwF2Q2fvDyQTC5dG2VHlE</string>
+	<key>GCM_SENDER_ID</key>
+	<string>865731724731</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>im.fluffychat.app</string>
+	<key>PROJECT_ID</key>
+	<string>fluffychat-ef3e8</string>
+	<key>STORAGE_BUCKET</key>
+	<string>fluffychat-ef3e8.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:865731724731:ios:79fd983ce46cb40c64309e</string>
+</dict>
+</plist>

scripts/release-ios-testflight.sh

@@ -1,7 +1,6 @@
 #!/bin/sh -ve
 flutter pub add fcm_shared_isolate:0.1.0
 sed -i '' 's,//<GOOGLE_SERVICES>,,g' lib/utils/background_push.dart
-yq eval '.dependencies.fcm_shared_isolate = "0.1.0"' -i pubspec.yaml # Workaround: 0.2.0 does not work on iOS
 flutter clean
 flutter pub get
 cd ios