Skip to content

Commit

Permalink
Merge pull request #156 from pangeachat/auto-pr
Browse files Browse the repository at this point in the history
Auto pr
  • Loading branch information
ggurdin authored Apr 29, 2024
2 parents 5242068 + cfa457a commit 8314b2a
Show file tree
Hide file tree
Showing 158 changed files with 21,309 additions and 15,882 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/auto_pull_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Auto Pull Request

#on:
# schedule:
# - cron: '0 0 * * 0' # Run at midnight (00:00) every Sunday

on:
push:
branches:
- auto-pr # Change this to match your main branch name

jobs:
auto_pull_request:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Test
run: echo ${{ github.head_ref }}.${{ github.sha }}

- name: Pull changes from FluffyChat
run: |
git config --global user.email "${{ vars.CI_EMAIL }}"
git config --global user.name "${{ vars.CI_USERNAME }}"
git remote add fluffychat https://github.com/krille-chan/fluffychat
git fetch fluffychat main
git merge --no-edit fluffychat/main --allow-unrelated-histories
- name: Push changes
run: |
git push origin HEAD:main-update-fluffy-automatic
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.GH_TOKEN }}
title: Updated fork with new fluffy changes
body: |
This is an automatic PR created by GitHub Actions.
branch: main
14 changes: 9 additions & 5 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,23 @@ jobs:
run: dart format lib/ test/ --set-exit-if-changed
- name: Check import formatting
run: dart run import_sorter:main --no-comments --exit-if-changed
- name: Check license compliance
run: dart run license_checker check-licenses -c licenses.yaml --problematic
- run: flutter analyze
- name: Apply google services patch
run: git apply ./scripts/enable-android-google-services.patch
- run: flutter analyze
- run: flutter test
- name: Check for unused localization strings
run: flutter pub run translations_cleaner list-unused-terms -a

build_debug_apk:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: "zulu"
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Install dependencies
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
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
- run: flutter pub get
- run: flutter build linux --target-platform linux-x64

Expand All @@ -80,6 +81,9 @@ jobs:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Setup Xcode version
uses: maxim-lobanov/[email protected]
uses: maxim-lobanov/[email protected]
with:
xcode-version: latest
- run: brew install sqlcipher
- run: flutter pub get
- run: flutter build ios --no-codesign
4 changes: 4 additions & 0 deletions .github/workflows/main_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
- name: Remove Emoji Font
run: |
rm -rf fonts/NotoEmoji
yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
- run: flutter pub get
- name: Prepare web
run: ./scripts/prepare-web.sh
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/process_tags.yaml

This file was deleted.

18 changes: 14 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ concurrency:
group: release_workflow
cancel-in-progress: true

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build_web:
runs-on: ubuntu-latest
Expand All @@ -22,6 +26,10 @@ jobs:
cache: true
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install nodejs -y
- name: Remove Emoji Font
run: |
rm -rf fonts/NotoEmoji
yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
- run: flutter pub get
- name: Prepare web
run: ./scripts/prepare-web.sh
Expand Down Expand Up @@ -55,9 +63,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
Expand Down Expand Up @@ -97,7 +106,7 @@ jobs:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Install dependencies
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
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
- run: flutter pub get
- run: flutter build linux --release --target-platform linux-x64
- name: Create archive
Expand All @@ -118,17 +127,18 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: cat .github/workflows/versions.env >> $GITHUB_ENV
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: '3.3'
- name: Install Fastlane
run: gem install fastlane -NV
- name: Apply Google Services Patch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/versions.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FLUTTER_VERSION=3.16.7
JAVA_VERSION=17
FLUTTER_VERSION=3.19.5
JAVA_VERSION=17
25 changes: 5 additions & 20 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled.

version:
revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31"
revision: "abb292a07e20d696c4568099f918f6c5f330e6b0"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,11 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
- platform: android
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
- platform: ios
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
- platform: linux
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
- platform: macos
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
- platform: web
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
- platform: windows
create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0

# User provided section

Expand Down
132 changes: 132 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,135 @@
## v1.19.1
Minor bugfix release for login with SSO on web.

- feat: Show/hide third column in chat view (krille-chan)
- design: Adjust some colors in inputbar (krille-chan)
- fix: Login with SSO on web (krille-chan)
- fix: Make chat permission settings null and type safe (krille-chan)
- chore: do not use static openssl (ShootingStarDragons)
- refactor: Move room headers into appbar bottom field (krille-chan)
- refactor: new flutter only typing animation (krille-chan)

## v1.19.0
FluffyChat v1.19.0 features an improved design for message bubbles and a lot of fixes under the hood.

- build: Update matrix dart sdk (Krille)
- build: Update to flutter 3.19.5 (krille-chan)
- chore: Add missing command hints (krille-chan)
- chore: Add pagekey to custom page builder (Krille)
- chore: Adjust design of typing indicator (Krille)
- chore: Adjust ticker of notifications for Android (Krille)
- chore: Calc blurhash in other thread (Krille)
- chore: Mark muted unread rooms with bold text (krille-chan)
- chore: More minimal matrix pill (Krille)
- chore: Try out CupertinoPage instead of custom transition in router (krille-chan)
- ci: add a license compliance check (lauren n. liberda)
- design: Connect bubbles from same sender (krille-chan)
- design: Display images in correct ratio in timeline (krille-chan)
- design: Make appbar in material you design for mobile mode (krille-chan)
- design: New sticker picker next to emoji picker (krille-chan)
- design: Nicer QR Code design (krille-chan)
- design: Nicer reactions design with size animations (Krille)
- feat: Add insert content via gboard (krille-chan)
- feat: Reply with one button in desktop (krille-chan)
- fix: Do not sync in background mode (krille-chan)
- fix: FluffyChat should assume m.change_password capabilitiy is supported if not present per spec (krille-chan)
- fix: never use root navigator for bottom sheets (The one with the braid)
- fix: Remove pantalaimon message with normal error message (krille-chan)
- fix: Search in spaces view (krille-chan)
- fix: Set read marker on web (Krille)
- fix: Point to correct path for auth.html so completing sso login flow no longer 404s (Gavin Mogan)
- refactor: Better logic for removing outdated notifications (Krille)
- refactor: Enhance logic when to mark room as read (krille-chan)
- refactor: Remove old aliases workaround (Krille)
- refactor: Sticker widget code (Krille)
- refactor: Use dart blurhash (Krille)
- Translated using Weblate (Basque) (xabirequejo)
- Translated using Weblate (Interlingua) (Software In Interlingua)

