1 files changed, 24 insertions, 18 deletions
diff --git a/src/helix/models.rs b/src/helix/models.rs
index 4124fd2..47a1288 100644
--- a/src/helix/models.rs
+++ b/src/helix/models.rs
@@ -3,11 +3,9 @@ extern crate chrono;
 
 use url::Url;
 use chrono::{DateTime, Utc};
-use super::types::{UserId, VideoId, ChannelId};
+use crate::types::{UserId, VideoId, ChannelId};
 
-pub trait PaginationTrait {
-    fn cursor<'a>(&'a self) -> &'a Option<Cursor>;
-}
+use crate::client::PaginationTrait;
 
 #[derive(Debug, Deserialize)]
 pub struct DataContainer<T> {
@@ -15,15 +13,25 @@ pub struct DataContainer<T> {
 }
 
 impl<T> PaginationTrait for DataContainer<T> {
-    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &None }
+    fn cursor<'a>(&'a self) -> Option<&'a str> { None }
 }
 
 impl<T> PaginationTrait for PaginationContainer<T> {
-    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &self.pagination }
+    fn cursor<'a>(&'a self) -> Option<&'a str> { 
+        match self.pagination.as_ref() {
+            Some(cursor) => {
+                match cursor.cursor.as_ref() {
+                    Some(cursor) => Some(cursor),
+                    None => None,
+                }
+            },
+            None => None
+        }
+    }
 }
 
 impl PaginationTrait for Credentials {
-    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &None }
+    fn cursor<'a>(&'a self) -> Option<&'a str> { None }
 }
 
 #[derive(Debug, Deserialize)]
@@ -37,17 +45,6 @@ pub struct Cursor {
     pub cursor: Option<String>
 }
 
-
-#[derive(Debug, Deserialize)]
-pub struct Credentials {
-    pub access_token: String,
-    pub refresh_token: Option<String>,
-    pub expires_in: u32,
-    pub scope: Option<Vec<String>>,
-    pub token_type: String,
-}
-
-
 #[derive(Debug, Deserialize)]
 pub struct Video {
     pub id: VideoId,
@@ -107,3 +104,12 @@ pub struct Clip {
     pub thumbnail_url: Url,
     pub view_count: i32,
 }
+
+#[derive(Debug, Deserialize)]
+pub struct Credentials {
+    pub access_token: String,
+    pub refresh_token: Option<String>,
+    pub expires_in: u32,
+    pub scope: Option<Vec<String>>,
+    pub token_type: String,
+}