-
Notifications
You must be signed in to change notification settings - Fork 81
fix(flatpak): invalid fontconfig cache breaks emoji rendering #1636
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /*! | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| import type { Awaitable } from '../shared/utils.types.ts' | ||
|
|
||
| import gt from 'semver/functions/gt.js' | ||
| import { version } from '../../package.json' with { type: 'json' } | ||
| import { getAppConfig, setAppConfig } from './AppConfig.ts' | ||
| import { migrations } from './migrations/migrations.ts' | ||
|
|
||
| export type Migration = { | ||
| /** Migration name for logging purposes */ | ||
| name: string | ||
|
|
||
| /** Whether to run this migration on the first start of the application after installation */ | ||
| onFirstStart?: boolean | ||
|
|
||
| /** Whether to run this migration on application upgrade */ | ||
| onUpgrade?: boolean | ||
|
|
||
| /** Determine whether the migration should run if it is only needed in certain conditions */ | ||
| validator?: () => Awaitable<boolean> | ||
|
|
||
| /** Migration execution */ | ||
| up(): Awaitable<void> | ||
| } | ||
|
|
||
| /** | ||
| * Run migration | ||
| * | ||
| * @param migration - Migration | ||
| */ | ||
| async function runMigration(migration: Migration): Promise<void> { | ||
| const lastAppVersion = getAppConfig('lastAppVersion') | ||
|
|
||
| const matchesFirstStart = migration.onFirstStart && !lastAppVersion | ||
| const matchesUpgrade = migration.onUpgrade && lastAppVersion && gt(version, lastAppVersion) | ||
| if (!matchesFirstStart && !matchesUpgrade) { | ||
| return | ||
| } | ||
|
|
||
| const matchesValidator = await migration.validator?.() ?? true | ||
| if (!matchesValidator) { | ||
| return | ||
| } | ||
|
|
||
| try { | ||
| console.log(`Running migration "${migration.name}"`) | ||
| await migration.up() | ||
| } catch (error) { | ||
| console.error(`Unexpected exception during migration "${migration.name}":`, (error as Error).message) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Run all migrations and update last version | ||
| */ | ||
| export async function runMigrations() { | ||
| for (const migration of migrations) { | ||
| await runMigration(migration) | ||
| } | ||
|
|
||
| // Migrations are complete - now the app is on the new version | ||
| setAppConfig('lastAppVersion', version) | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/app/migrations/01-clearFlatpakFontConfigCache.migration.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /*! | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| import type { Migration } from '../migration.service.ts' | ||
|
|
||
| import { clearFlatpakFontConfigCache, isFlatpak } from '../system.utils.ts' | ||
|
|
||
| /** | ||
| * Manually clear font config cache for Flatpak installations. | ||
| * Fixes issues with font rendering like incorrect Emoji font. | ||
| */ | ||
| export const clearFlatpakFontConfigCacheMigration: Migration = { | ||
| name: 'Clear flatpak font config cache', | ||
|
|
||
| onFirstStart: true, | ||
|
|
||
| validator(): boolean { | ||
| // Flatpak specific problem | ||
| return isFlatpak | ||
| }, | ||
|
|
||
| async up() { | ||
| await clearFlatpakFontConfigCache() | ||
| }, | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /*! | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| import type { Migration } from '../migration.service.ts' | ||
|
|
||
| import { clearFlatpakFontConfigCacheMigration } from './01-clearFlatpakFontConfigCache.migration.ts' | ||
|
|
||
| export const migrations: Migration[] = [ | ||
| clearFlatpakFontConfigCacheMigration, | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /*! | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| export type Awaitable<T> = T | PromiseLike<T> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.