瀏覽代碼

Add pubsub# prefix to field names.

Keith Maika 1 月之前
父節點
當前提交
dd6a05233c
共有 3 個文件被更改,包括 17 次插入16 次删除
  1. 1 0
      CHANGES.md
  2. 1 1
      src/headless/plugins/pubsub/api.js
  3. 15 15
      src/headless/plugins/pubsub/tests/config.js

+ 1 - 0
CHANGES.md

@@ -7,6 +7,7 @@
 - #3730: QR Code doesn't work on dark backgrounds
 - #3730: QR Code doesn't work on dark backgrounds
 - #3769: Don't restrict OMEMO PEP push messages to type `headline`
 - #3769: Don't restrict OMEMO PEP push messages to type `headline`
 - #3791: Fetching pubsub node configuration fails
 - #3791: Fetching pubsub node configuration fails
+- #3792: Node reconfiguration attempt uses incorrect field names
 - Add approval banner in chats with requesting contacts or unsaved contacts
 - Add approval banner in chats with requesting contacts or unsaved contacts
 - Some fixes regarding manually resized chats in `overlayed` view mode.
 - Some fixes regarding manually resized chats in `overlayed` view mode.
 - Replace webpack with [rspack](https://rspack.rs)
 - Replace webpack with [rspack](https://rspack.rs)

+ 1 - 1
src/headless/plugins/pubsub/api.js

@@ -83,7 +83,7 @@ export default {
                                 <field var="FORM_TYPE" type="hidden">
                                 <field var="FORM_TYPE" type="hidden">
                                     <value>${Strophe.NS.PUBSUB}#nodeconfig</value>
                                     <value>${Strophe.NS.PUBSUB}#nodeconfig</value>
                                 </field>
                                 </field>
-                                ${Object.entries(new_config).map(([k, v]) => stx`<field var="${k}"><value>${v}</value></field>`)}
+                                ${Object.entries(new_config).map(([k, v]) => stx`<field var="pubsub#${k}"><value>${v}</value></field>`)}
                             </x>
                             </x>
                         </configure>
                         </configure>
                     </pubsub>
                     </pubsub>

+ 15 - 15
src/headless/plugins/pubsub/tests/config.js

@@ -353,20 +353,20 @@ describe('The pubsub API', function () {
                             <configure node="princely_musings">
                             <configure node="princely_musings">
                             <x xmlns="jabber:x:data" type="submit">
                             <x xmlns="jabber:x:data" type="submit">
                                 <field var="FORM_TYPE" type="hidden"><value>http://jabber.org/protocol/pubsub#nodeconfig</value></field>
                                 <field var="FORM_TYPE" type="hidden"><value>http://jabber.org/protocol/pubsub#nodeconfig</value></field>
-                                <field var="title"><value/></field>
-                                <field var="deliver_notifications"><value>true</value></field>
-                                <field var="deliver_payloads"><value>true</value></field>
-                                <field var="notify_config"><value>false</value></field>
-                                <field var="notify_delete"><value>false</value></field>
-                                <field var="notify_retract"><value>false</value></field>
-                                <field var="notify_sub"><value>false</value></field>
-                                <field var="persist_items"><value>true</value></field>
-                                <field var="max_items"><value>10</value></field>
-                                <field var="item_expire"><value>604800</value></field>
-                                <field var="subscribe"><value>true</value></field>
-                                <field var="publish_model"><value/></field>
-                                <field var="purge_offline"><value>false</value></field>
-                                <field var="access_model"><value>whitelist</value></field>
+                                <field var="pubsub#title"><value/></field>
+                                <field var="pubsub#deliver_notifications"><value>true</value></field>
+                                <field var="pubsub#deliver_payloads"><value>true</value></field>
+                                <field var="pubsub#notify_config"><value>false</value></field>
+                                <field var="pubsub#notify_delete"><value>false</value></field>
+                                <field var="pubsub#notify_retract"><value>false</value></field>
+                                <field var="pubsub#notify_sub"><value>false</value></field>
+                                <field var="pubsub#persist_items"><value>true</value></field>
+                                <field var="pubsub#max_items"><value>10</value></field>
+                                <field var="pubsub#item_expire"><value>604800</value></field>
+                                <field var="pubsub#subscribe"><value>true</value></field>
+                                <field var="pubsub#publish_model"><value/></field>
+                                <field var="pubsub#purge_offline"><value>false</value></field>
+                                <field var="pubsub#access_model"><value>whitelist</value></field>
                             </x>
                             </x>
                             </configure>
                             </configure>
                         </pubsub>
                         </pubsub>
@@ -568,7 +568,7 @@ describe('The pubsub API', function () {
                             <configure node="princely_musings">
                             <configure node="princely_musings">
                             <x xmlns="jabber:x:data" type="submit">
                             <x xmlns="jabber:x:data" type="submit">
                                 <field var="FORM_TYPE" type="hidden"><value>http://jabber.org/protocol/pubsub#nodeconfig</value></field>
                                 <field var="FORM_TYPE" type="hidden"><value>http://jabber.org/protocol/pubsub#nodeconfig</value></field>
-                                <field var="access_model"><value>whitelist</value></field>
+                                <field var="pubsub#access_model"><value>whitelist</value></field>
                             </x>
                             </x>
                             </configure>
                             </configure>
                         </pubsub>
                         </pubsub>