Skip to content

Commit 8314b2a

Browse files
authored
Merge pull request #156 from pangeachat/auto-pr
Auto pr
2 parents 5242068 + cfa457a commit 8314b2a

File tree

158 files changed

+21309
-15882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+21309
-15882
lines changed
+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Auto Pull Request
2+
3+
#on:
4+
# schedule:
5+
# - cron: '0 0 * * 0' # Run at midnight (00:00) every Sunday
6+
7+
on:
8+
push:
9+
branches:
10+
- auto-pr # Change this to match your main branch name
11+
12+
jobs:
13+
auto_pull_request:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
- name: Test
20+
run: echo ${{ github.head_ref }}.${{ github.sha }}
21+
22+
- name: Pull changes from FluffyChat
23+
run: |
24+
git config --global user.email "${{ vars.CI_EMAIL }}"
25+
git config --global user.name "${{ vars.CI_USERNAME }}"
26+
git remote add fluffychat https://github.com/krille-chan/fluffychat
27+
git fetch fluffychat main
28+
git merge --no-edit fluffychat/main --allow-unrelated-histories
29+
30+
- name: Push changes
31+
run: |
32+
git push origin HEAD:main-update-fluffy-automatic
33+
34+
- name: Create Pull Request
35+
uses: peter-evans/create-pull-request@v3
36+
with:
37+
token: ${{ secrets.GH_TOKEN }}
38+
title: Updated fork with new fluffy changes
39+
body: |
40+
This is an automatic PR created by GitHub Actions.
41+
branch: main

.github/workflows/integrate.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,23 @@ jobs:
1919
run: dart format lib/ test/ --set-exit-if-changed
2020
- name: Check import formatting
2121
run: dart run import_sorter:main --no-comments --exit-if-changed
22+
- name: Check license compliance
23+
run: dart run license_checker check-licenses -c licenses.yaml --problematic
2224
- run: flutter analyze
2325
- name: Apply google services patch
2426
run: git apply ./scripts/enable-android-google-services.patch
2527
- run: flutter analyze
2628
- run: flutter test
27-
- name: Check for unused localization strings
28-
run: flutter pub run translations_cleaner list-unused-terms -a
2929

3030
build_debug_apk:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@v4
3434
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
35-
- uses: actions/setup-java@v1
35+
- uses: actions/setup-java@v4
3636
with:
3737
java-version: ${{ env.JAVA_VERSION }}
38+
distribution: "zulu"
3839
- uses: subosito/flutter-action@v2
3940
with:
4041
flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -66,7 +67,7 @@ jobs:
6667
flutter-version: ${{ env.FLUTTER_VERSION }}
6768
cache: true
6869
- name: Install dependencies
69-
run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y
70+
run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev -y
7071
- run: flutter pub get
7172
- run: flutter build linux --target-platform linux-x64
7273

@@ -80,6 +81,9 @@ jobs:
8081
flutter-version: ${{ env.FLUTTER_VERSION }}
8182
cache: true
8283
- name: Setup Xcode version
83-
uses: maxim-lobanov/setup-xcode@v1.5.1
84+
uses: maxim-lobanov/setup-xcode@v1.6.0
85+
with:
86+
xcode-version: latest
87+
- run: brew install sqlcipher
8488
- run: flutter pub get
8589
- run: flutter build ios --no-codesign

.github/workflows/main_deploy.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
- uses: subosito/flutter-action@v2
2020
with:
2121
flutter-version: ${{ env.FLUTTER_VERSION }}
22+
- name: Remove Emoji Font
23+
run: |
24+
rm -rf fonts/NotoEmoji
25+
yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
2226
- run: flutter pub get
2327
- name: Prepare web
2428
run: ./scripts/prepare-web.sh

.github/workflows/process_tags.yaml

-28
This file was deleted.

.github/workflows/release.yaml

+14-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ concurrency:
99
group: release_workflow
1010
cancel-in-progress: true
1111

12+
env:
13+
REGISTRY: ghcr.io
14+
IMAGE_NAME: ${{ github.repository }}
15+
1216
jobs:
1317
build_web:
1418
runs-on: ubuntu-latest
@@ -22,6 +26,10 @@ jobs:
2226
cache: true
2327
- name: Install dependencies
2428
run: sudo apt-get update && sudo apt-get install nodejs -y
29+
- name: Remove Emoji Font
30+
run: |
31+
rm -rf fonts/NotoEmoji
32+
yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
2533
- run: flutter pub get
2634
- name: Prepare web
2735
run: ./scripts/prepare-web.sh
@@ -55,9 +63,10 @@ jobs:
5563
steps:
5664
- uses: actions/checkout@v2
5765
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
58-
- uses: actions/setup-java@v1
66+
- uses: actions/setup-java@v4
5967
with:
6068
java-version: ${{ env.JAVA_VERSION }}
69+
distribution: 'zulu'
6170
- uses: subosito/flutter-action@v2
6271
with:
6372
flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -97,7 +106,7 @@ jobs:
97106
flutter-version: ${{ env.FLUTTER_VERSION }}
98107
cache: true
99108
- name: Install dependencies
100-
run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y
109+
run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev -y
101110
- run: flutter pub get
102111
- run: flutter build linux --release --target-platform linux-x64
103112
- name: Create archive
@@ -118,17 +127,18 @@ jobs:
118127
steps:
119128
- uses: actions/checkout@v2
120129
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
121-
- uses: actions/setup-java@v1
130+
- uses: actions/setup-java@v4
122131
with:
123132
java-version: ${{ env.JAVA_VERSION }}
133+
distribution: 'zulu'
124134
- uses: subosito/flutter-action@v2
125135
with:
126136
flutter-version: ${{ env.FLUTTER_VERSION }}
127137
cache: true
128138
- name: Set up Ruby
129139
uses: ruby/setup-ruby@v1
130140
with:
131-
ruby-version: 2.7
141+
ruby-version: '3.3'
132142
- name: Install Fastlane
133143
run: gem install fastlane -NV
134144
- name: Apply Google Services Patch

