now this branch will work on tip

27 files changed, 4 insertions, 155 deletions

diff --git a/v0.9.5/patches/01_prettier_rssfeed.patch b/patches/01_prettier_rssfeed.patch
index 80e8d9e..80e8d9e 100644
--- a/v0.9.5/patches/01_prettier_rssfeed.patch
+++ b/patches/01_prettier_rssfeed.patch
diff --git a/v0.9.5/patches/03_bloated_i18n_implementation.patch b/patches/03_bloated_i18n_implementation.patch
index a788f0f..a788f0f 100644
--- a/v0.9.5/patches/03_bloated_i18n_implementation.patch
+++ b/patches/03_bloated_i18n_implementation.patch
diff --git a/v0.9.5/views/account.html b/v0.9.5/views/account.html
deleted file mode 100644
index bc4368d..0000000
--- a/v0.9.5/views/account.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{{ template "header.html" . }}
-<main>
-<div class="info">
-<p>account - <a href="/logout?CSRF={{ .LogoutCSRF }}">logout</a>
-<p>username: {{ .User.Name }}
-<div>
-<form id="aboutform" action="/saveuser" method="POST">
-<input type="hidden" name="CSRF" value="{{ .UserCSRF }}">
-<p>about me:
-<p><textarea name="whatabout">{{ .WhatAbout }}</textarea>
-
-<p><label class="button" for="skinny">skinny layout:</label>
-<input tabindex=1 type="checkbox" id="skinny" name="skinny" value="skinny" {{ if .User.Options.SkinnyCSS }}checked{{ end }}><span></span>
-
-<p><label class="button" for="omitimages">omit images:</label>
-<input tabindex=1 type="checkbox" id="omitimages" name="omitimages" value="omitimages" {{ if .User.Options.OmitImages }}checked{{ end }}><span></span>
-
-<p><label class="button" for="mentionall">mention all:</label>
-<input tabindex=1 type="checkbox" id="mentionall" name="mentionall" value="mentionall" {{ if .User.Options.MentionAll }}checked{{ end }}><span></span>
-
-<p><label class="button" for="maps">apple map links:</label>
-<input tabindex=1 type="checkbox" id="maps" name="maps" value="apple" {{ if eq "apple" .User.Options.MapLink }}checked{{ end }}><span></span>
-
-<p><label class="button" for="reaction">reaction:</label>
-<select tabindex=1 name="reaction">
-    <option {{ and (eq .User.Options.Reaction "none") "selected" }}>none</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F61E") "selected" }}>{{ "\U0001F61E" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F937") "selected" }}>{{ "\U0001F937" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F648") "selected" }}>{{ "\U0001F648" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F9BE") "selected" }}>{{ "\U0001F9BE" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F346") "selected" }}>{{ "\U0001F346" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F351") "selected" }}>{{ "\U0001F351" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F32E") "selected" }}>{{ "\U0001F32E" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F951") "selected" }}>{{ "\U0001F951" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F5FF") "selected" }}>{{ "\U0001F5FF" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F99A") "selected" }}>{{ "\U0001F99A" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F3BB") "selected" }}>{{ "\U0001F3BB" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001FA93") "selected" }}>{{ "\U0001FA93" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F1EB") "selected" }}>{{ "\U0001F1EB" }}</option>
-    <option {{ and (eq .User.Options.Reaction "\U0001F1FD") "selected" }}>{{ "\U0001F1FD" }}</option>
-</select>
-
-<p><label class="button" for="lang">language:</label>
-<select name="lang">
-    <option {{ and (eq .Lang "en") "selected"}}>{{ "en" }}</option>
-    <option {{ and (eq .Lang "fr") "selected"}}>{{ "fr" }}</option>
-</select>
-
-<p><button>update settings</button>
-</form>
-</div>
-<hr>
-<div>
-<form action="/chpass" method="POST">
-<input type="hidden" name="CSRF" value="{{ .LogoutCSRF }}">
-<p>change password
-<p><input tabindex=1 type="password" name="oldpass"> - oldpass
-<p><input tabindex=1 type="password" name="newpass"> - newpass
-<p><button>change</button>
-</form>
-</div>
-</main>
diff --git a/v0.9.5/views/header_fr.html b/v0.9.5/views/header_fr.html
deleted file mode 100644
index 580ce07..0000000
--- a/v0.9.5/views/header_fr.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<link rel="shortcut icon" href="/favicon.ico"/>
-<title>honk</title>
-<link href="/style.css{{ .StyleParam }}" rel="stylesheet">
-{{ if .LocalStyleParam }}
-<link href="/local.css{{ .LocalStyleParam }}" rel="stylesheet">
-{{ end }}
-<style>
-{{ .UserStyle }}
-</style>
-<link href="/icon.png" rel="icon">
-<meta name="theme-color" content="#305">
-<meta name="viewport" content="width=device-width">
-<meta name="description" content="Federated ActivityPub instance running the Honk server. things happen">
-<meta name="keywords" content="honk">
-</head>
-<body>
-<header>
-{{ if .UserInfo }}
-<details id="topmenu">
-	<summary>menu <span> {{ .UserInfo.Username }}</span></summary>
-<ul>
-<li><a id="homelink" href="/">accueil</a>
-<li><a id="atmelink" href="/atme">@moi</a>
-<li><a id="firstlink" href="/first">premier</a>
-<li style="list-style-type:none; margin-left:-1em">
-<details>
-<summary>combos</summary>
-<ul>
-{{ range .Combos }}
-<li><a class="combolink" href="/c/{{ . }}">{{ . }}</a>
-{{ end }}
-</ul>
-</details>
-<li><a href="/chatter">discutaille</a>
-<li><a href="/o">balises</a>
-<li><a href="/events">moments</a>
-<li><a id="longagolink" href="/longago">il y a un temps</a>
-<li><a id="savedlink" href="/saved">sauvegardés</a>
-<li><a href="/honkers">honkers</a>
-<li><a href="/hfcs">filtres</a>
-<li><a href="/account">mon compte</a>
-<li style="list-style-type:none; margin-left:-1em">
-<details>
-<summary>plus de choses</summary>
-<ul>
-<li><a href="/{{ .UserSep }}/{{ .UserInfo.Username }}">my honks</a>
-<li><a href="/about">à propos</a>
-<li><a href="/front">tout</a>
-<li><a href="/funzone">funzone</a>
-<li><a href="/xzone">xzone</a>
-</ul>
-</details>
-<li><a href="/help/honk.1.html">aide</a>
-<li>
-<form action="/q" method="GET">
-<input type="text" name="q" autocomplete=off size=10
-placeholder="rechercher">
-</form>
-</ul>
-</details>
-	
-<!-- CUSTOM HONK NAVIGATION BAR -->
-	<div  id="altnavbar">
-		<a href="/newhonk" tabindex="2">🎺</a> |
-		<a href="/front">front</a> | 
-		<a href="/">accueil</a> | 
-		<a href="/xzone">récup</a> | 
-		<a href="/atme">@moi</a> | 
-		<a href="/u/{{ .UserInfo.Username}}">profil</a> | 
-		<a href="/account">⚙️</a> |
-		<form style="display:inline" action="/q" method="GET">
-		    <input type="text" tabindex="1" name="q" autocomplete="off"
-            size="10" placeholder="rechercher">
-		</form> 
-	</div>
-<!-- END -->
-
-<p id="topspacer"></p>
-{{ else }}
-<span><a id="homelink" href="/">accueil</a></span>
-<span><a href="/o">balises</a></span>
-<span><a href="/events">moments</a></span>
-<span><a href="/about">à propos</a></span>
-{{ if .ShowRSS }}
-<span><a href="/rss">rss</a></span>
-{{ end }}
-<span><a href="/login">login</a></span>
-{{ end }}
-</header>
diff --git a/v0.9.5/views/header.html b/views/header.html
index 4498ca1..4498ca1 100644
--- a/v0.9.5/views/header.html
+++ b/views/header.html
diff --git a/v0.9.5/views/honk.html b/views/honk.html
index 2d1e465..2d1e465 100644
--- a/v0.9.5/views/honk.html
+++ b/views/honk.html
diff --git a/v0.9.5/views/i18n/about.html b/views/i18n/about.html
index 962e7c3..962e7c3 100644
--- a/v0.9.5/views/i18n/about.html
+++ b/views/i18n/about.html
diff --git a/v0.9.5/views/i18n/account.html b/views/i18n/account.html
index 2d5a3f3..2d5a3f3 100644
--- a/v0.9.5/views/i18n/account.html
+++ b/views/i18n/account.html
diff --git a/v0.9.5/views/i18n/chatter.html b/views/i18n/chatter.html
index 0173224..0173224 100644
--- a/v0.9.5/views/i18n/chatter.html
+++ b/views/i18n/chatter.html
diff --git a/v0.9.5/views/i18n/combos.html b/views/i18n/combos.html
index 9cd227d..9cd227d 100644
--- a/v0.9.5/views/i18n/combos.html
+++ b/views/i18n/combos.html
diff --git a/v0.9.5/views/i18n/funzone.html b/views/i18n/funzone.html
index d5e69e3..d5e69e3 100644
--- a/v0.9.5/views/i18n/funzone.html
+++ b/views/i18n/funzone.html
diff --git a/v0.9.5/views/i18n/header.html b/views/i18n/header.html
index 77995e7..77995e7 100644
--- a/v0.9.5/views/i18n/header.html
+++ b/views/i18n/header.html
diff --git a/v0.9.5/views/i18n/hfcs.html b/views/i18n/hfcs.html
index 75b6f4f..75b6f4f 100644
--- a/v0.9.5/views/i18n/hfcs.html
+++ b/views/i18n/hfcs.html
diff --git a/v0.9.5/views/i18n/honk.html b/views/i18n/honk.html
index 52f63a7..52f63a7 100644
--- a/v0.9.5/views/i18n/honk.html
+++ b/views/i18n/honk.html
diff --git a/v0.9.5/views/i18n/honkers.html b/views/i18n/honkers.html
index 5b9ecf4..5b9ecf4 100644
--- a/v0.9.5/views/i18n/honkers.html
+++ b/views/i18n/honkers.html
diff --git a/v0.9.5/views/i18n/honkform.html b/views/i18n/honkform.html
index ce17fca..ce17fca 100644
--- a/v0.9.5/views/i18n/honkform.html
+++ b/views/i18n/honkform.html
diff --git a/v0.9.5/views/i18n/honkfrags.html b/views/i18n/honkfrags.html
index 5ccc2da..5ccc2da 100644
--- a/v0.9.5/views/i18n/honkfrags.html
+++ b/views/i18n/honkfrags.html
diff --git a/v0.9.5/views/i18n/honkpage.html b/views/i18n/honkpage.html
index 0ae42ef..0ae42ef 100644
--- a/v0.9.5/views/i18n/honkpage.html
+++ b/views/i18n/honkpage.html
diff --git a/v0.9.5/views/i18n/honkpage.js b/views/i18n/honkpage.js
index 49d2cf6..351cde4 100644
--- a/v0.9.5/views/i18n/honkpage.js
+++ b/views/i18n/honkpage.js
@@ -172,7 +172,7 @@ function refreshhonks(btn) {
 	args["tophid"] = tophid[stash]
 	get("/hydra?" + encode(args), function(xhr) {
 		var lenhonks = fillinhonks(xhr, true)
-		btn.innerHTML = "{{ .i18n.Duration }}"
+		btn.innerHTML = i18n_refreshing
 		btn.disabled = false
 		refreshupdate(" " + lenhonks + " new")
 	})
@@ -385,3 +385,6 @@ switch(honklang) {
         var i18n_refreshing = "refreshing"
 
 }
+
+//console.log("i18n_bonked: "+ i18n_bonked + "\n"+ "cookie: "+ getCookie("lang"))
+
diff --git a/v0.9.5/views/i18n/local.css b/views/i18n/local.css
index 0e6f7e1..0e6f7e1 100644
--- a/v0.9.5/views/i18n/local.css
+++ b/views/i18n/local.css
diff --git a/v0.9.5/views/i18n/login.html b/views/i18n/login.html
index e5ea195..e5ea195 100644
--- a/v0.9.5/views/i18n/login.html
+++ b/views/i18n/login.html
diff --git a/v0.9.5/views/i18n/msg.html b/views/i18n/msg.html
index b729caa..b729caa 100644
--- a/v0.9.5/views/i18n/msg.html
+++ b/views/i18n/msg.html
diff --git a/v0.9.5/views/i18n/onts.html b/views/i18n/onts.html
index 4a208c8..4a208c8 100644
--- a/v0.9.5/views/i18n/onts.html
+++ b/views/i18n/onts.html
diff --git a/v0.9.5/views/i18n/pleroma.css b/views/i18n/pleroma.css
index b25439a..b25439a 100644
--- a/v0.9.5/views/i18n/pleroma.css
+++ b/views/i18n/pleroma.css
diff --git a/v0.9.5/views/i18n/style.css b/views/i18n/style.css
index b1da23d..b1da23d 100644
--- a/v0.9.5/views/i18n/style.css
+++ b/views/i18n/style.css
diff --git a/v0.9.5/views/i18n/xzone.html b/views/i18n/xzone.html
index e2ab0d7..e2ab0d7 100644
--- a/v0.9.5/views/i18n/xzone.html
+++ b/views/i18n/xzone.html
diff --git a/v0.9.5/views/local.css b/views/local.css
index 680d300..680d300 100644
--- a/v0.9.5/views/local.css
+++ b/views/local.css