v0.35.4

actually fixes #10 #11
add "dprksoldier" mascot (closes #15 )
2025-01-07 07:28:00 +13:00 · 2025-01-06 16:34:17 +13:00 · 2025-01-06 16:03:50 +13:00 · 2025-01-06 15:41:22 +13:00 · 2025-01-06 15:13:22 +13:00 · 2025-01-06 14:38:17 +13:00
18 changed files with 211 additions and 51 deletions
--- a/.env.example
+++ b/.env.example
@ -16,6 +16,8 @@ REDLIB_PUSHSHIFT_FRONTEND=undelete.pullpush.io
 REDLIB_DEFAULT_THEME=system
 # Set the default mascot
 REDLIB_DEFAULT_MASCOT=none
+# Enable showing redsunlib colorway by default
+REDLIB_DEFAULT_REDSUNLIB_COLORWAY=off
 # Set the default front page (options: default, popular, all)
 REDLIB_DEFAULT_FRONT_PAGE=default
 # Set the default layout (options: card, clean, compact)
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,7 +3,7 @@ name = "redsunlib"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0-only"
 repository = "https://git.stardust.wtf/iridium/redsunlib"
-version = "0.35.3"
+version = "0.35.4"
 authors = [
    "Matthew Esposito <matt+cargo@matthew.science>",
    "spikecodes <19519553+spikecodes@users.noreply.github.com>",
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@

 <br>

-![screenshot](https://git.stardust.wtf/attachments/7667e4e2-a32c-4269-9b5f-1d29cb3baf20)
+![screenshot](https://git.stardust.wtf/attachments/ccf81f52-e653-4722-94b9-b370c58d6359)

 ### Disclaimer

--- a/src/config.rs
+++ b/src/config.rs
@ -96,6 +96,10 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_FILTERS")]
 	pub(crate) default_filters: Option<String>,

+	#[serde(rename = "REDLIB_DEFAULT_QUICKLIST")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_QUICKLIST")]
+	pub(crate) default_quicklist: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")]
 	pub(crate) default_disable_visit_reddit_confirmation: Option<String>,
@ -160,6 +164,7 @@ impl Config {
 			default_hide_score: parse("REDLIB_DEFAULT_HIDE_SCORE"),
 			default_subscriptions: parse("REDLIB_DEFAULT_SUBSCRIPTIONS"),
 			default_filters: parse("REDLIB_DEFAULT_FILTERS"),
+			default_quicklist: parse("REDLIB_DEFAULT_QUICKLIST"),
 			default_disable_visit_reddit_confirmation: parse("REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION"),
 			banner: parse("REDLIB_BANNER"),
 			robots_disable_indexing: parse("REDLIB_ROBOTS_DISABLE_INDEXING"),
@ -191,6 +196,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option<String> {
 		"REDLIB_DEFAULT_HIDE_SCORE" => config.default_hide_score.clone(),
 		"REDLIB_DEFAULT_SUBSCRIPTIONS" => config.default_subscriptions.clone(),
 		"REDLIB_DEFAULT_FILTERS" => config.default_filters.clone(),
+		"REDLIB_DEFAULT_QUICKLIST" => config.default_quicklist.clone(),
 		"REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION" => config.default_disable_visit_reddit_confirmation.clone(),
 		"REDLIB_BANNER" => config.banner.clone(),
 		"REDLIB_ROBOTS_DISABLE_INDEXING" => config.robots_disable_indexing.clone(),
@ -271,6 +277,12 @@ fn test_default_filters() {
 	assert_eq!(get_setting("REDLIB_DEFAULT_FILTERS"), Some("news+bestof".into()));
 }

+#[test]
+#[sealed_test(env = [("REDLIB_DEFAULT_QUICKLIST", "news+popular")])]
+fn test_default_quicklist() {
+	assert_eq!(get_setting("REDLIB_DEFAULT_QUICKLIST"), Some("news+popular".into()));
+}
+
 #[test]
 #[sealed_test]
 fn test_pushshift() {
--- a/src/instance_info.rs
+++ b/src/instance_info.rs
@ -152,6 +152,7 @@ impl InstanceInfo {
 				["Hide HLS notification", &convert(&self.config.default_hide_hls_notification)],
 				["Subscriptions", &convert(&self.config.default_subscriptions)],
 				["Filters", &convert(&self.config.default_filters)],
+				["Quick Access Feeds", &convert(&self.config.default_quicklist)],
 			])
 			.with_header_row(["Default preferences"]),
 		);
@ -189,7 +190,8 @@ impl InstanceInfo {
                    Default use FFmpeg: {:?}\n
                    Default hide HLS notification: {:?}\n
                    Default subscriptions: {:?}\n
-                    Default filters: {:?}\n",
+                    Default filters: {:?}\n
+					Default quicklist: {:?}\n",
 					self.package_name,
 					self.crate_version,
 					self.git_commit,
@ -218,6 +220,7 @@ impl InstanceInfo {
 					self.config.default_hide_hls_notification,
 					self.config.default_subscriptions,
 					self.config.default_filters,
+					self.config.default_quicklist,
 				)
 			}
 			StringType::Html => self.to_table(),
--- a/src/main.rs
+++ b/src/main.rs
@ -323,10 +323,12 @@ async fn main() {
 		.at("/r/u_:name")
 		.get(|r| async move { Ok(redirect(&format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());

-	app.at("/r/:sub/subscribe").post(|r| subreddit::subscriptions_filters(r).boxed());
-	app.at("/r/:sub/unsubscribe").post(|r| subreddit::subscriptions_filters(r).boxed());
-	app.at("/r/:sub/filter").post(|r| subreddit::subscriptions_filters(r).boxed());
-	app.at("/r/:sub/unfilter").post(|r| subreddit::subscriptions_filters(r).boxed());
+	app.at("/r/:sub/subscribe").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unsubscribe").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/filter").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unfilter").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/quicklist").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unquicklist").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());

 	app.at("/r/:sub/comments/:id").get(|r| post::item(r).boxed());
 	app.at("/r/:sub/comments/:id/:title").get(|r| post::item(r).boxed());
--- a/src/settings.rs
+++ b/src/settings.rs
@ -21,9 +21,10 @@ struct SettingsTemplate {

 // CONSTANTS

-const PREFS: [&str; 20] = [
+const PREFS: [&str; 21] = [
 	"theme",
 	"mascot",
+	"redsunlib_colorway",
 	"front_page",
 	"layout",
 	"wide",
@ -121,7 +122,7 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body

 	let mut response = redirect(&path);

-	for name in [PREFS.to_vec(), vec!["subscriptions", "filters"]].concat() {
+	for name in [PREFS.to_vec(), vec!["subscriptions", "filters", "quicklist"]].concat() {
 		match form.get(name) {
 			Some(value) => response.insert_cookie(
 				Cookie::build((name.to_owned(), value.clone()))
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@ -211,8 +211,8 @@ pub fn can_access_quarantine(req: &Request<Body>, sub: &str) -> bool {
 	setting(req, &format!("allow_quaran_{}", sub.to_lowercase())).parse().unwrap_or_default()
 }

-// Sub, filter, unfilter, or unsub by setting subscription cookie using response "Set-Cookie" header
-pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>, String> {
+// Sub, filter, unfilter, quicklist, unquicklist or unsub by setting subscription cookie using response "Set-Cookie" header
+pub async fn subscriptions_filters_quicklists(req: Request<Body>) -> Result<Response<Body>, String> {
 	let sub = req.param("sub").unwrap_or_default();
 	let action: Vec<String> = req.uri().path().split('/').map(String::from).collect();

@ -229,6 +229,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 	let preferences = Preferences::new(&req);
 	let mut sub_list = preferences.subscriptions;
 	let mut filters = preferences.filters;
+	let mut quicklist = preferences.quicklist;

 	// Retrieve list of posts for these subreddits to extract display names

@ -290,7 +291,16 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 		} else if action.contains(&"unfilter".to_string()) {
 			// Remove sub name from filtered list
 			filters.retain(|s| s.to_lowercase() != part.to_lowercase());
-		}
+		} else if action.contains(&"quicklist".to_string()) && !quicklist.contains(&part.to_owned()) {
+			// Add each sub name to the filtered list
+			quicklist.push(part.to_owned());
+			// Reorder quicklist alphabetically
+			quicklist.sort_by_key(|a| a.to_lowercase());
+		} else if action.contains(&"unquicklist".to_string()) {
+			// Remove sub name from filtered list
+			quicklist.retain(|s| s.to_lowercase() != part.to_lowercase());
+		} 
+		
 	}

 	// Redirect back to subreddit
@ -326,6 +336,17 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 				.into(),
 		);
 	}
+	if quicklist.is_empty() {
+		response.remove_cookie("quicklist".to_string());
+	} else {
+		response.insert_cookie(
+			Cookie::build(("quicklist", quicklist.join("+")))
+				.path("/")
+				.http_only(true)
+				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+				.into(),
+		);
+	}

 	Ok(response)
 }
--- a/src/utils.rs
+++ b/src/utils.rs
@ -607,6 +607,7 @@ pub struct Preferences {
 	pub available_mascots: Vec<String>,
 	pub theme: String,
 	pub mascot: String,
+	pub redsunlib_colorway: String,
 	pub front_page: String,
 	pub layout: String,
 	pub wide: String,
@ -624,6 +625,7 @@ pub struct Preferences {
 	pub comment_sort: String,
 	pub post_sort: String,
 	pub subscriptions: Vec<String>,
+	pub quicklist: Vec<String>,
 	pub filters: Vec<String>,
 	pub hide_awards: String,
 	pub hide_score: String,
@ -661,6 +663,7 @@ impl Preferences {
 			available_mascots: mascots,
 			theme: setting(req, "theme"),
 			mascot: setting(req, "mascot"),
+			redsunlib_colorway: setting(req, "redsunlib_colorway"),
 			front_page: setting(req, "front_page"),
 			layout: setting(req, "layout"),
 			wide: setting(req, "wide"),
@ -679,6 +682,7 @@ impl Preferences {
 			post_sort: setting(req, "post_sort"),
 			subscriptions: setting(req, "subscriptions").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
 			filters: setting(req, "filters").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
+			quicklist: setting(req, "quicklist").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
 			hide_awards: setting(req, "hide_awards"),
 			hide_score: setting(req, "hide_score"),
 		}
--- a/static/mascots/BoymoderHoodie.png
+++ b/static/mascots/BoymoderHoodie.png
--- a/static/mascots/dprksoldier.png
+++ b/static/mascots/dprksoldier.png
--- a/static/style.css
+++ b/static/style.css
@ -216,7 +216,9 @@ nav #links {
 }

 nav #links svg {
-    display: none;
+    /*display: none;*/
+    position: relative;
+    /*What's nine plus ten?*/ top: /*Twenty one*/21%; /*You stupid.*/
 }

 nav #redlib {
@ -429,7 +431,7 @@ a:hover {
 }

 svg {
-    stroke: var(--text);
+    color: var(--text);
 }

 img[src=""] {
@ -523,10 +525,14 @@ aside {
    margin-bottom: 20px;
 }

+#user_actions,
+#sub_actions {
+    display: grid;
+    grid-template-columns: auto 4fr 1fr;
+}
+
 #user_details,
-#sub_details,
-#sub_actions,
-#user_actions {
+#sub_details {
    display: grid;
    grid-template-columns: repeat(2, 1fr);
 }
@ -545,6 +551,8 @@ aside {
 #user_subscription,
 #sub_filter,
 #user_filter,
+#sub_quicklist,
+#user_quicklist,
 #sub_rss,
 #user_rss {
    margin-top: 20px;
@ -554,9 +562,16 @@ aside {
    margin-bottom: 20px;
 }

+#sub_quicklist button,
+#user_quicklist button {
+    padding: 0px;
+}
+
 .subscribe,
 .unsubscribe,
 .filter,
+.unquick,
+.quick,
 .unfilter {
    padding: 10px 20px;
    border-radius: 5px;
@ -568,12 +583,22 @@ aside {
    color: var(--foreground);
    background-color: var(--accent);
 }
+.quick {
+    color: var(--foreground);
+    background-color: var(--accent);
+    height: 18px;
+}

 .unsubscribe,
 .unfilter {
    color: var(--text);
    background-color: var(--highlighted);
 }
+.unquick {
+    color: var(--text);
+    background-color: var(--highlighted);
+    height: 18px;
+}

 /* Feeds */

@ -1456,6 +1481,7 @@ a.search_subreddit:hover {

 .comment:not([id]) .comment_data > .comment_link {
    display: -webkit-box;
+    line-clamp: 1;
    -webkit-line-clamp: 1;
    -webkit-box-orient: vertical;
    word-break: break-all;
@ -2268,8 +2294,10 @@ th {
 	max-width: 20em;
 }
 .download {
-	padding-left: 8px;
-	padding-right: 8px;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 3px;
+    padding-bottom: 1px;
 	font-size: 20px;
  	font-weight: 900;
 	color: var(--accent);
@ -2283,4 +2311,11 @@ th {

 .download:active {
 	background-color: var(--background);
+}
+.rotate{
+    animation: spinner 1.5s linear infinite;
+    padding: 0px;
+}
+@keyframes spinner {
+    to { transform: rotate(360deg); }
 }
--- a/static/videoUtils.js
+++ b/static/videoUtils.js
@ -1,5 +1,9 @@
 // @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
 let ffmpeg = null;
+
+let loadingsvg = `<svg class="rotate" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M12 4.5a7.5 7.5 0 1 0 0 15a7.5 7.5 0 0 0 0-15M1.5 12C1.5 6.201 6.201 1.5 12 1.5S22.5 6.201 22.5 12S17.799 22.5 12 22.5S1.5 17.799 1.5 12" opacity="0.1"/><path fill="currentColor" d="M12 4.5a7.46 7.46 0 0 0-5.187 2.083a1.5 1.5 0 0 1-2.075-2.166A10.46 10.46 0 0 1 12 1.5a1.5 1.5 0 0 1 0 3"/></g></svg>`;
+let downloadsvg = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M20 15a1 1 0 0 1 1 1v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4a1 1 0 1 1 2 0v4h14v-4a1 1 0 0 1 1-1M12 2a1 1 0 0 1 1 1v10.243l2.536-2.536a1 1 0 1 1 1.414 1.414l-4.066 4.066a1.25 1.25 0 0 1-1.768 0L7.05 12.121a1 1 0 1 1 1.414-1.414L11 13.243V3a1 1 0 0 1 1-1"/></g></svg>`;
+
 (function () {
    if (Hls.isSupported()) {

@ -13,7 +17,7 @@ let ffmpeg = null;
            var autoplay = oldVideo.classList.contains("hls_autoplay");

            // If HLS is supported natively then don't use hls.js
-            if (oldVideo.canPlayType(source.type) === "probably") {
+            if (oldVideo.canPlayType(source.type) === "probably" && !downloadsEnabled) {
                if (autoplay) {
                    oldVideo.play();
                }
@ -82,7 +86,7 @@ let ffmpeg = null;
                    var mediaStream = [];
                    var downloadButton = document.createElement('button');
                    downloadButton.classList.add('video-options','download');
-                    downloadButton.innerText = "⏳"
+                    downloadButton.innerHTML = loadingsvg
                    const mergeStreams = async () => {
                        if (ffmpeg === null) {
                          ffmpeg = new FFmpeg();
@ -115,7 +119,7 @@ let ffmpeg = null;
    
                        var filename = toSlug(videoElement.parentNode.parentNode.id || document.title)
                        const data = await ffmpeg.readFile('output.mp4');
-                        saveAs(new Blob([data.buffer]),filename, {type: 'video/mp4'});
+                        saveAs(new Blob([data.buffer], {type: 'video/mp4'}),filename);
                        return
                    }
                    function saveAs(blob, filename) { // Yeah ok...
@ -157,11 +161,11 @@ let ffmpeg = null;
                        var isDownloading = false
                        function startDownload() {
                            if (!isDownloading) { isDownloading = true } else { return }
-                            downloadButton.innerText = "⏳"
+                            downloadButton.innerHTML = loadingsvg
                            mergeStreams()
                            .then(_ => {
                                isDownloading = false
-                                downloadButton.innerText = "⭳"
+                                downloadButton.innerHTML = downloadsvg
                            });
                        }
    
@ -178,7 +182,7 @@ let ffmpeg = null;
    
                        waitForLoad(_ => flag === true)
                        .then(_ => {
-                            downloadButton.innerText = "⭳"
+                            downloadButton.innerHTML = downloadsvg
                            downloadButton.addEventListener('click', startDownload);
                        });
                    }
--- a/templates/base.html
+++ b/templates/base.html
@ -40,27 +40,35 @@
 		<nav class="
 			{% if prefs.fixed_navbar == "on" %} fixed_navbar{% endif %}">
 			<div id="logo">
-				<a id="redlib" href="/"><span id="lib">red</span><span id="reddit">sun</span><span id="lib">lib.</span></a>
+				<a id="redlib" href="/">
+					<span id="lib" {% if prefs.redsunlib_colorway == "on" %}style="color: #ff8585;"{% endif %}">red</span><span id="reddit" {% if prefs.redsunlib_colorway == "on" %}style="color: #ffbfbf;"{% endif %}>sun</span><span id="lib" {% if prefs.redsunlib_colorway == "on" %}style="color: #ff8585;"{% endif %}>lib.</span>
+				</a>
 				{% block subscriptions %}{% endblock %}
 			</div>
 			{% block search %}{% endblock %}
 			<div id="links">
 				<a id="reddit_link" {% if prefs.disable_visit_reddit_confirmation != "on" %}href="#popup"{% else %}href="https://www.reddit.com{{ url }}" rel="nofollow"{% endif %}>
-					<span>reddit</span>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-						<path d="M22 2L12 22"/>
-						<path d="M2 6.70587C3.33333 8.07884 3.33333 11.5971 3.33333 11.5971M3.33333 19.647V11.5971M3.33333 11.5971C3.33333 11.5971 5.125 7.47817 8 7.47817C10.875 7.47817 12 8.85114 12 8.85114"/>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+						<title>redirect to reddit</title>
+						<g fill="none">
+							<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+							<path fill="currentColor" d="M6.301 6a4 4 0 0 1 3.312 1.756l.118.186l4.253 7.087a2 2 0 0 0 1.553.965L15.7 16h1.194l.02-.415l.022-.36l.012-.159c.027-.346.352-.557.631-.41l.306.164l.36.203l.198.117l.43.263l.229.147l.463.31l.21.147l.377.273l.315.24l.133.104c.236.188.225.566-.023.762l-.28.217l-.34.252l-.4.282l-.456.305l-.462.291l-.416.249l-.365.205l-.307.165c-.275.143-.572-.036-.598-.36l-.025-.347l-.024-.415l-.01-.23H15.7a4 4 0 0 1-3.312-1.756l-.118-.186l-4.253-7.087a2 2 0 0 0-1.553-.965L6.3 8H4a1 1 0 0 1-.117-1.993L4 6zm3.714 7.643a1 1 0 0 1 .342 1.371l-.626 1.044A4 4 0 0 1 6.301 18H4a1 1 0 1 1 0-2h2.301a2 2 0 0 0 1.715-.971l.627-1.043a1 1 0 0 1 1.371-.344Zm7.563-8.988l.306.165l.36.203l.198.117l.43.263l.229.147l.463.31l.21.147l.377.273l.315.24l.133.104c.236.188.225.566-.023.762l-.28.217l-.34.252q-.186.135-.4.282l-.456.305l-.462.291l-.416.249l-.365.206l-.307.164c-.275.143-.572-.036-.598-.36l-.025-.347l-.024-.415l-.01-.23H15.7a2 2 0 0 0-1.627.836l-.088.135l-.626 1.043a1 1 0 0 1-1.77-.925l.055-.104l.626-1.043a4 4 0 0 1 3.209-1.936l.22-.006h1.195l.02-.415l.022-.36l.012-.159c.027-.346.352-.557.631-.41Z" />
+						</g>
 					</svg>
+					<span>reddit</span>
 				</a>
 				{% if prefs.disable_visit_reddit_confirmation != "on" %}
 					{% call utils::visit_reddit_confirmation(url) %}
 				{% endif %}
 				<a id="settings_link" href="/settings">
-					<span>settings</span>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-						<title>settings</title>
-						<circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+						<g fill="none" fill-rule="evenodd">
+							<title>settings</title>
+							<path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
+							<path fill="currentColor" d="M14.035 2.809c.37-.266.89-.39 1.401-.203a10 10 0 0 1 2.982 1.725c.417.35.57.861.524 1.313c-.075.753.057 1.48.42 2.106c.32.557.802.997 1.39 1.307l.225.11c.414.187.782.576.875 1.113a10 10 0 0 1 0 3.44c-.083.484-.39.847-.753 1.051l-.122.063c-.69.31-1.254.79-1.616 1.416c-.362.627-.494 1.353-.419 2.106c.045.452-.107.964-.524 1.313a10 10 0 0 1-2.982 1.725a1.51 1.51 0 0 1-1.4-.203C13.42 20.75 12.723 20.5 12 20.5s-1.42.249-2.035.691a1.51 1.51 0 0 1-1.401.203a10 10 0 0 1-2.982-1.725a1.51 1.51 0 0 1-.524-1.313c.075-.753-.058-1.48-.42-2.106a3.4 3.4 0 0 0-1.39-1.307l-.225-.11a1.51 1.51 0 0 1-.875-1.113a10 10 0 0 1 0-3.44c.083-.484.39-.847.753-1.051l.122-.062c.69-.311 1.254-.79 1.616-1.417c.361-.626.494-1.353.419-2.106a1.51 1.51 0 0 1 .524-1.313a10 10 0 0 1 2.982-1.725a1.51 1.51 0 0 1 1.4.203c.615.442 1.312.691 2.036.691s1.42-.249 2.035-.691m.957 1.769c-.866.57-1.887.922-2.992.922s-2.126-.353-2.992-.922A8 8 0 0 0 7.068 5.7c.06 1.033-.145 2.093-.697 3.05c-.553.956-1.368 1.663-2.293 2.128a8 8 0 0 0 0 2.242c.925.465 1.74 1.172 2.293 2.13c.552.955.757 2.015.697 3.048a8 8 0 0 0 1.94 1.123c.866-.57 1.887-.922 2.992-.922s2.126.353 2.992.922a8 8 0 0 0 1.94-1.122c-.06-1.034.145-2.094.697-3.05c.552-.957 1.368-1.664 2.293-2.13a8 8 0 0 0 0-2.24c-.925-.466-1.74-1.173-2.293-2.13c-.552-.956-.757-2.016-.697-3.05a8 8 0 0 0-1.94-1.122ZM12 8a4 4 0 1 1 0 8a4 4 0 0 1 0-8m0 2a2 2 0 1 0 0 4a2 2 0 0 0 0-4" />
+						</g>
 					</svg>
+					<span>settings</span>
 				</a>
 			</div>
 		</nav>
--- a/templates/settings.html
+++ b/templates/settings.html
@ -29,6 +29,11 @@
 						{% call utils::options(prefs.mascot, prefs.available_mascots, "system") %}
 					</select>
 				</div>
+				<div class="prefs-group">
+					<label for="redsunlib_colorway">Force redsunlib colorway</label>
+					<input type="hidden" value="off" name="redsunlib_colorway">
+					<input type="checkbox" name="redsunlib_colorway" {% if prefs.redsunlib_colorway == "on" %}checked{% endif %}>
+				</div>
 			</fieldset>
 			<fieldset>
 				<legend>Interface</legend>
@ -153,7 +158,7 @@
 	</form>
 	<div id="settings_note">
 		<p><b>Note:</b> settings and subscriptions are saved in browser cookies. Clearing your cookies will reset them.</p><br>
-		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&mascot={{ prefs.mascot }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&post_sort={{ prefs.post_sort }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&use_hls={{ prefs.use_hls }}&ffmpeg_video_downloads={{ prefs.ffmpeg_video_downloads }}&hide_hls_notification={{ prefs.hide_hls_notification }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&hide_sidebar_and_summary={{ prefs.hide_sidebar_and_summary}}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}">this link</a>.</p>
+		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&mascot={{ prefs.mascot }}&redsunlib_colorway={{ prefs.redsunlib_colorway }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&post_sort={{ prefs.post_sort }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&use_hls={{ prefs.use_hls }}&ffmpeg_video_downloads={{ prefs.ffmpeg_video_downloads }}&hide_hls_notification={{ prefs.hide_hls_notification }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&hide_sidebar_and_summary={{ prefs.hide_sidebar_and_summary}}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}&quicklist={{ prefs.quicklist.join("%2B") }}">this link</a>.</p>
 	</div>
 	{% if prefs.subscriptions.len() > 0 %}
 		<div class="prefs" id="settings_subs">
--- a/templates/subreddit.html
+++ b/templates/subreddit.html
@ -104,6 +104,18 @@
 					<img loading="lazy" id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
 					<h1 id="sub_title">{{ sub.title }}</h1>
 					<p id="sub_name">r/{{ sub.name }}</p>
+					{% if crate::utils::enable_rss() %}
+					<a href="/r/{{ sub.name }}.rss" title="RSS feed for r/{{ sub.name }}">
+						<button>
+							<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+								<g fill="none" fill-rule="evenodd">
+									<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+									<path fill="currentColor" d="M18 3a3 3 0 0 1 2.995 2.824L21 6v12a3 3 0 0 1-2.824 2.995L18 21H6a3 3 0 0 1-2.995-2.824L3 18V6a3 3 0 0 1 2.824-2.995L6 3zM8.5 14a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3M8 10.5a1 1 0 1 0 0 2a3.5 3.5 0 0 1 3.5 3.5a1 1 0 1 0 2 0A5.5 5.5 0 0 0 8 10.5M8.5 7q-.285 0-.566.019a1 1 0 0 0 .132 1.995a6.5 6.5 0 0 1 6.92 6.92a1 1 0 1 0 1.995.132A8.5 8.5 0 0 0 8.5 7" />
+								</g>
+							</svg>
+						</button >
+					</a>
+					{% endif %}
 					<p id="sub_description">{{ sub.description }}</p>
 					<div id="sub_details">
 						<label>Members</label>
@ -134,13 +146,31 @@
 							</form>
 							{% endif %}
 						</div>
-						{% if crate::utils::enable_rss() %}
-						<div id="sub_rss">
-                            <a href="/r/{{ sub.name }}.rss" title="RSS feed for r/{{ sub.name }}">
-                                <button class="subscribe">RSS feed</button >
-                            </a>
+						<div id="sub_quicklist">
+							{% if prefs.quicklist.contains(sub.name) %}
+								<form action="/r/{{ sub.name }}/unquicklist?redirect={{ redirect_url }}" method="POST">
+									<button>
+										<svg class="unquick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+											<g fill="none">
+												<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+												<path fill="currentColor" d="M16 2a3 3 0 0 1 3 3v11h-3a3 3 0 0 0-2.997 2.87L12 18.202l-4.668 3.112C6.335 21.978 5 21.264 5 20.066V5a3 3 0 0 1 3-3zm6 16a1 1 0 0 1 .117 1.993L22 20h-6a1 1 0 0 1-.117-1.993L16 18z" />
+											</g>
+										</svg>
+									</button>
+								</form>
+							{% else %}
+							<form action="/r/{{ sub.name }}/quicklist?redirect={{ redirect_url }}" method="POST">
+								<button>
+									<svg class="quick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+										<g fill="none" fill-rule="evenodd">
+											<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+											<path fill="currentColor" d="M10 2a3 3 0 0 0-3 3a3 3 0 0 0-3 3v13.018c0 1.226 1.39 1.934 2.382 1.213l4.118-2.995l4.118 2.995c.991.721 2.382.013 2.382-1.213v-2.236l.618.45c.991.72 2.382.012 2.382-1.214V5a3 3 0 0 0-3-3zm7 14.309l1 .727V5a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1h5a3 3 0 0 1 3 3z" />
+										</g>
+									</svg>
+								</button>
+							</form>
+							{% endif %}
 						</div>
-						{% endif %}
 				</div>
 			</details>
 			<details class="panel" id="sidebar" open>
--- a/templates/user.html
+++ b/templates/user.html
@ -123,6 +123,18 @@ body %}
            />
            <h1 id="user_title">{{ user.title }}</h1>
            <p id="user_name">u/{{ user.name }}</p>
+            {% if crate::utils::enable_rss() %}
+            <a href="/r/{{ user.name }}.rss" title="RSS feed for r/{{ user.name }}">
+                <button>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                        <g fill="none" fill-rule="evenodd">
+                            <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                            <path fill="currentColor" d="M18 3a3 3 0 0 1 2.995 2.824L21 6v12a3 3 0 0 1-2.824 2.995L18 21H6a3 3 0 0 1-2.995-2.824L3 18V6a3 3 0 0 1 2.824-2.995L6 3zM8.5 14a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3M8 10.5a1 1 0 1 0 0 2a3.5 3.5 0 0 1 3.5 3.5a1 1 0 1 0 2 0A5.5 5.5 0 0 0 8 10.5M8.5 7q-.285 0-.566.019a1 1 0 0 0 .132 1.995a6.5 6.5 0 0 1 6.92 6.92a1 1 0 1 0 1.995.132A8.5 8.5 0 0 0 8.5 7" />
+                        </g>
+                    </svg>
+                </button >
+            </a>
+            {% endif %}
            <div id="user_description">{{ user.description }}</div>
            <div id="user_details">
                <label>Karma</label>
@ -166,16 +178,31 @@ body %}
                    </form>
                    {% endif %}
                </div>
-                {% if crate::utils::enable_rss() %}
-                <div id="user_rss">
-                    <a
-                        href="/u/{{ user.name }}.rss"
-                        title="RSS feed for u/{{ user.name }}"
-                    >
-                        <button class="subscribe">RSS feed</button>
-                    </a>
+                <div id="user_quicklist">
+                    {% if prefs.quicklist.contains(name) %}
+                        <form action="/r/{{ name }}/unquicklist?redirect={{ redirect_url }}" method="POST">
+                            <button>
+                                <svg class="unquick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                                    <g fill="none">
+                                        <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                                        <path fill="currentColor" d="M16 2a3 3 0 0 1 3 3v11h-3a3 3 0 0 0-2.997 2.87L12 18.202l-4.668 3.112C6.335 21.978 5 21.264 5 20.066V5a3 3 0 0 1 3-3zm6 16a1 1 0 0 1 .117 1.993L22 20h-6a1 1 0 0 1-.117-1.993L16 18z" />
+                                    </g>
+                                </svg>
+                            </button>
+                        </form>
+                    {% else %}
+                    <form action="/r/{{ name }}/quicklist?redirect={{ redirect_url }}" method="POST">
+                        <button>
+                            <svg class="quick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                                <g fill="none" fill-rule="evenodd">
+                                    <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                                    <path fill="currentColor" d="M10 2a3 3 0 0 0-3 3a3 3 0 0 0-3 3v13.018c0 1.226 1.39 1.934 2.382 1.213l4.118-2.995l4.118 2.995c.991.721 2.382.013 2.382-1.213v-2.236l.618.45c.991.72 2.382.012 2.382-1.214V5a3 3 0 0 0-3-3zm7 14.309l1 .727V5a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1h5a3 3 0 0 1 3 3z" />
+                                </g>
+                            </svg>
+                        </button>
+                    </form>
+                    {% endif %}
                </div>
-                {% endif %}
            </div>
        </div>
    </aside>
--- a/templates/utils.html
+++ b/templates/utils.html
@ -41,6 +41,12 @@
 	<details id="feeds">
 		<summary>Feeds</summary>
 		<div id="feed_list">
+			{% if prefs.quicklist.len() > 0 %}
+				<p>QUICK ACCESS FEEDS</p>
+				{% for sub in prefs.quicklist %}
+					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{% if sub.starts_with("u_") -%}{%let sub = format!("u/{}", &sub[2..]) -%}{{ sub }}{% else -%}{{ sub }}{% endif -%}</a>
+				{% endfor %}
+			{% endif %}
 			<p>MAIN FEEDS</p>
 			<a href="/">Home</a>
 			<a href="/r/popular">Popular</a>
@ -48,7 +54,7 @@
 			{% if prefs.subscriptions.len() > 0 %}
 				<p>REDDIT FEEDS</p>
 				{% for sub in prefs.subscriptions %}
-					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a>
+					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{% if sub.starts_with("u_") -%}{%let sub = format!("u/{}", &sub[2..]) -%}{{ sub }}{% else -%}{{ sub }}{% endif -%}</a>
 				{% endfor %}
 			{% endif %}
 		</div>
Author	SHA1	Message	Date
Ayaka	d7cff4203a	v0.35.4	2025-01-07 07:28:00 +13:00
ayaka	86cafe134e	actually fixes #10 #11	2025-01-06 16:34:17 +13:00
Ayaka	fedd76877c	add "dprksoldier" mascot (closes #15 )	2025-01-06 16:03:50 +13:00
Ayaka	fcfd4dd196	Update README.md fix screenshot without a broken grid	2025-01-06 15:41:22 +13:00
ayaka	0081205ace	fix details grid	2025-01-06 15:13:22 +13:00
ayaka	482b528f49	video download style change	2025-01-06 14:38:17 +13:00
Ayaka	b6d828727c	Update README.md	2025-01-06 13:09:39 +13:00
ayaka	fe9128a5e2	Merge branch 'quicklist'	2025-01-06 12:44:33 +13:00
ayaka	836cb15946	minimum viable product	2025-01-06 12:33:49 +13:00
ayaka	3a5abd6c9d	shutup warning	2025-01-06 12:01:48 +13:00
Ayaka	fd0b0968dd	Merge pull request 'style-gimmicks' (#13 ) from style-gimmicks into main Reviewed-on: #13	2025-01-06 09:42:14 +13:00
Ayaka	e94d07274d	gimmick for "style-gimmicks"	2025-01-06 09:38:08 +13:00
ayaka	85dab5e070	add quicklist to subreddit	2025-01-06 09:32:52 +13:00
ayaka	5959464bbe	fix typo, lol..	2025-01-06 08:04:41 +13:00
ayaka	dbb13f73f4	icon change	2025-01-06 07:59:03 +13:00
ayaka	10c7327c39	colorway toggle	2025-01-06 07:15:24 +13:00
ayaka	ad39254ddc	fix followed user rendering	2024-12-22 04:25:54 +13:00
ayaka	9856b7fd47	create basic quicklist functionality	2024-12-22 04:04:43 +13:00
ayaka	e478575706	Add mascot: BoymoderHoodie	2024-12-22 04:02:54 +13:00