Merge branch 'main' into jade/modpack-scanning-improvements

.github/workflows/turbo-ci.yml

@@ -76,10 +76,6 @@ jobs:
       # since we don't want warnings to become errors
       # while developing)
       RUSTFLAGS: -Dwarnings
-      # sccache config
-      SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '20G' || '' }}
-      RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }}
-      CARGO_INCREMENTAL: 0
       # Redis config for tests
       REDIS_TOPOLOGY: cluster
       REDIS_CONNECTION_TYPE: multiplexed
@@ -114,10 +110,6 @@ jobs:
         if: needs.skip-if-clean.outputs.internal == 'true'
         uses: namespace-actions/setup-turbocache@f96bd6befa13ae74b2858a5be49573640d4636f5 # v0.0.2
 
-      - name: Configure sccache
-        if: needs.skip-if-clean.outputs.internal == 'true'
-        run: nsc cache sccache setup --cache_name default >> "$GITHUB_ENV"
-
       - name: Install apt dependencies
         run: |
           sudo apt-get update
@@ -133,9 +125,6 @@ jobs:
       - name: Setup mold
         uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0
 
-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
-
       - name: Setup binstall
         uses: cargo-bins/cargo-binstall@ead08b90bd7b2e6d81963fb9cf0b7239f66d5db4 # v1.21.0
 

apps/frontend/src/pages/[type]/[project]/moderation.vue

@@ -72,7 +72,7 @@
 					<h2 id="messages" class="m-0 text-xl font-semibold text-contrast">
 						{{ formatMessage(messages.threadSectionTitle) }}
 					</h2>
-					<div v-if="isStaff(currentMember?.user)" class="flex items-center gap-2">
+					<div v-if="staff" class="flex items-center gap-2">
 						<Toggle id="moderator-see-user-ui-toggle" v-model="moderatorSeeUserUi" small />
 						<label for="moderator-see-user-ui-toggle"> Show member UI </label>
 					</div>
@@ -218,7 +218,10 @@ const {
 } = injectProjectPageContext()
 
 const canAccess = computed(() => !!currentMember.value)
-const userFacingUiVisible = computed(() => !!currentMember.value && moderatorSeeUserUi.value)
+const staff = computed(() => isStaff(currentMember.value?.user))
+const userFacingUiVisible = computed(
+	() => !!currentMember.value && (!staff.value || moderatorSeeUserUi.value),
+)
 
 const approvedAdmonitionMessage = computed<MessageDescriptor | null>(() => {
 	switch (project.value?.status) {

apps/labrinth/src/queue/payouts/flow/mural.rs

@@ -284,6 +284,11 @@ pub(super) async fn execute(
     if let Err(caught_err) = result {
         payout.status = PayoutStatus::Failed;
 
+        error!(
+            payout_request_id = %payout_request.id,
+            "Failed to execute Mural payout request; cancelling unexecuted request: {caught_err:#}"
+        );
+
         // if execution fails, make sure to immediately cancel the payout request
         // we don't want floating payout requests
         if let Err(err) =