2 files changed, 62 insertions, 3 deletions

diff --git a/src/api/mod.rs b/src/api/mod.rs
index 27f0da1..c4aa1f7 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -113,7 +113,9 @@ impl Api {
 
     /// Combines the given endpoint with the `base_url` of this API.
     fn make_url(&self, endpoint: &str) -> Url {
-        self.base_url.join(endpoint).expect("Invalid API endpoint")
+        let mut result = self.base_url.join(endpoint).expect("Invalid API endpoint");
+        result.set_query(Some("v=2019-19-12T0:00"));
+        result
     }
 
     /// Get and deserialize a cached value.
@@ -123,7 +125,7 @@ impl Api {
         P: AsRef<Path>,
     {
         match self.cache.get(name.as_ref())? {
-            Some(data) => Ok(serde_json::from_slice(&data)?),
+            Some(data) => serde_json::from_slice(&data).or(Ok(None)),
             None => Ok(None),
         }
     }
@@ -208,6 +210,14 @@ impl Api {
         self.get_multiple_cached("professions", "professions/", ids)
     }
 
+    /// Retrieve all available professions.
+    ///
+    /// This is a shortcut around `get_profession_ids` and `get_professions`.
+    pub fn get_all_professions(&mut self) -> Result<Vec<Profession>, ApiError> {
+        let ids = self.get_profession_ids()?;
+        self.get_professions(&ids)
+    }
+
     /// Retrieve detailed information about the given skills.
     ///
     /// Skills that are found in the cache are taken from there.
diff --git a/src/api/professions.rs b/src/api/professions.rs
index 2716a1a..f3d1f94 100644
--- a/src/api/professions.rs
+++ b/src/api/professions.rs
@@ -4,7 +4,7 @@
 //! * [Wiki](https://wiki.guildwars2.com/wiki/API:2/professions)
 
 use super::HasId;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct Profession {
@@ -12,10 +12,32 @@ pub struct Profession {
     pub id: String,
     /// The name of the profession.
     pub name: String,
+    /// The numeric code of the profession, e.g. for chat links.
+    pub code: u32,
     /// List of specialization ids.
     pub specializations: Vec<u32>,
     /// List of skills.
     pub skills: Vec<Skill>,
+    /// Conversion of palette ID to skill ID.
+    pub skills_by_palette: Vec<PaletteEntry>,
+}
+
+impl Profession {
+    /// Resolves a given palette ID to the corresponding skill ID.
+    pub fn palette_id_to_skill_id(&self, palette_id: u32) -> Option<u32> {
+        self.skills_by_palette
+            .iter()
+            .find(|entry| entry.palette_id == palette_id)
+            .map(|entry| entry.skill_id)
+    }
+
+    /// Resolves a given skill ID to the corresponding palette ID.
+    pub fn skill_id_to_palette_id(&self, skill_id: u32) -> Option<u32> {
+        self.skills_by_palette
+            .iter()
+            .find(|entry| entry.skill_id == skill_id)
+            .map(|entry| entry.palette_id)
+    }
 }
 
 impl HasId for Profession {
@@ -34,3 +56,30 @@ pub struct Skill {
     #[serde(rename = "type")]
     pub typ: String,
 }
+
+#[derive(Debug, Clone)]
+pub struct PaletteEntry {
+    /// The palette ID, as used in the chat link.
+    ///
+    /// Note that the actual palette only allows 2 bytes for this number, i.e. an `u16`. To stay
+    /// consistent with other integers that are handled here however, this struct uses a `u32`.
+    pub palette_id: u32,
+    /// The skill ID, as used in the API.
+    pub skill_id: u32,
+}
+
+impl Serialize for PaletteEntry {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        (self.palette_id, self.skill_id).serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for PaletteEntry {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let (palette_id, skill_id) = Deserialize::deserialize(deserializer)?;
+        Ok(PaletteEntry {
+            palette_id,
+            skill_id,
+        })
+    }
+}