deploy: c9811ba

Author: arqunis

current/serenity/model/channel/enum.MessageActivityKind.html

@@ -62,7 +62,7 @@
 <a href=#62 id=62 data-nosnippet>62</a></span><span class="kw">pub mod </span>prelude {
 <a href=#63 id=63 data-nosnippet>63</a>    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>std::collections::HashMap;
 <a href=#64 id=64 data-nosnippet>64</a>
-<a href=#65 id=65 data-nosnippet>65</a>    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>serde::de::{Error <span class="kw">as </span>DeError, Visitor};
+<a href=#65 id=65 data-nosnippet>65</a>    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>serde::de::Visitor;
 <a href=#66 id=66 data-nosnippet>66</a>    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>serde::{Deserialize, Deserializer};
 <a href=#67 id=67 data-nosnippet>67</a>
 <a href=#68 id=68 data-nosnippet>68</a>    <span class="kw">pub use </span><span class="kw">super</span>::guild::automod::EventType <span class="kw">as </span>AutomodEventType;

current/serenity/model/channel/enum.MessageReferenceKind.html

@@ -449,4 +449,63 @@
 <a href=#449 id=449 data-nosnippet>449</a>                .map_err(|<span class="kw">_</span>| DeError::custom(<span class="string">"Invalid colour data"</span>))
 <a href=#450 id=450 data-nosnippet>450</a>        })
 <a href=#451 id=451 data-nosnippet>451</a>        .collect()
