From da5b8cb5b41b22bcf87094f55d5b6bd8aed6c708 Mon Sep 17 00:00:00 2001
From: jariji <96840304+jariji@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:51:55 -0700
Subject: [PATCH 1/2] Show text on occlusion cards regardless of
 occludeInactive (#4387)

* Show text on occlusion cards regardless of `occludeInactive`.

Before this change, on an image occlusion card, a text box was visible
during editing but not visible during review. This change makes text
visible even if other shapes would be hidden.

* Move fix to render_image_occlusion()

---------

Co-authored-by: jariji <jariji>
Co-authored-by: Abdo <abdo@abdnh.net>
---
 CONTRIBUTORS       | 3 ++-
 rslib/src/cloze.rs | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 01573b419..d90b7dbcc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -189,7 +189,7 @@ Christian Donat <https://github.com/cdonat2>
 Asuka Minato <https://asukaminato.eu.org>
 Dillon Baldwin <https://github.com/DillBal>
 Voczi <https://github.com/voczi>
-Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com>     
+Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com>
 Themis Demetriades <themis100@outlook.com>
 Luke Bartholomew <lukesbart@icloud.com>
 Gregory Abrasaldo <degeemon@gmail.com>
@@ -253,6 +253,7 @@ arold0 <arold0@icloud.com>
 nav1s <nav1s@proton.me>
 Ranjit Odedra <ranjitodedra.dev@gmail.com>
 Eltaurus <https://github.com/Eltaurus-Lt>
+jariji
 
 ********************
 
diff --git a/rslib/src/cloze.rs b/rslib/src/cloze.rs
index 9df53286d..70a5d1703 100644
--- a/rslib/src/cloze.rs
+++ b/rslib/src/cloze.rs
@@ -260,7 +260,6 @@ fn reveal_cloze(
             image_occlusion_text,
             question,
             active,
-            cloze_ord,
             &cloze.ordinals,
         ));
         return;
@@ -332,10 +331,9 @@ fn render_image_occlusion(
     text: &str,
     question_side: bool,
     active: bool,
-    ordinal: u16,
     ordinals: &[u16],
 ) -> String {
-    if (question_side && active) || ordinal == 0 {
+    if (question_side && active) || ordinals.contains(&0) {
         format!(
             r#"<div class="cloze" data-ordinal="{}" {}></div>"#,
             ordinals_str(ordinals),

From dac26ce67147b261d79a56092320cc2f5af0d990 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Wed, 29 Oct 2025 17:15:56 +0000
Subject: [PATCH 2/2] Fix/Exclude BackendFrontendService from
 write_python_interface (#4410)

* Fix/Missing python import in write_header

* Revert "Fix/Missing python import in write_header"

This reverts commit 7c736d984d474377c4326f0cdf473f0e039857c7.

* exclude BackendFrontendService

---------

Co-authored-by: Abdo <abdo@abdnh.net>
---
 rslib/proto/python.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rslib/proto/python.rs b/rslib/proto/python.rs
index a5adb4179..5c245de1d 100644
--- a/rslib/proto/python.rs
+++ b/rslib/proto/python.rs
@@ -22,7 +22,7 @@ pub(crate) fn write_python_interface(services: &[BackendService]) -> Result<()>
     write_header(&mut out)?;
 
     for service in services {
-        if service.name == "BackendAnkidroidService" {
+        if ["BackendAnkidroidService", "BackendFrontendService"].contains(&service.name.as_str()) {
             continue;
         }
         for method in service.all_methods() {