## v1.18.0
- feat: Add speed button for audioplayer (krille-chan)
- feat: enhanced send video functionality by adding toggle send original (Mubeen Rizvi)
- feat: add dialog to hide presence list with long-press (Marcus Hoffmann)
- feat: Add notification shortcuts to android (krille-chan)
- feat: make showing user presence info optional (Marcus Hoffmann)
- feat: Open chat on shortcut click on android (krille-chan)
- fix: BuildContext crash when joining room (krille-chan)
- fix: Export session (krille-chan)
- fix: Notifications open sometimes automatically on android (krille-chan)
- fix: Open room after join (krille-chan)
- fix: Open room by notification happened multiple times (krille-chan)
- fix: Open room links with event id (krille-chan)
- fix: properly initialize hideUnimportantStateEvents setting (Marcus Hoffmann)
- fix: Remove status msg not changeable from old cache (krille-chan)
- fix: use correct icons for chat pin/unpin (Marcus Hoffmann)
- fix: use correct icons for mark read/unread action (Marcus Hoffmann)
- build: Update Linux build files (krille-chan)
- build: Update to Flutter 3.19.1 (Krille)
- chore: Add more information to Person object in android notifications (krille-chan)
- chore: Thumbnail follow up for notifications (Krille)
- refactor: Better download UX with file picker for android and iOS (krille-chan)
- refactor: Use hashcode instead of string to id workaround for notifications (Krille)
- Added translation using Weblate (Belarusian) (kopatych)
- Added translation using Weblate (Interlingua) (Software In Interlingua)
- Translated using Weblate (Arabic) (Rex_sa)
- Translated using Weblate (Basque) (xabirequejo)
- Translated using Weblate (Chinese (Simplified)) (Poesty Li)
- Translated using Weblate (Chinese (Simplified)) (大王叫我来巡山)
- Translated using Weblate (Estonian) (Priit Jõerüüt)
- Translated using Weblate (Galician) (josé m)
- Translated using Weblate (German) (Benjamin Wagner)
- Translated using Weblate (Greek) (Benjamin Wagner)
- Translated using Weblate (Russian) (Benjamin Wagner)
- Translated using Weblate (Russian) (v1s7)
- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
- Translated using Weblate (Ukrainian) (Сергій)

## v1.17.3
- feat: New account data based wallpaper feature (Krille)
- build: Update dependencies (Krille)
- build: Update flutter to 3.16.9 (Krille)
- build: Update matrix dart sdk to 0.25.7 (Krille)
- build: Update minor versions (Krille)
- chore: Adjust status msg design (krille-chan)
- chore: Improved error handling for recovery key (Krille)
- chore: Make stickers smaller (Krille)
- chore: Wait for device keys before ask bootstrap (Krille)
- fix: Missing null check in public room bottom sheet (Krille)
- fix: onDragDone crashes when no files found (Krille)
- fix: Render tg-forward html tags (Krille)
- fix: Use HapticFeedback.selectionClick() for long press on message (Krille)
- fix: whitespaces sometimes encoded in html message (Krille)
- fix: Share invite links of public rooms (Krille)

## v1.17.2
Another minor bugfix release which also implements private read receipts.

- feat: Implement private read receipts (krille-chan)
- feat: Join room by alias by tpying alias in searchbar (krille-chan)
- fix: Add cancel button to key request dialog (Krille)
- fix: Encode component for links correctly (Krille)
- fix: Forward arbitrary message content (krille-chan)
- fix: Open publicroombottomsheet by alias (krille-chan)
- docs: Add noto animated emojis link (krille-chan)
- docs: New website (krille-chan)
- build: Do not load emojis at initial start on web (krille-chan)
- build: Update flutter to 3.16.8 (krille-chan)
- build: Update sdk to 0.25.6 (Krille)
- chore: Add more explaining text for key verification (krille-chan)
- chore: Resort settings and add more description text (krille-chan)
- refactor: Dialog BuildContext (krille-chan)
- refactor: Use popupmenudivider instead of workaround (krille-chan)
- Translated using Weblate (Arabic) (Rex_sa)
- Translated using Weblate (Basque) (xabirequejo)
- Translated using Weblate (Chinese (Simplified)) (Poesty Li)
- Translated using Weblate (Estonian) (Priit Jõerüüt)
- Translated using Weblate (Galician) (josé m)
- Translated using Weblate (German) (nautilusx)
- Translated using Weblate (Russian) (v1s7)
- Translated using Weblate (Swedish) (Flat)
- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
- Translated using Weblate (Ukrainian) (Сергій)

## v1.17.1
Minor bugfix release.

Expand Down
Loading

0 comments on commit 8314b2a

Please sign in to comment.