Make avatar support optional.

src/lib.rs

@@ -64,6 +64,7 @@ impl ToString for ClientType {
 
 #[derive(PartialEq)]
 pub enum ClientFeature {
+    #[cfg(feature = "avatars")]
     Avatars,
     ContactList,
     JoinRooms,
@@ -76,6 +77,7 @@ pub enum Event {
     ContactAdded(RosterItem),
     ContactRemoved(RosterItem),
     ContactChanged(RosterItem),
+    #[cfg(feature = "avatars")]
     AvatarRetrieved(Jid, String),
     JoinRoom(BareJid, Conference),
     LeaveRoom(BareJid),
@@ -132,9 +134,12 @@ impl ClientBuilder<'_> {
         let mut features = vec![
             Feature::new(ns::DISCO_INFO),
         ];
+        #[cfg(feature = "avatars")]
+        {
             if self.features.contains(&ClientFeature::Avatars) {
                 features.push(Feature::new(format!("{}+notify", ns::AVATAR_METADATA)));
             }
+        }
         if self.features.contains(&ClientFeature::JoinRooms) {
             features.push(Feature::new(format!("{}+notify", ns::BOOKMARKS2)));
         }

src/pubsub/mod.rs

@@ -21,6 +21,7 @@ use xmpp_parsers::{
     pubsub::pubsub::PubSub,
 };
 
+#[cfg(feature = "avatars")]
 pub(crate) mod avatar;
 
 pub(crate) fn handle_event(from: &Jid, elem: Element, mut tx: &mut mpsc::UnboundedSender<Packet>) -> impl IntoIterator<Item = Event> {
@@ -28,6 +29,7 @@ pub(crate) fn handle_event(from: &Jid, elem: Element, mut tx: &mut mpsc::Unbound
     match PubSubEvent::try_from(elem) {
         Ok(PubSubEvent::PublishedItems { node, items }) => {
             match node.0 {
+                #[cfg(feature = "avatars")]
                 node if node == ns::AVATAR_METADATA => {
                     let new_events = avatar::handle_metadata_pubsub_event(&from, &mut tx, items);
                     events.extend(new_events);
@@ -82,10 +84,13 @@ pub(crate) fn handle_iq_result(from: &Jid, elem: Element) -> impl IntoIterator<I
     let mut events = Vec::new();
     let pubsub = PubSub::try_from(elem).unwrap();
     if let PubSub::Items(items) = pubsub {
-        if items.node.0 == ns::AVATAR_DATA {
+        match items.node.0.clone() {
+            #[cfg(feature = "avatars")]
+            node if node == ns::AVATAR_DATA => {
                 let new_events = avatar::handle_data_pubsub_iq(&from, &items);
                 events.extend(new_events);
-        } else if items.node.0 == ns::BOOKMARKS2 {
+            },
+            node if node == ns::BOOKMARKS2 => {
                 events.push(Event::LeaveAllRooms);
                 for item in items.items {
                     let item = item.0;
@@ -100,6 +105,8 @@ pub(crate) fn handle_iq_result(from: &Jid, elem: Element) -> impl IntoIterator<I
                         Err(err) => panic!("Wrong payload type in bookmarks 2 item: {}", err),
                     }
                 }
+            },
+            _ => unimplemented!()
         }
     }
     events