feat: add disable_favicons option

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

src/config.rs

@@ -34,6 +34,10 @@ pub struct Config {
     #[serde(default = "default_port")]
     pub port: u16,
 
+    #[serde(default)]
+    // don't load favicons from the duckduckgo api
+    pub disable_favicons: bool,
+
     #[serde(default = "default_data_dir")]
     pub data_dir: String,
 
@@ -49,7 +53,14 @@ pub fn default_maxmind_edition() -> Option<String> {
 
 impl Default for Config {
     fn default() -> Self {
-        Self { base_url: default_base(), port: default_port(), data_dir: default_data_dir(), geoip: None, duckdb: None }
+        Self {
+            base_url: default_base(),
+            port: default_port(),
+            data_dir: default_data_dir(),
+            geoip: None,
+            duckdb: None,
+            disable_favicons: false,
+        }
     }
 }
 

src/web/routes/dashboard.rs

@@ -63,10 +63,21 @@ struct DimensionTableRow {
     icon: Option<String>,
 }
 
+#[derive(Object)]
+#[oai(rename_all = "camelCase")]
+struct ConfigResponse {
+    disable_favicons: bool,
+}
+
 pub struct DashboardAPI;
 
 #[OpenApi]
 impl DashboardAPI {
+    #[oai(path = "/config", method = "get")]
+    async fn config_handler(&self, Data(app): Data<&Liwan>) -> ApiResult<Json<ConfigResponse>> {
+        Ok(Json(ConfigResponse { disable_favicons: app.config.disable_favicons }))
+    }
+
     #[oai(path = "/project/:project_id/earliest", method = "get")]
     async fn project_earliest_handler(
         &self,

web/src/api/dashboard.ts

@@ -10,12 +10,21 @@ import type { DateRange } from "./ranges";
 export const useMe = () => {
 	const { data, isLoading } = useQuery({
 		queryKey: ["me"],
-		staleTime: 60 * 1000, // 1 minute
+		refetchOnMount: false,
 		queryFn: () => api["/api/dashboard/auth/me"].get().json(),
 	});
 	return { role: data?.role, username: data?.username, isLoading };
 };
 
+export const useConfig = () => {
+	const { data, isLoading } = useQuery({
+		queryKey: ["config"],
+		refetchOnMount: false,
+		queryFn: () => api["/api/dashboard/config"].get().json(),
+	});
+	return { config: data, isLoading };
+};
+
 export const useProjects = () => {
 	const { data, isLoading, error } = useQuery({
 		queryKey: ["projects"],

web/src/api/hooks.ts

@@ -4,6 +4,7 @@ import styles from "./icons.module.css";
 import { SiAndroid, SiBadoo, SiBluesky, SiDouban, SiDribbble, SiDuckduckgo, SiFacebook, SiFirefox, SiFlickr, SiFoursquare, SiGithub, SiGoogle, SiGooglechrome, SiInstagram, SiIos, SiLastdotfm, SiLinkedin, SiLinux, SiLivejournal, SiMacos, SiMaildotru, SiMastodon, SiOdnoklassniki, SiOpera, SiPinterest, SiPixelfed, SiReddit, SiRenren, SiSafari, SiSinaweibo, SiSkyrock, SiSnapchat, SiSourceforge, SiStackoverflow, SiTelegram, SiTencentqq, SiThreads, SiTiktok, SiTumblr, SiTwitch, SiV2ex, SiViadeo, SiVimeo, SiVk, SiWorkplace, SiX, SiXing, SiYcombinator, SiYoutube } from "@icons-pack/react-simple-icons";
 // biome-ignore format:
 import { AppWindowIcon, EarthIcon, LayoutGridIcon, MonitorIcon, SearchIcon, SmartphoneIcon, TabletIcon } from "lucide-react";
+import { useConfig } from "../api";
 // biome-ignore format:
 const brandIcons = { tencentqq: SiTencentqq, foursquare: SiFoursquare, vk: SiVk, sinaweibo: SiSinaweibo, telegram: SiTelegram, pixelfed: SiPixelfed, workplace: SiWorkplace, x: SiX, threads: SiThreads, Ru: SiMaildotru, News: SiYcombinator, tiktok: SiTiktok, facebook: SiFacebook, lastdotfm: SiLastdotfm, linkedin: SiLinkedin, dribbble: SiDribbble, reddit: SiReddit, flickr: SiFlickr, github: SiGithub, pinterest: SiPinterest, skyrock: SiSkyrock, stackoverflow: SiStackoverflow, bluesky: SiBluesky, livejournal: SiLivejournal, v2ex: SiV2ex, douban: SiDouban, renren: SiRenren, tumblr: SiTumblr, snapchat: SiSnapchat, badoo: SiBadoo, youtube: SiYoutube, instagram: SiInstagram, viadeo: SiViadeo, odnoklassniki: SiOdnoklassniki, vimeo: SiVimeo, mastodon: SiMastodon, sourceforge: SiSourceforge, twitch: SiTwitch, xing: SiXing, google: SiGoogle, duckduckgo: SiDuckduckgo,};
 
@@ -98,6 +99,9 @@ export const Favicon = ({
 }: IconProps & {
 	fqdn: string;
 }) => {
+	const config = useConfig();
+	if (config.isLoading || config.config?.disableFavicons) return <SearchIcon size={size} />;
+
 	fqdn = fqdn.replace(/[^a-zA-Z0-9.-]/g, "");
 	return <img src={`https://icons.duckduckgo.com/ip3/${fqdn}.ico`} alt="favicon" height={size} width={size} />;
 };

web/src/components/icons.tsx

@@ -30,7 +30,7 @@ export const Project = () => {
 	const [filters, setFilters] = useState<DimensionFilter[]>([]);
 	const [metric, setMetric] = useLocalStorage<Metric>("metric", "views");
 
-	const [rangeString, setRangeString] = useLocalStorage<string>("date-range", "yearToDate");
+	const [rangeString, setRangeString] = useLocalStorage<string>("date-range", "last7Days");
 	const range = useMemo(() => DateRange.deserialize(rangeString), [rangeString]);
 
 	useEffect(() => {

web/src/components/project.tsx

@@ -18,7 +18,6 @@ export const SelectRange = ({
 	const detailsRef = useRef<HTMLDetailsElement>(null);
 
 	const handleSelect = (range: DateRange) => () => {
-		console.log("range", range, detailsRef.current);
 		if (detailsRef.current) detailsRef.current.open = false;
 		onSelect(range);
 	};

web/src/components/project/range.tsx

@@ -471,7 +471,6 @@ export const EditPassword = ({ user, trigger }: { user: UserResponse; trigger: J
 		e.stopPropagation();
 		const form = e.target as HTMLFormElement;
 		const { password, confirm } = Object.fromEntries(new FormData(form)) as { password: string; confirm: string };
-		console.log(password, confirm);
 
 		if (password !== confirm) {
 			confirmPasswordRef.current?.setCustomValidity("Passwords do not match");