attempt at merge

2 files changed, 46 insertions, 27 deletions

diff --git a/public/assets/js/util/color.js b/public/assets/js/util/color.js
index 6d33a72..ec21925 100644
--- a/public/assets/js/util/color.js
+++ b/public/assets/js/util/color.js
@@ -65,6 +65,19 @@ var COLORS = {
   black: new Color(32,32,37),
 }
 
+var DARK_COLORS = {
+  plain: new Color(24,10,10),
+  ivory: new Color(18,18,18),
+  pink: new Color(40,23,35),
+  red: new Color(40,24,23),
+  orange: new Color(40,32,23),
+  yellow: new Color(40,40,31),
+  green: new Color(33,40,31),
+  blue: new Color(24,26,40),
+  purple: new Color(35,31,40),
+  black: new Color(0,0,0),
+}
+
 function nighttime_quotient() {
   var q = -10;
   var date = new Date()
@@ -111,7 +124,8 @@ function set_background_color_from_time(){
 }
 function set_background_color(color_name){
   color_name = color_name || "plain"
-  var color = COLORS[color_name]
+  var color_set = window.matchMedia('(prefers-color-scheme: dark)').matches ? DARK_COLORS : COLORS
+  var color = color_set[color_name]
     .clone()
     .mottleRGB(4,4,8)
 //     .add(nighttime_quotient())
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index b04c056..d868ddd 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -23,19 +23,20 @@ function querystring(opt){
   }).join("&")
 }
 function commatize (n, radix) {
-  radix = radix || 1024
+  radix = radix || 1000
   var nums = [], i, counter = 0, r = Math.floor
-  if (n > radix) {
+  if (radix !== -1 && n > radix) {
     n /= radix
     nums.unshift(r((n * 10) % 10))
     nums.unshift(".")
   }
   do {
-    i = n % 10
+    i = r(n % 10)
     n = r(n / 10)
-    if (n && ! (++counter % 3))
+    counter += 1
+    if (n && ! (counter % 3))
       { i = ' ' + r(i) }
-    nums.unshift(r(i))
+    nums.unshift(i)
   }
   while (n)
   return nums.join("")
@@ -102,14 +103,14 @@ function hush_views (n, bias, no_bold) {
   n = n || 0
   if (n < 30) { return["quiet", n + "&nbsp;v."] }
   if (n < 200) { return ["quiet", txt + "&nbsp;v."] }
-  else if (n < 500) { return ["quiet", txt + "&nbsp;v."] }
-  else if (n < 1000) { return ["old", txt + "&nbsp;v."] }
-  else if (n < 5000) { return ["med", txt + "&nbsp;kv."] }
+  else if (n < 500) { return ["old", txt + "&nbsp;v."] }
+  else if (n < 1000) { return ["med", txt + "&nbsp;v."] }
+  else if (n < 5000) { return ["recent", txt + "&nbsp;kv."] }
   else if (no_bold || n < 10000) { return ["recent", txt + "&nbsp;kv."] }
   else { return ["new", txt + "&nbsp;kv."] }
 }
 function hush_threads (n, bias, no_bold) {
-  var txt = commatize(n, 1000)
+  var txt = commatize(n, -1)
   bias = bias || 1
   n = n || 0
   if (n < 10) { return["quiet", n + "&nbsp;t."] }
@@ -120,33 +121,37 @@ function hush_threads (n, bias, no_bold) {
 }
 
 function hush_size (n, bias, no_bold) {
-  var txt = commatize(Math.floor(n / 1024))
+  var txt = commatize(Math.floor(n / 1024), 1000)
   bias = 1 || bias
   n = n || 0
   if (n < 1024) {
     return ["quiet", n + "&nbsp;b."]
   }
-  if (n < 1024*1024) {
+  if (n < 1000*1000) {
     return ["quiet", txt + "&nbsp;kb."]
   }
-  else if (n < (20000000/bias)) {
+  if (n < (20000000/bias)) {
     return ["quiet", txt + "&nbsp;mb."]
   }
-  else if (n < (50000000/bias)) {
+  if (n < (50000000/bias)) {
     return ["old", txt + "&nbsp;mb."]
   }
-  else if (n < (80000000/bias)) {
+  if (n < (80000000/bias)) {
     return ["med", txt + "&nbsp;mb."]
   }
-  else if (no_bold || n < (170000000/bias)) {
+  if (no_bold || n < (170000000/bias)) {
     return ["recent", txt + "&nbsp;mb."]
   }
-  else {
-    return ["new", txt + "&nbsp;mb."]
+  if (n >= 10000*1000*1000) {
+    console.log(n)
+    txt = commatize(Math.floor(n / (1024 * 1024 * 1024)))
+    return ["new", txt + "&nbsp;gb."]
   }
+  return ["new", txt + "&nbsp;mb."]
 }
 
 function hush_null (n, unit, no_bold) {
+  n = commatize(n, -1)
   var s = unit ? n + "&nbsp;" + unit + "." : n
   if (n < 3) {
     return ["quiet", s]
@@ -185,26 +190,26 @@ function get_revision (thread) {
   return digits
 }
 
-function get_age (t) {
+function get_age (t, long) {
   var age = Math.abs( Date.now()/1000 - t)
   var r = Math.floor
   var m
   if (age < 5) { return "now" }
-  if (age < 60) { return r(age) + "s" }
+  if (age < 60) { return r(age) + (long ? ' seconds' : "s") }
   age /= 60
-  if (age < 60) { return r(age) + "m" }
+  if (age < 60) { return r(age) + (long ? ' minutes' : "m") }
   m = r(age % 60)
   age /= 60
-  if (m > 0 && age < 2) { return r(age) + "h" + m + "m" }
-  if (age < 24) { return r(age) + "h" }
+  if (m > 0 && age < 2) { return r(age) + (long ? ' hours ' + m + ' minutes' : "h" + m + "m") }
+  if (age < 24) { return r(age) + (long ? ' hours' : "h") }
   age /= 24
-  if (age < 7) { return r(age) + "d" }
+  if (age < 7) { return r(age) + (long ? ' days' : "d") }
   age /= 7
-  if (age < 12) { return r(age) + "w" }
+  if (age < 12) { return r(age) + (long ? ' weeks' : "w") }
   age /= 4
-  if (age < 12) { return r(age) + "m" }
+  if (age < 12) { return r(age) + (long ? ' months' : "m") }
   age /= 12
-  return r(age) + "y"
+  return r(age) + (long ? ' years' : "y")
 }
 
 function tidy_urls (s, short_urls) {