fix(gists): language does not always exist

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "guess-that-lang"
-version = "1.0.19"
+version = "1.0.20"
 rust-version = "1.63"
 authors = ["Lioness100 <[email protected]>"]
 edition = "2021"

src/providers/gists.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, result};
+use std::{collections::BTreeMap, result};
 
 use rand::{seq::SliceRandom, thread_rng, Rng};
 use serde::Deserialize;
@@ -12,12 +12,12 @@ use crate::{
 
 #[derive(Deserialize)]
 pub struct Gist {
-    pub files: HashMap<String, GistFile>,
+    pub files: BTreeMap<String, GistFile>,
 }
 
 #[derive(Deserialize)]
 pub struct GistFile {
-    pub language: String,
+    pub language: Option<String>,
     pub raw_url: String,
 }
 
@@ -35,12 +35,16 @@ impl TryFrom<Gist> for GistData {
         let file = gist
             .files
             .into_values()
-            .find(|file| LANGUAGES.contains(&file.language.as_str()))
+            .find(|file| {
+                file.language
+                    .as_ref()
+                    .map_or(false, |language| LANGUAGES.contains(&language.as_str()))
+            })
             .ok_or(())?;
 
         Ok(Self {
             url: file.raw_url.to_string(),
-            language: file.language,
+            language: file.language.unwrap(),
         })
     }
 }

src/providers/repos.rs

@@ -42,7 +42,7 @@ impl RepositoryProvider<'_> {
     /// Get a vec of random valid gists on Github. This is used with the assumption
     /// that at least one valid gist will be found.
     pub fn get_repos(&self, language: &str) -> Result<Vec<String>> {
-        let mut gists: Vec<_> = self
+        let mut repos: Vec<_> = self
             .agent
             .get(&format!("{GITHUB_BASE_URL}/search/repositories"))
             .query("page", &thread_rng().gen_range(0..35).to_string())
@@ -55,9 +55,9 @@ impl RepositoryProvider<'_> {
             .map(|repo| repo.full_name)
             .collect();
 
-        gists.shuffle(&mut thread_rng());
+        repos.shuffle(&mut thread_rng());
 
-        Ok(gists)
+        Ok(repos)
     }
 
     pub fn get_file(&self, language: &str, name: &str) -> Result<RepositoryFile> {