From 2f1682162174f5fee4f4297f616e8f66b7c70dca Mon Sep 17 00:00:00 2001
From: David Blajda <blajda@hotmail.com>
Date: Mon, 24 Dec 2018 23:08:26 +0000
Subject: Fix lifetimes on ratelimit trait

---
 src/helix/models.rs | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

(limited to 'src/helix/models.rs')

diff --git a/src/helix/models.rs b/src/helix/models.rs
index 86b7560..bdb8438 100644
--- a/src/helix/models.rs
+++ b/src/helix/models.rs
@@ -5,14 +5,29 @@ use url::Url;
 use chrono::{DateTime, Utc};
 use super::types::{UserId, VideoId, ChannelId};
 
+pub trait PaginationTrait {
+    fn cursor<'a>(&'a self) -> &'a Option<Cursor>;
+    fn set_request(&mut self);
+}
+
 #[derive(Debug, Deserialize)]
 pub struct DataContainer<T> {
     pub data: Vec<T>
 }
 
-#[derive(Debug, Deserialize)]
-pub struct Cursor {
-    cursor: String
+impl<T> PaginationTrait for DataContainer<T> {
+    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &None }
+    fn set_request(&mut self) {}
+}
+
+impl<T> PaginationTrait for PaginationContainer<T> {
+    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &self.pagination }
+    fn set_request(&mut self) {}
+}
+
+impl PaginationTrait for Credentials {
+    fn cursor<'a>(&'a self) -> &'a Option<Cursor> { &None }
+    fn set_request(&mut self) {}
 }
 
 #[derive(Debug, Deserialize)]
@@ -21,6 +36,21 @@ pub struct PaginationContainer<T> {
     pub pagination: Option<Cursor>
 }
 
+#[derive(Debug, Deserialize)]
+pub struct Cursor {
+    cursor: 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,
@@ -80,13 +110,3 @@ 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,
-}
-- 
cgit v1.2.3