From de9b7c3536a28c2b1bda458e16efb492d1efabcd Mon Sep 17 00:00:00 2001 From: yo momma Date: Wed, 4 Feb 2026 19:33:57 +0000 Subject: Rebrand: remove dump wording; env SMTP creds --- scripts/logreport.py | 4 ++-- src/email.clj | 29 +++++++++++++++-------------- static/error/500.html | 2 +- static/error/error.html | 2 +- static/html/help.html | 2 +- static/html/help2.html | 2 +- static/html/hump_welcome.html | 18 ++++++++++++++++++ static/templates/banner_dis.st | 4 ++-- template/banner_dis.st | 3 +-- template/rooms/artornot.st | 2 +- 10 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 static/html/hump_welcome.html diff --git a/scripts/logreport.py b/scripts/logreport.py index 3e6dbaf..612a578 100755 --- a/scripts/logreport.py +++ b/scripts/logreport.py @@ -287,7 +287,7 @@ class DumpReport(object): self._output_errors_and_unclassified(writer) def write_report(self, outdir): - page_title = 'Dump Report: %s to %s' % (format_time(self.start_time), + page_title = 'Hump Report: %s to %s' % (format_time(self.start_time), format_time(self.end_time)) filename = self.start_time.strftime('%Y-%m-%d__%H-%M.html') path = os.path.join(outdir, filename) @@ -325,7 +325,7 @@ def yield_log_windows(raw_iter, interval, parse_func, timekey): yield start_time + (interval * i), list(g) -# Dump log parsing +# Hump log parsing def parse_time(s): # Parse times such as 02/Jul/2010:22:21:25 -0400 diff --git a/src/email.clj b/src/email.clj index 6c09115..dded4a6 100755 --- a/src/email.clj +++ b/src/email.clj @@ -1,7 +1,8 @@ (ns email (:import org.antlr.stringtemplate.StringTemplateGroup) (:require [clojure.contrib.str-utils2 :as s]) - (:use utils)) + (:use utils + config)) (defn base-mail [& m] (let [mail (apply hash-map m) @@ -55,16 +56,16 @@ "text/html" "text/plain")) -(defn dump-mail [to subject text] - (base-mail :user "info@hump.fm" - :password "UHR4Moghu5a2" - :host "smtpout.secureserver.net" - :port 465 - :ssl true - :to [(join to ",")] - :subject subject - :text text - :mime (classify-mimetype text))) +(defn hump-mail [to subject text] + (base-mail :user (getenv "HUMPFM_SMTP_USER" "info@hump.fm") + :password (getenv "HUMPFM_SMTP_PASSWORD" "") + :host (getenv "HUMPFM_SMTP_HOST" "smtpout.secureserver.net") + :port (getenv-int "HUMPFM_SMTP_PORT" 465) + :ssl (getenv-bool "HUMPFM_SMTP_SSL" true) + :to [(join to ",")] + :subject subject + :text text + :mime (classify-mimetype text))) (def *admin-lists* {"humpfmprod" ["info@hump.fm"] "sostler" ["sbostler@gmail.com"] @@ -78,12 +79,12 @@ ([nick email] (send-registration-email nick email "welcome")) ([nick email temp] (let [[s b] (parse-mail-template temp {"nick" nick})] - (dump-mail [email] s b)))) + (hump-mail [email] s b)))) (defn send-reset-email ([nick email link temp] (let [[s b] (parse-mail-template temp {"nick" nick "link" link})] - (dump-mail [email] s b))) + (hump-mail [email] s b))) ([nick email link] (send-reset-email nick email link "reset"))) (defn send-mute-email [user-nick admin-nick reason duration] @@ -91,5 +92,5 @@ user-nick admin-nick duration) body (format "Reason: %s" reason)] - (dump-mail (get-admins) subject body))) + (hump-mail (get-admins) subject body))) diff --git a/static/error/500.html b/static/error/500.html index 1a19b8b..1c1d13d 100755 --- a/static/error/500.html +++ b/static/error/500.html @@ -13,7 +13,7 @@ img{border:0px;}
We're sorry... -
dump is down cuz of the government or we're too poor.

+
hump is down cuz of the government or we're too poor.

diff --git a/static/error/error.html b/static/error/error.html index 1a19b8b..1c1d13d 100755 --- a/static/error/error.html +++ b/static/error/error.html @@ -13,7 +13,7 @@ img{border:0px;}
We're sorry... -
dump is down cuz of the government or we're too poor.

+
hump is down cuz of the government or we're too poor.

diff --git a/static/html/help.html b/static/html/help.html index 05629ca..c8e8d9c 100755 --- a/static/html/help.html +++ b/static/html/help.html @@ -57,7 +57,7 @@ Oh hai Gaga! Its Easy! Here are some ways...
-Image Search The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Dump This!" and the image will post. +Image Search The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Hump This!" and the image will post.

You can also narrow down your search criteria by clicking on 'options' and choosing where the images come from, the file type, size..etc.
diff --git a/static/html/help2.html b/static/html/help2.html index 01bf133..d27d0d2 100755 --- a/static/html/help2.html +++ b/static/html/help2.html @@ -62,7 +62,7 @@ Oh hai Gaga! Its Easy! Here are some ways...
-Image Search The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Dump This!" and the image will post. +Image Search The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Hump This!" and the image will post.

You can also narrow down your search criteria by clicking on 'options' and choosing where the images come from, the file type, size..etc.
diff --git a/static/html/hump_welcome.html b/static/html/hump_welcome.html new file mode 100644 index 0000000..4ceda98 --- /dev/null +++ b/static/html/hump_welcome.html @@ -0,0 +1,18 @@ + + + + + hump.fm + + + +

Welcome to hump.fm

+

Paste an image URL, upload a file, or snap a pic from your webcam.

+

Create an account or sign in.

+ + diff --git a/static/templates/banner_dis.st b/static/templates/banner_dis.st index 3d2123b..546b475 100755 --- a/static/templates/banner_dis.st +++ b/static/templates/banner_dis.st @@ -15,7 +15,7 @@ $else$ @@ -129,7 +129,7 @@ $if(!user_nick)$

- +
diff --git a/template/banner_dis.st b/template/banner_dis.st index ea72b33..2fe18c2 100755 --- a/template/banner_dis.st +++ b/template/banner_dis.st @@ -5,7 +5,6 @@ $if(!user_nick)$ $endif$ -
@@ -119,7 +118,7 @@ $if(!user_nick)$

- +
diff --git a/template/rooms/artornot.st b/template/rooms/artornot.st index 64a6931..6e3ab62 100755 --- a/template/rooms/artornot.st +++ b/template/rooms/artornot.st @@ -99,7 +99,7 @@
$preload()$ -- cgit v1.2.3-70-g09d2