.github/workflows/versions.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FLUTTER_VERSION=3.16.7
2-
JAVA_VERSION=17
1+
FLUTTER_VERSION=3.19.5
2+
JAVA_VERSION=17

.metadata

+5-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31"
7+
revision: "abb292a07e20d696c4568099f918f6c5f330e6b0"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,11 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
17-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
18-
- platform: android
19-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
20-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
21-
- platform: ios
22-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
23-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
16+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
17+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
2418
- platform: linux
25-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
26-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
27-
- platform: macos
28-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
29-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
30-
- platform: web
31-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
32-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
33-
- platform: windows
34-
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
35-
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
19+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
20+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
3621

3722
# User provided section
3823

CHANGELOG.md

+132
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,135 @@
1+
## v1.19.1
2+
Minor bugfix release for login with SSO on web.
3+
4+
- feat: Show/hide third column in chat view (krille-chan)
5+
- design: Adjust some colors in inputbar (krille-chan)
6+
- fix: Login with SSO on web (krille-chan)
7+
- fix: Make chat permission settings null and type safe (krille-chan)
8+
- chore: do not use static openssl (ShootingStarDragons)
9+
- refactor: Move room headers into appbar bottom field (krille-chan)
10+
- refactor: new flutter only typing animation (krille-chan)
11+
12+
## v1.19.0
13+
FluffyChat v1.19.0 features an improved design for message bubbles and a lot of fixes under the hood.
14+
15+
- build: Update matrix dart sdk (Krille)
16+
- build: Update to flutter 3.19.5 (krille-chan)
17+
- chore: Add missing command hints (krille-chan)
18+
- chore: Add pagekey to custom page builder (Krille)
19+
- chore: Adjust design of typing indicator (Krille)
20+
- chore: Adjust ticker of notifications for Android (Krille)
21+
- chore: Calc blurhash in other thread (Krille)
22+
- chore: Mark muted unread rooms with bold text (krille-chan)
23+
- chore: More minimal matrix pill (Krille)
24+
- chore: Try out CupertinoPage instead of custom transition in router (krille-chan)
25+
- ci: add a license compliance check (lauren n. liberda)
26+
- design: Connect bubbles from same sender (krille-chan)
27+
- design: Display images in correct ratio in timeline (krille-chan)
28+
- design: Make appbar in material you design for mobile mode (krille-chan)
29+
- design: New sticker picker next to emoji picker (krille-chan)
30+
- design: Nicer QR Code design (krille-chan)
31+
- design: Nicer reactions design with size animations (Krille)
32+
- feat: Add insert content via gboard (krille-chan)
33+
- feat: Reply with one button in desktop (krille-chan)
34+
- fix: Do not sync in background mode (krille-chan)
35+
- fix: FluffyChat should assume m.change_password capabilitiy is supported if not present per spec (krille-chan)
36+
- fix: never use root navigator for bottom sheets (The one with the braid)
37+
- fix: Remove pantalaimon message with normal error message (krille-chan)
38+
- fix: Search in spaces view (krille-chan)
39+
- fix: Set read marker on web (Krille)
40+
- fix: Point to correct path for auth.html so completing sso login flow no longer 404s (Gavin Mogan)
41+
- refactor: Better logic for removing outdated notifications (Krille)
42+
- refactor: Enhance logic when to mark room as read (krille-chan)
43+
- refactor: Remove old aliases workaround (Krille)
44+
- refactor: Sticker widget code (Krille)
45+
- refactor: Use dart blurhash (Krille)
46+
- Translated using Weblate (Basque) (xabirequejo)
47+
- Translated using Weblate (Interlingua) (Software In Interlingua)
48+
49+
## v1.18.0
50+
- feat: Add speed button for audioplayer (krille-chan)
51+
- feat: enhanced send video functionality by adding toggle send original (Mubeen Rizvi)
52+
- feat: add dialog to hide presence list with long-press (Marcus Hoffmann)
53+
- feat: Add notification shortcuts to android (krille-chan)
54+
- feat: make showing user presence info optional (Marcus Hoffmann)
55+
- feat: Open chat on shortcut click on android (krille-chan)
56+
- fix: BuildContext crash when joining room (krille-chan)
57+
- fix: Export session (krille-chan)
58+
- fix: Notifications open sometimes automatically on android (krille-chan)
59+
- fix: Open room after join (krille-chan)
60+
- fix: Open room by notification happened multiple times (krille-chan)
61+
- fix: Open room links with event id (krille-chan)
62+
- fix: properly initialize hideUnimportantStateEvents setting (Marcus Hoffmann)
63+
- fix: Remove status msg not changeable from old cache (krille-chan)
64+
- fix: use correct icons for chat pin/unpin (Marcus Hoffmann)
65+
- fix: use correct icons for mark read/unread action (Marcus Hoffmann)
66+
- build: Update Linux build files (krille-chan)
67+
- build: Update to Flutter 3.19.1 (Krille)
68+
- chore: Add more information to Person object in android notifications (krille-chan)
69+
- chore: Thumbnail follow up for notifications (Krille)
70+
- refactor: Better download UX with file picker for android and iOS (krille-chan)
71+
- refactor: Use hashcode instead of string to id workaround for notifications (Krille)
72+
- Added translation using Weblate (Belarusian) (kopatych)
73+
- Added translation using Weblate (Interlingua) (Software In Interlingua)
74+
- Translated using Weblate (Arabic) (Rex_sa)
75+
- Translated using Weblate (Basque) (xabirequejo)
76+
- Translated using Weblate (Chinese (Simplified)) (Poesty Li)
77+
- Translated using Weblate (Chinese (Simplified)) (大王叫我来巡山)
78+
- Translated using Weblate (Estonian) (Priit Jõerüüt)
79+
- Translated using Weblate (Galician) (josé m)
80+
- Translated using Weblate (German) (Benjamin Wagner)
81+
- Translated using Weblate (Greek) (Benjamin Wagner)
82+
- Translated using Weblate (Russian) (Benjamin Wagner)
83+
- Translated using Weblate (Russian) (v1s7)
84+
- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
85+
- Translated using Weblate (Ukrainian) (Сергій)
86+
87+
## v1.17.3
88+
- feat: New account data based wallpaper feature (Krille)
89+
- build: Update dependencies (Krille)
90+
- build: Update flutter to 3.16.9 (Krille)
91+
- build: Update matrix dart sdk to 0.25.7 (Krille)
92+
- build: Update minor versions (Krille)
93+
- chore: Adjust status msg design (krille-chan)
94+
- chore: Improved error handling for recovery key (Krille)
95+
- chore: Make stickers smaller (Krille)
96+
- chore: Wait for device keys before ask bootstrap (Krille)
97+
- fix: Missing null check in public room bottom sheet (Krille)
98+
- fix: onDragDone crashes when no files found (Krille)
99+
- fix: Render tg-forward html tags (Krille)
100+
- fix: Use HapticFeedback.selectionClick() for long press on message (Krille)
101+
- fix: whitespaces sometimes encoded in html message (Krille)
102+
- fix: Share invite links of public rooms (Krille)
103+
104+
## v1.17.2
105+
Another minor bugfix release which also implements private read receipts.
106+
107+
- feat: Implement private read receipts (krille-chan)
108+
- feat: Join room by alias by tpying alias in searchbar (krille-chan)
109+
- fix: Add cancel button to key request dialog (Krille)
110+
- fix: Encode component for links correctly (Krille)
111+
- fix: Forward arbitrary message content (krille-chan)
112+
- fix: Open publicroombottomsheet by alias (krille-chan)
113+
- docs: Add noto animated emojis link (krille-chan)
114+
- docs: New website (krille-chan)
115+
- build: Do not load emojis at initial start on web (krille-chan)
116+
- build: Update flutter to 3.16.8 (krille-chan)
117+
- build: Update sdk to 0.25.6 (Krille)
118+
- chore: Add more explaining text for key verification (krille-chan)
119+
- chore: Resort settings and add more description text (krille-chan)
120+
- refactor: Dialog BuildContext (krille-chan)
121+
- refactor: Use popupmenudivider instead of workaround (krille-chan)
122+
- Translated using Weblate (Arabic) (Rex_sa)
123+
- Translated using Weblate (Basque) (xabirequejo)
124+
- Translated using Weblate (Chinese (Simplified)) (Poesty Li)
125+
- Translated using Weblate (Estonian) (Priit Jõerüüt)
126+
- Translated using Weblate (Galician) (josé m)
127+
- Translated using Weblate (German) (nautilusx)
128+
- Translated using Weblate (Russian) (v1s7)
129+
- Translated using Weblate (Swedish) (Flat)
130+
- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
131+
- Translated using Weblate (Ukrainian) (Сергій)
132+
1133
## v1.17.1
2134
Minor bugfix release.
3135

0 commit comments

Comments
 (0)