ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Simplify service lookups with optional chaining

Browse Source 
The bar-null-shell-null-typeof-function ternary guarded against our own
shell missing a method it always defines. bar?.shell?.firstPartyServiceFor()
handles the only real case, delayed bar injection, in one line. The
typeof checks that probe genuinely third-party plugin objects stay.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
2026-07-21 15:26:30 -07:00
co-authored by Claude Fable 5
parent ba91bad3a4
commit 289e6d12fc
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/bar/indicators/Dnd.qml
+1 -3
View File
@@ -5,9 +5,7 @@ import qs.Ui
BarIndicator { BarIndicator {
id: root id: root
readonly property var notificationService: bar && bar.shell && typeof bar.shell.firstPartyServiceFor === "function" readonly property var notificationService: bar?.shell?.firstPartyServiceFor("omarchy.notifications")
? bar.shell.firstPartyServiceFor("omarchy.notifications")
: null
readonly property bool dnd: notificationService ? notificationService.doNotDisturb : false readonly property bool dnd: notificationService ? notificationService.doNotDisturb : false
active: dnd active: dnd
shell/plugins/notifications/BarWidget.qml
+1 -3
View File
@@ -25,9 +25,7 @@ BarWidget {
// Look up the long-running notifications service through the shell host. // Look up the long-running notifications service through the shell host.
readonly property var hostShell: bar && bar.shell ? bar.shell : null readonly property var hostShell: bar && bar.shell ? bar.shell : null
readonly property var notificationService: hostShell && typeof hostShell.firstPartyServiceFor === "function" readonly property var notificationService: hostShell?.firstPartyServiceFor("omarchy.notifications")
? hostShell.firstPartyServiceFor("omarchy.notifications")
: null
function isChromiumDerived(app, appIcon) { function isChromiumDerived(app, appIcon) {
return NotificationLogic.isChromiumDerived(app, appIcon) return NotificationLogic.isChromiumDerived(app, appIcon)
shell/plugins/panels/audio/Panel.qml
+1 -1
View File
@@ -17,7 +17,7 @@ Panel {
readonly property var source: Pipewire.defaultAudioSource readonly property var source: Pipewire.defaultAudioSource
readonly property var nodes: Pipewire.nodes ? Pipewire.nodes.values : [] readonly property var nodes: Pipewire.nodes ? Pipewire.nodes.values : []
readonly property var mprisPlayers: Mpris.players ? Mpris.players.values : [] readonly property var mprisPlayers: Mpris.players ? Mpris.players.values : []
readonly property var mediaService: bar && bar.shell ? bar.shell.firstPartyServiceFor("omarchy.media") : null readonly property var mediaService: bar?.shell?.firstPartyServiceFor("omarchy.media")
readonly property var activeMediaPlayer: mediaService ? mediaService.activePlayer : null readonly property var activeMediaPlayer: mediaService ? mediaService.activePlayer : null
readonly property var candidateSinks: { readonly property var candidateSinks: {
shell/plugins/services/media/BarWidget.qml
+1 -1
View File
@@ -7,7 +7,7 @@ BarWidget {
id: root id: root
moduleName: "omarchy.media" moduleName: "omarchy.media"
readonly property var mediaService: bar && bar.shell ? bar.shell.firstPartyServiceFor("omarchy.media") : null readonly property var mediaService: bar?.shell?.firstPartyServiceFor("omarchy.media")
readonly property var activePlayer: mediaService ? mediaService.activePlayer : null readonly property var activePlayer: mediaService ? mediaService.activePlayer : null
readonly property var sourcePlayers: mediaService ? mediaService.sourcePlayers : [] readonly property var sourcePlayers: mediaService ? mediaService.sourcePlayers : []