Update apppp.txt

apppp.txt

@@ -6,7 +6,6 @@ from datetime import datetime, timedelta, timezone
 members = ["かほ", "さや", "こず", "るり", "めぐ", "つづ", "ぎん", "すず", "ひめ", "せら", "いず", "さち"]
 
 def get_personal_daily_oracle(device_id):
-    # IDが正しく渡れば、ここでシードが固定されます
     seed_base = device_id if device_id else "default_fate"
     jst = timezone(timedelta(hours=9))
     today_str = datetime.now(jst).strftime("%Y-%m-%d")
@@ -24,9 +23,10 @@ def get_personal_daily_oracle(device_id):
     )
     peace_msg = "これにより、不毛なカップリング論争は終結しました。"
     
-    return oracle_html, peace_msg, gr.update(visible=True), gr.update(visible=True)
+    # 戻り値: oracle_html, peace_msg, bsky_btn_update, x_btn_update, result_box_update
+    return oracle_html, peace_msg, gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
 
-# JS: 修正ポイント - localStorageからIDを直接取得してPythonに渡すように変更
+# JS: 状態チェックと復元
 js_logic = """
 function(deviceId) {
     const id = localStorage.getItem('cp_oracle_device_id') || "guest";
@@ -36,31 +36,28 @@ function(deviceId) {
 
     if (lastDraw === today && lastPair) {
         alert("本日の神託は既に下されています。\\n明日の更新まで、今の思想を維持しなさい。");
-        // [device_id, oracle_html, peace_msg, share_btn, result_display] の5要素を返す
-        return [id, lastPair, "これにより、不毛なカップリング論争は終結しました。", { "visible": true, "__type__": "update" }, { "visible": true, "__type__": "update" }];
+        return [id, lastPair, "これにより、不毛なカップリング論争は終結しました。", { "visible": true, "__type__": "update" }, { "visible": true, "__type__": "update" }, { "visible": true, "__type__": "update" }];
     } 
     
     localStorage.setItem('lastOracleDate', today);
-    // Pythonのfnを実行させるため、結果部分はnullで返しつつ、IDだけは確実に渡す
-    return [id, null, null, null, null];
+    return [id, null, null, null, null, null];
 }
 """
 
 # JS: 結果の保存
 js_save_result = """
-function(oracleHtml, peaceMsg, shareBtn, resultBox) {
+function(oracleHtml, peaceMsg, bskyBtn, xBtn, resultBox) {
     if (oracleHtml && oracleHtml.includes("本日の神託")) {
         localStorage.setItem('lastPairText', oracleHtml);
     }
 }
 """
 
-# JS: Bluesky投稿（URLの前に改行を入れてリンク認識を改善）
-js_share_bluesky = """
+# JS: 共通テキスト生成ロジック
+js_get_share_text = """
 function() {
     const pairRawEl = document.getElementById('pair-raw');
     let pairName = "";
-    
     if (pairRawEl) {
         pairName = pairRawEl.innerText;
     } else {
@@ -68,91 +65,40 @@ function() {
         const match = lastPair.match(/>([^<]{4,})<\\/div>$/);
         pairName = match ? match[1] : "運命";
     }
-
     const currentUrl = window.location.href;
-    // URLの直前に改行を2つ入れることで、SNS側がURLを独立したリンクとして認識しやすくなります
-    const text = `私は「${pairName}」を信仰しています。\\n\\n蓮ノ空聖書正典：\\n${currentUrl}`;
-    const intentUrl = `https://bsky.app/intent/compose?text=${encodeURIComponent(text)}`;
-    window.open(intentUrl, '_blank');
+    return `私は「${pairName}」を信仰しています。\\n\\n蓮ノ空聖書正典：\\n${currentUrl}`;
 }
 """
 
+# JS: 各SNSへの投稿
+js_share_bluesky = f"function() {{ const text = ({js_get_share_text})(); window.open(`https://bsky.app/intent/compose?text=${{encodeURIComponent(text)}}`, '_blank'); }}"
+js_share_x = f"function() {{ const text = ({js_get_share_text})(); window.open(`https://twitter.com/intent/tweet?text=${{encodeURIComponent(text)}}`, '_blank'); }}"
+
 custom_css = """
 .gradio-container { max-width: 600px !important; text-align: center !important; }
+.center-content { display: flex !important; flex-direction: column !important; align-items: center !important; padding-top: 45px !important; }
+h1 { margin-top: 0px !important; margin-bottom: -5px !important; font-size: 32px !important; }
+#doctrine { font-size: 1.5em !important; line-height: 1.4 !important; font-weight: bold !important; margin-bottom: -5px !important; text-align: center !important; }
 
-/* 1. 最上部の空白を45pxに設定 */
-.center-content { 
-    display: flex !important; 
-    flex-direction: column !important; 
-    align-items: center !important; 
-    padding-top: 45px !important; 
-}
-
-/* 2. タイトルと教義の間を-5px */
-h1 { 
-    margin-top: 0px !important;
-    margin-bottom: -5px !important; 
-    font-size: 32px !important; 
-}
-
-/* 3. 教義と結果の間を-5px */
-#doctrine { 
-    font-size: 1.5em !important; 
-    line-height: 1.4 !important; 
-    font-weight: bold !important;
-    margin-bottom: -5px !important; 
-    text-align: center !important;
-}
-
-/* 4. 結果ボックス（基本：ライトモード） */
 #oracle-box {