-<a href=#452 id=452 data-nosnippet>452</a>}</code></pre></div></section></main></body></html>
+<a href=#452 id=452 data-nosnippet>452</a>}
+<a href=#453 id=453 data-nosnippet>453</a>
+<a href=#454 id=454 data-nosnippet>454</a><span class="comment">// A function used for deserializing components within a MessageUpdateEvent.
+<a href=#455 id=455 data-nosnippet>455</a>// Due to discord now sending the whole message payload, we don't need to distinguish between None
+<a href=#456 id=456 data-nosnippet>456</a>// and empty, as such we always return Some.
+<a href=#457 id=457 data-nosnippet>457</a></span><span class="kw">pub fn </span>optional_deserialize_components&lt;<span class="lifetime">'de</span>, D&gt;(
+<a href=#458 id=458 data-nosnippet>458</a>    deserializer: D,
+<a href=#459 id=459 data-nosnippet>459</a>) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="prelude-ty">Option</span>&lt;Vec&lt;ActionRow&gt;&gt;, D::Error&gt;
+<a href=#460 id=460 data-nosnippet>460</a><span class="kw">where
+<a href=#461 id=461 data-nosnippet>461</a>    </span>D: Deserializer&lt;<span class="lifetime">'de</span>&gt;,
+<a href=#462 id=462 data-nosnippet>462</a>{
+<a href=#463 id=463 data-nosnippet>463</a>    deserialize_components(deserializer).map(<span class="prelude-val">Some</span>)
+<a href=#464 id=464 data-nosnippet>464</a>}
+<a href=#465 id=465 data-nosnippet>465</a>
+<a href=#466 id=466 data-nosnippet>466</a><span class="comment">// Custom deserialize function to deserialize components safely without knocking the whole message
+<a href=#467 id=467 data-nosnippet>467</a>// out when new components are found but not supported.
+<a href=#468 id=468 data-nosnippet>468</a></span><span class="kw">pub fn </span>deserialize_components&lt;<span class="lifetime">'de</span>, D&gt;(deserializer: D) -&gt; <span class="prelude-ty">Result</span>&lt;Vec&lt;ActionRow&gt;, D::Error&gt;
+<a href=#469 id=469 data-nosnippet>469</a><span class="kw">where
+<a href=#470 id=470 data-nosnippet>470</a>    </span>D: Deserializer&lt;<span class="lifetime">'de</span>&gt;,
+<a href=#471 id=471 data-nosnippet>471</a>{
+<a href=#472 id=472 data-nosnippet>472</a>    <span class="kw">struct </span>ComponentsVisitor;
+<a href=#473 id=473 data-nosnippet>473</a>
+<a href=#474 id=474 data-nosnippet>474</a>    <span class="kw">impl</span>&lt;<span class="lifetime">'de</span>&gt; Visitor&lt;<span class="lifetime">'de</span>&gt; <span class="kw">for </span>ComponentsVisitor {
+<a href=#475 id=475 data-nosnippet>475</a>        <span class="kw">type </span>Value = Vec&lt;ActionRow&gt;;
+<a href=#476 id=476 data-nosnippet>476</a>
+<a href=#477 id=477 data-nosnippet>477</a>        <span class="kw">fn </span>expecting(<span class="kw-2">&amp;</span><span class="self">self</span>, formatter: <span class="kw-2">&amp;mut </span>std::fmt::Formatter&lt;<span class="lifetime">'_</span>&gt;) -&gt; std::fmt::Result {
+<a href=#478 id=478 data-nosnippet>478</a>            formatter.write_str(<span class="string">"a sequence of ActionRow elements"</span>)
+<a href=#479 id=479 data-nosnippet>479</a>        }
+<a href=#480 id=480 data-nosnippet>480</a>
+<a href=#481 id=481 data-nosnippet>481</a>        <span class="kw">fn </span>visit_seq&lt;A&gt;(<span class="self">self</span>, <span class="kw-2">mut </span>seq: A) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>::Value, A::Error&gt;
+<a href=#482 id=482 data-nosnippet>482</a>        <span class="kw">where
+<a href=#483 id=483 data-nosnippet>483</a>            </span>A: serde::de::SeqAccess&lt;<span class="lifetime">'de</span>&gt;,
+<a href=#484 id=484 data-nosnippet>484</a>        {
+<a href=#485 id=485 data-nosnippet>485</a>            <span class="kw">let </span><span class="kw-2">mut </span>components = Vec::with_capacity(seq.size_hint().unwrap_or_default());
+<a href=#486 id=486 data-nosnippet>486</a>
+<a href=#487 id=487 data-nosnippet>487</a>            <span class="kw">while let </span><span class="prelude-val">Some</span>(map) = seq.next_element::&lt;JsonMap&gt;()<span class="question-mark">? </span>{
+<a href=#488 id=488 data-nosnippet>488</a>                <span class="comment">// We deserialize only the `kind` field to determine the component type.
+<a href=#489 id=489 data-nosnippet>489</a>                // We later use this to check if its a supported component before deserializing the
+<a href=#490 id=490 data-nosnippet>490</a>                // entire payload.
+<a href=#491 id=491 data-nosnippet>491</a>                </span><span class="kw">let </span>raw_kind =
+<a href=#492 id=492 data-nosnippet>492</a>                    map.get(<span class="string">"type"</span>).ok_or_else(|| DeError::missing_field(<span class="string">"type"</span>))<span class="question-mark">?</span>.clone();
+<a href=#493 id=493 data-nosnippet>493</a>                <span class="kw">let </span>kind: i64 = deserialize_val(raw_kind)<span class="question-mark">?</span>;
+<a href=#494 id=494 data-nosnippet>494</a>
+<a href=#495 id=495 data-nosnippet>495</a>                <span class="comment">// Action rows are the only top level component supported in serenity at this time.
+<a href=#496 id=496 data-nosnippet>496</a>                </span><span class="kw">if </span>kind == <span class="number">1 </span>{
+<a href=#497 id=497 data-nosnippet>497</a>                    <span class="kw">let </span>value = Value::from(map);
+<a href=#498 id=498 data-nosnippet>498</a>                    components.push(ActionRow::deserialize(value).map_err(DeError::custom)<span class="question-mark">?</span>);
+<a href=#499 id=499 data-nosnippet>499</a>                } <span class="kw">else </span>{
+<a href=#500 id=500 data-nosnippet>500</a>                    <span class="comment">// Top level component is not an action row and cannot be supported on
+<a href=#501 id=501 data-nosnippet>501</a>                    // serenity@current without breaking changes, so we skip them.
+<a href=#502 id=502 data-nosnippet>502</a>                    </span><span class="macro">tracing::debug!</span>(<span class="string">"Skipping component with unsupported kind: {kind}"</span>);
+<a href=#503 id=503 data-nosnippet>503</a>                }
+<a href=#504 id=504 data-nosnippet>504</a>            }
+<a href=#505 id=505 data-nosnippet>505</a>
+<a href=#506 id=506 data-nosnippet>506</a>            <span class="prelude-val">Ok</span>(components)
+<a href=#507 id=507 data-nosnippet>507</a>        }
+<a href=#508 id=508 data-nosnippet>508</a>    }
+<a href=#509 id=509 data-nosnippet>509</a>
+<a href=#510 id=510 data-nosnippet>510</a>    deserializer.deserialize_seq(ComponentsVisitor)
+<a href=#511 id=511 data-nosnippet>511</a>}</code></pre></div></section></main></body></html>