mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-02 04:37:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: replace static with const for global constants (#340)

Browse source
This commit is contained in:
Integral 2024-12-03 00:28:31 +08:00 • committed by GitHub
parent 9f6b08cbb2
commit e4fc22cf90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/update_oauth_resources.sh
View file

@ -24,7 +24,7 @@ echo "// Please do not edit manually" >> "$filename"
echo "// Filled in with real app versions" >> "$filename" echo "// Filled in with real app versions" >> "$filename"
# Open the array in the source file # Open the array in the source file
echo "pub static _IOS_APP_VERSION_LIST: &[&str; $ios_app_count] = &[" >> "$filename" echo "pub const _IOS_APP_VERSION_LIST: &[&str; $ios_app_count] = &[" >> "$filename"
num=0 num=0
@ -63,7 +63,7 @@ android_count=$(echo "$versions" | wc -l)
echo -e "Fetching \e[32m$android_count Android app versions...\e[0m" echo -e "Fetching \e[32m$android_count Android app versions...\e[0m"
# Append to the source file # Append to the source file
echo "pub static ANDROID_APP_VERSION_LIST: &[&str; $android_count] = &[" >> "$filename" echo "pub const ANDROID_APP_VERSION_LIST: &[&str; $android_count] = &[" >> "$filename"
num=0 num=0
@ -89,7 +89,7 @@ ios_count=$(echo "$table" | wc -l)
echo -e "Fetching \e[34m$ios_count iOS versions...\e[0m" echo -e "Fetching \e[34m$ios_count iOS versions...\e[0m"
# Append to the source file # Append to the source file
echo "pub static _IOS_OS_VERSION_LIST: &[&str; $ios_count] = &[" >> "$filename" echo "pub const _IOS_OS_VERSION_LIST: &[&str; $ios_count] = &[" >> "$filename"
num=0 num=0

6
src/client.rs
View file

@ -45,7 +45,7 @@ pub static OAUTH_RATELIMIT_REMAINING: AtomicU16 = AtomicU16::new(99);
pub static OAUTH_IS_ROLLING_OVER: AtomicBool = AtomicBool::new(false); pub static OAUTH_IS_ROLLING_OVER: AtomicBool = AtomicBool::new(false);
static URL_PAIRS: [(&str, &str); 2] = [ const URL_PAIRS: [(&str, &str); 2] = [
(ALTERNATIVE_REDDIT_URL_BASE, ALTERNATIVE_REDDIT_URL_BASE_HOST), (ALTERNATIVE_REDDIT_URL_BASE, ALTERNATIVE_REDDIT_URL_BASE_HOST),
(REDDIT_SHORT_URL_BASE, REDDIT_SHORT_URL_BASE_HOST), (REDDIT_SHORT_URL_BASE, REDDIT_SHORT_URL_BASE_HOST),
]; ];
@ -262,7 +262,7 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
return Ok(response); return Ok(response);
}; };
let location_header = response.headers().get(header::LOCATION); let location_header = response.headers().get(header::LOCATION);
if location_header == Some(&HeaderValue::from_static("https://www.reddit.com/")) { if location_header == Some(&HeaderValue::from_static(ALTERNATIVE_REDDIT_URL_BASE)) {
return Err("Reddit response was invalid".to_string()); return Err("Reddit response was invalid".to_string());
} }
return request( return request(
@ -528,7 +528,7 @@ fn test_default_subscriptions() {
} }
#[cfg(test)] #[cfg(test)]
static POPULAR_URL: &str = "/r/popular/hot.json?&raw_json=1&geo_filter=GLOBAL"; const POPULAR_URL: &str = "/r/popular/hot.json?&raw_json=1&geo_filter=GLOBAL";
#[tokio::test(flavor = "multi_thread")] #[tokio::test(flavor = "multi_thread")]
async fn test_localization_popular() { async fn test_localization_popular() {

4
src/oauth.rs
View file

@ -11,9 +11,9 @@ use serde_json::json;
use tegen::tegen::TextGenerator; use tegen::tegen::TextGenerator;
use tokio::time::{error::Elapsed, timeout}; use tokio::time::{error::Elapsed, timeout};
static REDDIT_ANDROID_OAUTH_CLIENT_ID: &str = "ohXpoqrZYub1kg"; const REDDIT_ANDROID_OAUTH_CLIENT_ID: &str = "ohXpoqrZYub1kg";
static AUTH_ENDPOINT: &str = "https://www.reddit.com"; const AUTH_ENDPOINT: &str = "https://www.reddit.com";
// Spoofed client for Android devices // Spoofed client for Android devices
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]

6
src/oauth_resources.rs
View file

@ -2,8 +2,8 @@
// Rerun scripts/update_oauth_resources.sh to update this file // Rerun scripts/update_oauth_resources.sh to update this file
// Please do not edit manually // Please do not edit manually
// Filled in with real app versions // Filled in with real app versions
pub static _IOS_APP_VERSION_LIST: &[&str; 1] = &[""]; pub const _IOS_APP_VERSION_LIST: &[&str; 1] = &[""];
pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[ pub const ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
"Version 2024.22.1/Build 1652272", "Version 2024.22.1/Build 1652272",
"Version 2024.23.1/Build 1665606", "Version 2024.23.1/Build 1665606",
"Version 2024.24.1/Build 1682520", "Version 2024.24.1/Build 1682520",
@ -155,4 +155,4 @@ pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
"Version 2022.41.0/Build 630468", "Version 2022.41.0/Build 630468",
"Version 2022.41.1/Build 634168", "Version 2022.41.1/Build 634168",
]; ];
pub static _IOS_OS_VERSION_LIST: &[&str; 1] = &[""]; pub const _IOS_OS_VERSION_LIST: &[&str; 1] = &[""];