-    color: #000 !important;
-    background: #fff !important;
-    border: 4px solid #000 !important;
-    padding: 25px 10px !important;
-    line-height: 1.1 !important;
-    min-height: 130px !important;
-    display: flex !important;
-    flex-direction: column !important;
-    justify-content: center !important;
+    color: #000 !important; background: #fff !important; border: 4px solid #000 !important;
+    padding: 25px 10px !important; line-height: 1.1 !important; min-height: 130px !important;
+    display: flex !important; flex-direction: column !important; justify-content: center !important;
     margin: 0px auto -5px auto !important; 
 }
+.dark #oracle-box { color: #fff !important; background: #000 !important; border: 4px solid #fff !important; }
 
-/* ★ダークモード時の色指定を追加 */
-.dark #oracle-box {
-    color: #fff !important;
-    background: #000 !important;
-    border: 4px solid #fff !important;
-}
-
-/* 5. 終結文とボタンの間を-5px */
-#peace-msg { 
-    font-size: 20px !important; 
-    font-weight: bold !important; 
-    color: #d63031 !important; 
-    margin: 0px auto -5px auto !important; 
-}
+#peace-msg { font-size: 20px !important; font-weight: bold !important; color: #d63031 !important; margin: 0px auto -5px auto !important; }
 
-/* 6. ボタン同士の間を-5px */
-.action-btn { 
-    font-size: 26px !important; 
-    font-weight: bold !important; 
-    height: 70px !important; 
-    width: 320px !important; 
-    border: 2px solid #000 !important; 
-}
-
-/* ★ダークモード時のボタン枠線を追加 */
-.dark .action-btn {
-    border: 2px solid #fff !important;
-}
+.action-btn { font-size: 24px !important; font-weight: bold !important; width: 320px !important; border: 2px solid #000 !important; }
+.dark .action-btn { border: 2px solid #fff !important; }
 
-#draw-btn { margin: 0px auto -5px auto !important; }
-#share-btn { margin: 0px auto 10px auto !important; }
+#draw-btn { margin: 0px auto -5px auto !important; height: 75px !important; font-size: 28px !important; }
+#share-bsky { margin: 0px auto -5px auto !important; height: 60px !important; }
+#share-x { margin: 0px auto 10px auto !important; height: 60px !important; }
 """
 
 with gr.Blocks(title="蓮ノ空聖書正典", css=custom_css, theme=gr.themes.Monochrome()) as demo:
-    # 修正箇所: StateをTextboxに変更（非表示）
     device_id_storage = gr.Textbox(visible=False)
 
     demo.load(None, None, device_id_storage, js="""
@@ -168,28 +114,29 @@ with gr.Blocks(title="蓮ノ空聖書正典", css=custom_css, theme=gr.themes.Mo
 
     with gr.Column(elem_classes="center-content"):
         gr.Markdown("# ⚖️ 蓮ノ空聖書正典")
-        
         gr.Markdown("日付が変わるまであなたの思想は<br>統一されます。", elem_id="doctrine")
         
         result_display = gr.HTML(elem_id="oracle-box", visible=False)
         peace_display = gr.Markdown(elem_id="peace-msg")
         
         draw_btn = gr.Button("神託を受ける", variant="primary", elem_id="draw-btn", elem_classes="action-btn")
-        share_btn = gr.Button("信仰を広める", variant="secondary", elem_id="share-btn", elem_classes="action-btn", visible=False)
+        share_btn_x = gr.Button("Xで信仰を広める", variant="secondary", elem_id="share-x", elem_classes="action-btn", visible=False)
+        share_btn_bsky = gr.Button("Blueskyで信仰を広める", variant="secondary", elem_id="share-bsky", elem_classes="action-btn", visible=False)
 
     draw_btn.click(
         fn=get_personal_daily_oracle,
         inputs=[device_id_storage],
-        outputs=[result_display, peace_display, share_btn, result_display],
+        outputs=[result_display, peace_display, share_btn_bsky, share_btn_x, result_display],
         js=js_logic
     ).then(
         fn=None,
-        inputs=[result_display, peace_display, share_btn, result_display],
+        inputs=[result_display, peace_display, share_btn_bsky, share_btn_x, result_display],
         outputs=None,
         js=js_save_result
     )
 
-    share_btn.click(fn=None, inputs=None, outputs=None, js=js_share_bluesky)
+    share_btn_bsky.click(fn=None, inputs=None, outputs=None, js=js_share_bluesky)
+    share_btn_x.click(fn=None, inputs=None, outputs=None, js=js_share_x)
 
 if __name__ == "__main__":
     demo.launch()