This repository was archived by the owner on Jul 7, 2024. It is now read-only.

Commit 496c332

committed

throw PremiumError when locked questions are queried for details

1 parent ff7baf0 commit 496c332Copy full SHA for 496c332

File tree

+20

-3

lines changed

+20

-3

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,16 @@ impl Cache {`
`177`	`177`	`.json()`
`178`	`178`	`.await?;`
`179`	`179`	`debug!("{:#?}", &json);`
`180`		`- parser::desc(&mut rdesc, json).ok_or(Error::NoneError)?;`
	`180`	`+ match parser::desc(&mut rdesc, json) {`
	`181`	`+ None => return Err(Error::NoneError),`
	`182`	`+ Some(false) => return`
	`183`	`+ if self.is_session_bad().await {`
	`184`	`+ Err(Error::CookieError)`
	`185`	`+ } else {`
	`186`	`+ Err(Error::PremiumError)`
	`187`	`+ },`
	`188`	`+ Some(true) => ()`
	`189`	`+ }`
`181`	`190`
`182`	`191`	`// update the question`
`183`	`192`	`let sdesc = serde_json::to_string(&rdesc)?;`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,22 @@ pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Option<()> {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// desc parser`
`32`		`-pub fn desc(q: &mut Question, v: Value) -> Option<()> {`
	`32`	`+pub fn desc(q: &mut Question, v: Value) -> Option<bool> {`
	`33`	`+ /* None - parsing failed`
	`34`	`+ * Some(false) - content was null (premium?)`
	`35`	`+ * Some(true) - content was parsed`
	`36`	`+ */`
`33`	`37`	`let o = &v`
`34`	`38`	`.as_object()?`
`35`	`39`	`.get("data")?`
`36`	`40`	`.as_object()?`
`37`	`41`	`.get("question")?`
`38`	`42`	`.as_object()?;`
`39`	`43`
	`44`	`+ if *o.get("content")? == Value::Null {`
	`45`	`+ return Some(false);`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`*q = Question {`
`41`	`49`	`content: o.get("content")?.as_str().unwrap_or("").to_string(),`
`42`	`50`	`stats: serde_json::from_str(o.get("stats")?.as_str()?).ok()?,`
`@@ -55,7 +63,7 @@ pub fn desc(q: &mut Question, v: Value) -> Option<()> {`
`55`	`63`	`.to_string(),`
`56`	`64`	`};`
`57`	`65`
`58`		`- Some(())`
	`66`	`+ Some(true)`
`59`	`67`	`}`
`60`	`68`
`61`	`69`	`/// tag parser`

Comments

(0)