From 592198cbddb4da4effe5bb8b487079ac50073eaf Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Wed, 4 Dec 2024 21:37:23 -0800 Subject: [PATCH] Fix favicon in safari really --- main.go | 19 +++++++++++++++++-- static/favicon.png | Bin 0 -> 3113 bytes static/help.html | 3 ++- static/index.html | 3 ++- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 static/favicon.png diff --git a/main.go b/main.go index 6fe17ee..de11eee 100644 --- a/main.go +++ b/main.go @@ -70,6 +70,7 @@ func NewShortLinks(db *sql.DB, domainAliases map[string]string, writableDomains sl.mux.HandleFunc("GET /{$}", sl.serveRoot) sl.mux.HandleFunc("GET /_help", sl.serveHelp) + sl.mux.HandleFunc("GET /_favicon.png", sl.serveFavicon) sl.mux.HandleFunc("GET /{short}", sl.serveShort) sl.mux.HandleFunc("POST /{$}", sl.serveSet) sl.mux.HandleFunc("QUERY /{$}", sl.serveSuggest) @@ -133,7 +134,11 @@ func (sl *ShortLinks) serveRootWithPath(w http.ResponseWriter, r *http.Request, } func (sl *ShortLinks) serveShort(w http.ResponseWriter, r *http.Request) { - log.Printf("%s %s %s %s %s %s", r.RemoteAddr, r.Method, r.Host, sl.getDomain(r.Host), r.URL, r.Form) + err := sl.initRequest(w, r) + if err != nil { + sendError(w, http.StatusBadRequest, "init request: %s", err) + return + } short := r.PathValue("short") @@ -287,6 +292,17 @@ func (sl *ShortLinks) genShort(domain string) (string, error) { return "", fmt.Errorf("no available short link found") } +func (sl *ShortLinks) serveFavicon(w http.ResponseWriter, r *http.Request) { + err := sl.initRequest(w, r) + if err != nil { + sendError(w, http.StatusBadRequest, "init request: %s", err) + return + } + + w.Header().Set("Content-Type", "image/png") + http.ServeFile(w, r, "static/favicon.png") +} + func (sl *ShortLinks) getDomain(host string) string { if alias, ok := sl.domainAliases[host]; ok { return alias @@ -339,7 +355,6 @@ func (sl *ShortLinks) initRequest(w http.ResponseWriter, r *http.Request) error } default: - log.Printf("unknown type: %T", v) r.Form.Set(k, fmt.Sprintf("%v", v)) } } diff --git a/static/favicon.png b/static/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..eaed5d9092e2e352f1208cb9c81023748dd81545 GIT binary patch literal 3113 zcma)84LFnQ8-Er}G|?dxW2U1{C;K8Y+YkS>6Peu@-ceNRdMootB zqR8k?zJ4e-HiwC_$KWtHG(`u6LXkKjp+tZ8A3njM9T^?Yij z(a{l$BVY*x8z{nt8yCZ)32b7xR#Qp-%;V1FGB^>jya;v-N}ZQRXYb&V(P%Z%Ut>xq zQxNf)DTe#0ET}-N+JnVoaM+n(P_cjM`x{C?i~UCsFCz3GxYV90*yLeMX(Xu?5d9(q zOx9-ih-hXE7pjMXcO;M|wSDFJT-`L}rhi0E^GriRg%RC2Od5~P31G8Xlu7z%^%mvF zVWVs@_87b^3HxQ(Oc|K&G#-;ez!B_h@B|y2T>##mXp1A_9c^$ci8$P}BvX-JM zCWOYL&6EXC#5+vS^0(M&dDQ1h+~m*XvROOS-9WL$O%5zxy^ye9`M<<|hHi+7;8CEX zpM-p2{t~tMvwud$>HaUV>o^fisH-Q{;y=+%w|$ByVbzU2tlbT z6rB!7!`A@J(e-wB4G^^U<=po-^)yVTt}R$@53A5I4jTMEsK@CNMQZv2k zS(sOK)iYM{0bT1XEnF}o^$_(j?^VG~_?jMG#tE0@rk2{&?)aeQ@0NNaA{$hV$^^Se zq?7t{GSkSpNgW^gKD%{(c4%f?-2lh*BEoR1BCuUMuxNpCn8P;K$v-4F>hG&Cr6Xfq z_zHhN($JFQ476-vw&d58#6b4}d3L)||ND##O#6SF6}eOyO@8skpMDB?P^$ z@EcE(6z^Bp`-ls+yJlv4|v99siSQmPh=y;OkeWk6KDu3lUf6HEM zCZ*-=6U^n}mv4-ZF%Rhbp!0iP+KYlLKGr#XBgBdQheXoMn%|Z+=dCl3`8{=M;YUVp z#h#)twvEEp@|~Y$;#d^7v#9OVIr9xQW2==pspPRU0lHrP3Q(lgv^Dss%8}(cH&CXpLN)ts^^%;&-n^QpFpvn4{Rsip4 z@RGEWiWOBS_miz9GV3zrY1j3(q7*Wxt8%a66fLkeYg@qerK|qfFfi|e*V^sKH!?;_ z@xJ&q_8%A_>u$q-P>e?fCW;8>N6jjo93-!6F5y>~s{aSR8gNa11CrlU%vR3Ir@hT^ z#W*Jq)L(MyPA?97dH+^r=UT-FbLxrbu|*@dtL0~v@hc=*BY4tWhK%uwd;X!Ha>DDF zB-eeod34L*Y^7JO#qk_kf>45;I777dtQ|uiiC)m#wnT26Juz-0G?z&X+Dza5@?r4j zl*ZDe-zBL&YkXgi%8Pv0i$jO@pB=yTNE8U|m-n4(2T+IKxO?qsHMJorsKe;n{6o&P zxPfo0;hSi2Y(!oQV7Gsa?=A0~a|OQ)eY6JT@xL)U)-qb2VFK(<&Sq_CpH0OBvk)<_ zxW0$(jZBb`vOS0*tJhidV5BJ2Z)VQZzrrB0_>SD?Bw^Pcf~QloA)v6 zYG$l2J`(JKbzJhCs5(T}rMGi>8=n^{qVo{+b;mm!%Z-Hc+=g4(agC)ku`$PJp)1nE zSQLQF&Pk|zak0;FxJ>EL>bY~{-K%X$it!ii@-`Ps4ZU2Cq~YPEjL^t2X;R$Mj#KL6p4{}4%R8sY7Oh;eJNycNEek!$*$EL#3gX( zdWJCsvlcDik97&_kV9@o4>VskoDLoBDvisWqZ2vHq3g7?W-!!`r8*zvqbi>myB?cM yN)FUXjn;gDlwBX1D_@f@6OML$b&aPCIj<}%O6DyeKHK1=Hh6oibuU~Mob*51aRcQ5 literal 0 HcmV?d00001 diff --git a/static/help.html b/static/help.html index 4d0a7c7..e1b6607 100644 --- a/static/help.html +++ b/static/help.html @@ -33,7 +33,8 @@ a { } - + + - + +