diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c010486..93a5892 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,7 +36,7 @@ jobs: - name: Go build run: | cd gomuks/pkg/ffi - go build -tags goolm,sqlite_fts5 -o ../../../libgomuks.dll -buildmode=c-shared + go build -tags goolm -o ../../../libgomuks.dll -buildmode=c-shared - name: Build with Flutter run: | diff --git a/gomuks b/gomuks index 819f5d6..da3b823 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 819f5d69f068ddedb08fe732f50570e33dd19e0f +Subproject commit da3b823e1435afd6f2a1ea6c354d9a35c489b624 diff --git a/hook/build.dart b/hook/build.dart index 2324736..6956d7c 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -55,11 +55,7 @@ Future main(List args) => build(args, (input, output) async { libFile = buildDir.resolve("${targetArch.name}/$libFileName"); // goheif/dav1d supported on Android would need to fix upstream - final tags = [ - "sqlite_fts5", - "goolm", - if (targetOS == OS.android) "noheic", - ].join(","); + final tags = targetOS == OS.android ? "goolm,noheic" : "goolm"; print( "Building Gomuks shared library $libFileName (${targetOS.name}/${targetArch.name}) to ${libFile.path}...", ); diff --git a/lib/controllers/power_level_controller.dart b/lib/controllers/power_level_controller.dart index 94e6bd2..7c40a6d 100644 --- a/lib/controllers/power_level_controller.dart +++ b/lib/controllers/power_level_controller.dart @@ -39,11 +39,13 @@ class PowerLevelController extends Notifier { ); if (user == null || content is! PowerLevelsContent) return false; - double powerLevelOf(String userId) => roomCreators?.contains(userId) == true - ? double.infinity - : (content.users[userId] ?? content.usersDefault).toDouble(); + int powerLevelOf(String userId) => + content.users[userId] ?? content.usersDefault; - final userLevel = powerLevelOf(user); + // room creators get power level infinite + final userLevel = roomCreators?.contains(user) == true + ? double.infinity + : powerLevelOf(user); return switch (config) { EventPowerLevelConfig(:final eventType) => diff --git a/linux/nix/pkg/gomuks.nix b/linux/nix/pkg/gomuks.nix index fbe402b..3e4ad90 100644 --- a/linux/nix/pkg/gomuks.nix +++ b/linux/nix/pkg/gomuks.nix @@ -11,12 +11,12 @@ buildGoModule (finalAttrs: { src = "${src}/gomuks"; - vendorHash = "sha256-/Wvx5WjnlPpQILpNqo9075F3nox0Dm8PfqGgck4CifQ="; + vendorHash = "sha256-EeGuh73jcK2aKmEJsMaAqQRJMzzHj3s8LrLb/QmorbQ="; buildPhase = '' runHook preBuild - go build -buildmode=c-shared -o libgomuks.so -tags goolm,noheic,sqlite_fts5 ./pkg/ffi + go build -buildmode=c-shared -o libgomuks.so -tags goolm,noheic ./pkg/ffi runHook postBuild '';