From 6f4b325cf5c71b1ab74d10105d107600f9ad5ad3 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Mon, 7 Aug 2023 02:27:25 -0400
Subject: [PATCH] split main into a new file, add build info

---
 honk.go    | 228 ------------------------------------------------
 main.go    | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 sensors.go |  28 ++++++
 3 files changed, 279 insertions(+), 228 deletions(-)
 create mode 100644 main.go

diff --git a/honk.go b/honk.go
index 8466c67..edb9d22 100644
--- a/honk.go
+++ b/honk.go
@@ -16,27 +16,14 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"html/template"
-	golog "log"
-	"log/syslog"
-	notrand "math/rand"
-	"os"
 	"strconv"
 	"strings"
 	"time"
 
 	"humungus.tedunangst.com/r/webs/httpsig"
-	"humungus.tedunangst.com/r/webs/log"
 )
 
-var softwareVersion = "develop"
-
-func init() {
-	notrand.Seed(time.Now().Unix())
-}
-
 type WhatAbout struct {
 	ID      int64
 	Name    string
@@ -277,218 +264,3 @@ const (
 	SomeActor
 	SomeCollection
 )
-
-var serverName string
-var serverPrefix string
-var masqName string
-var dataDir = "."
-var viewDir = "."
-var iconName = "icon.png"
-var serverMsg template.HTML
-var aboutMsg template.HTML
-var loginMsg template.HTML
-
-func ElaborateUnitTests() {
-}
-
-func unplugserver(hostname string) {
-	db := opendatabase()
-	xid := fmt.Sprintf("%%https://%s/%%", hostname)
-	db.Exec("delete from honkers where xid like ? and flavor = 'dub'", xid)
-	db.Exec("delete from doovers where rcpt like ?", xid)
-}
-
-func reexecArgs(cmd string) []string {
-	args := []string{"-datadir", dataDir}
-	args = append(args, log.Args()...)
-	args = append(args, cmd)
-	return args
-}
-
-var elog, ilog, dlog *golog.Logger
-
-func main() {
-	flag.StringVar(&dataDir, "datadir", dataDir, "data directory")
-	flag.StringVar(&viewDir, "viewdir", viewDir, "view directory")
-	flag.Parse()
-
-	log.Init(log.Options{Progname: "honk", Facility: syslog.LOG_UUCP})
-	elog = log.E
-	ilog = log.I
-	dlog = log.D
-
-	args := flag.Args()
-	cmd := "run"
-	if len(args) > 0 {
-		cmd = args[0]
-	}
-	switch cmd {
-	case "init":
-		initdb()
-	case "upgrade":
-		upgradedb()
-	case "version":
-		fmt.Println(softwareVersion)
-		os.Exit(0)
-	}
-	db := opendatabase()
-	dbversion := 0
-	getconfig("dbversion", &dbversion)
-	if dbversion != myVersion {
-		elog.Fatal("incorrect database version. run upgrade.")
-	}
-	getconfig("servermsg", &serverMsg)
-	getconfig("aboutmsg", &aboutMsg)
-	getconfig("loginmsg", &loginMsg)
-	getconfig("servername", &serverName)
-	getconfig("masqname", &masqName)
-	if masqName == "" {
-		masqName = serverName
-	}
-	serverPrefix = fmt.Sprintf("https://%s/", serverName)
-	getconfig("usersep", &userSep)
-	getconfig("honksep", &honkSep)
-	getconfig("devel", &develMode)
-	getconfig("fasttimeout", &fastTimeout)
-	getconfig("slowtimeout", &slowTimeout)
-	getconfig("signgets", &signGets)
-	prepareStatements(db)
-	switch cmd {
-	case "admin":
-		adminscreen()
-	case "import":
-		if len(args) != 4 {
-			elog.Fatal("import username mastodon|twitter srcdir")
-		}
-		importMain(args[1], args[2], args[3])
-	case "devel":
-		if len(args) != 2 {
-			elog.Fatal("need an argument: devel (on|off)")
-		}
-		switch args[1] {
-		case "on":
-			setconfig("devel", 1)
-		case "off":
-			setconfig("devel", 0)
-		default:
-			elog.Fatal("argument must be on or off")
-		}
-	case "setconfig":
-		if len(args) != 3 {
-			elog.Fatal("need an argument: setconfig key val")
-		}
-		var val interface{}
-		var err error
-		if val, err = strconv.Atoi(args[2]); err != nil {
-			val = args[2]
-		}
-		setconfig(args[1], val)
-	case "adduser":
-		adduser()
-	case "deluser":
-		if len(args) < 2 {
-			fmt.Printf("usage: honk deluser username\n")
-			return
-		}
-		deluser(args[1])
-	case "chpass":
-		if len(args) < 2 {
-			fmt.Printf("usage: honk chpass username\n")
-			return
-		}
-		chpass(args[1])
-	case "follow":
-		if len(args) < 3 {
-			fmt.Printf("usage: honk follow username url\n")
-			return
-		}
-		user, err := butwhatabout(args[1])
-		if err != nil {
-			fmt.Printf("user not found\n")
-			return
-		}
-		var meta HonkerMeta
-		mj, _ := jsonify(&meta)
-		honkerid, err := savehonker(user, args[2], "", "presub", "", mj)
-		if err != nil {
-			fmt.Printf("had some trouble with that: %s\n", err)
-			return
-		}
-		followyou(user, honkerid, true)
-	case "unfollow":
-		if len(args) < 3 {
-			fmt.Printf("usage: honk unfollow username url\n")
-			return
-		}
-		user, err := butwhatabout(args[1])
-		if err != nil {
-			fmt.Printf("user not found\n")
-			return
-		}
-		row := db.QueryRow("select honkerid from honkers where xid = ? and userid = ? and flavor in ('sub')", args[2], user.ID)
-		var honkerid int64
-		err = row.Scan(&honkerid)
-		if err != nil {
-			fmt.Printf("sorry couldn't find them\n")
-			return
-		}
-		unfollowyou(user, honkerid, true)
-	case "sendmsg":
-		if len(args) < 4 {
-			fmt.Printf("usage: honk send username filename rcpt\n")
-			return
-		}
-		user, err := butwhatabout(args[1])
-		if err != nil {
-			fmt.Printf("user not found\n")
-			return
-		}
-		data, err := os.ReadFile(args[2])
-		if err != nil {
-			fmt.Printf("can't read file\n")
-			return
-		}
-		deliverate(user.ID, args[3], data)
-	case "cleanup":
-		arg := "30"
-		if len(args) > 1 {
-			arg = args[1]
-		}
-		cleanupdb(arg)
-	case "unplug":
-		if len(args) < 2 {
-			fmt.Printf("usage: honk unplug servername\n")
-			return
-		}
-		name := args[1]
-		unplugserver(name)
-	case "backup":
-		if len(args) < 2 {
-			fmt.Printf("usage: honk backup dirname\n")
-			return
-		}
-		name := args[1]
-		svalbard(name)
-	case "ping":
-		if len(args) < 3 {
-			fmt.Printf("usage: honk ping (from username) (to username or url)\n")
-			return
-		}
-		name := args[1]
-		targ := args[2]
-		user, err := butwhatabout(name)
-		if err != nil {
-			elog.Printf("unknown user")
-			return
-		}
-		ping(user, targ)
-	case "run":
-		serve()
-	case "backend":
-		backendServer()
-	case "test":
-		ElaborateUnitTests()
-	default:
-		elog.Fatal("unknown command")
-	}
-}
diff --git a/main.go b/main.go
new file mode 100644
index 0000000..50dc564
--- /dev/null
+++ b/main.go
@@ -0,0 +1,251 @@
+//
+// Copyright (c) 2019 Ted Unangst <tedu@tedunangst.com>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"html/template"
+	golog "log"
+	"log/syslog"
+	notrand "math/rand"
+	"os"
+	"strconv"
+	"time"
+
+	"humungus.tedunangst.com/r/webs/log"
+)
+
+var softwareVersion = "develop"
+
+func init() {
+	notrand.Seed(time.Now().Unix())
+}
+
+var serverName string
+var serverPrefix string
+var masqName string
+var dataDir = "."
+var viewDir = "."
+var iconName = "icon.png"
+var serverMsg template.HTML
+var aboutMsg template.HTML
+var loginMsg template.HTML
+
+func ElaborateUnitTests() {
+}
+
+func unplugserver(hostname string) {
+	db := opendatabase()
+	xid := fmt.Sprintf("%%https://%s/%%", hostname)
+	db.Exec("delete from honkers where xid like ? and flavor = 'dub'", xid)
+	db.Exec("delete from doovers where rcpt like ?", xid)
+}
+
+func reexecArgs(cmd string) []string {
+	args := []string{"-datadir", dataDir}
+	args = append(args, log.Args()...)
+	args = append(args, cmd)
+	return args
+}
+
+var elog, ilog, dlog *golog.Logger
+
+func main() {
+	flag.StringVar(&dataDir, "datadir", dataDir, "data directory")
+	flag.StringVar(&viewDir, "viewdir", viewDir, "view directory")
+	flag.Parse()
+
+	log.Init(log.Options{Progname: "honk", Facility: syslog.LOG_UUCP})
+	elog = log.E
+	ilog = log.I
+	dlog = log.D
+
+	args := flag.Args()
+	cmd := "run"
+	if len(args) > 0 {
+		cmd = args[0]
+	}
+	switch cmd {
+	case "init":
+		initdb()
+	case "upgrade":
+		upgradedb()
+	case "version":
+		fmt.Println(softwareVersion)
+		os.Exit(0)
+	}
+	db := opendatabase()
+	dbversion := 0
+	getconfig("dbversion", &dbversion)
+	if dbversion != myVersion {
+		elog.Fatal("incorrect database version. run upgrade.")
+	}
+	getconfig("servermsg", &serverMsg)
+	getconfig("aboutmsg", &aboutMsg)
+	getconfig("loginmsg", &loginMsg)
+	getconfig("servername", &serverName)
+	getconfig("masqname", &masqName)
+	if masqName == "" {
+		masqName = serverName
+	}
+	serverPrefix = fmt.Sprintf("https://%s/", serverName)
+	getconfig("usersep", &userSep)
+	getconfig("honksep", &honkSep)
+	getconfig("devel", &develMode)
+	getconfig("fasttimeout", &fastTimeout)
+	getconfig("slowtimeout", &slowTimeout)
+	getconfig("signgets", &signGets)
+	prepareStatements(db)
+	switch cmd {
+	case "admin":
+		adminscreen()
+	case "import":
+		if len(args) != 4 {
+			elog.Fatal("import username mastodon|twitter srcdir")
+		}
+		importMain(args[1], args[2], args[3])
+	case "devel":
+		if len(args) != 2 {
+			elog.Fatal("need an argument: devel (on|off)")
+		}
+		switch args[1] {
+		case "on":
+			setconfig("devel", 1)
+		case "off":
+			setconfig("devel", 0)
+		default:
+			elog.Fatal("argument must be on or off")
+		}
+	case "setconfig":
+		if len(args) != 3 {
+			elog.Fatal("need an argument: setconfig key val")
+		}
+		var val interface{}
+		var err error
+		if val, err = strconv.Atoi(args[2]); err != nil {
+			val = args[2]
+		}
+		setconfig(args[1], val)
+	case "adduser":
+		adduser()
+	case "deluser":
+		if len(args) < 2 {
+			fmt.Printf("usage: honk deluser username\n")
+			return
+		}
+		deluser(args[1])
+	case "chpass":
+		if len(args) < 2 {
+			fmt.Printf("usage: honk chpass username\n")
+			return
+		}
+		chpass(args[1])
+	case "follow":
+		if len(args) < 3 {
+			fmt.Printf("usage: honk follow username url\n")
+			return
+		}
+		user, err := butwhatabout(args[1])
+		if err != nil {
+			fmt.Printf("user not found\n")
+			return
+		}
+		var meta HonkerMeta
+		mj, _ := jsonify(&meta)
+		honkerid, err := savehonker(user, args[2], "", "presub", "", mj)
+		if err != nil {
+			fmt.Printf("had some trouble with that: %s\n", err)
+			return
+		}
+		followyou(user, honkerid, true)
+	case "unfollow":
+		if len(args) < 3 {
+			fmt.Printf("usage: honk unfollow username url\n")
+			return
+		}
+		user, err := butwhatabout(args[1])
+		if err != nil {
+			fmt.Printf("user not found\n")
+			return
+		}
+		row := db.QueryRow("select honkerid from honkers where xid = ? and userid = ? and flavor in ('sub')", args[2], user.ID)
+		var honkerid int64
+		err = row.Scan(&honkerid)
+		if err != nil {
+			fmt.Printf("sorry couldn't find them\n")
+			return
+		}
+		unfollowyou(user, honkerid, true)
+	case "sendmsg":
+		if len(args) < 4 {
+			fmt.Printf("usage: honk send username filename rcpt\n")
+			return
+		}
+		user, err := butwhatabout(args[1])
+		if err != nil {
+			fmt.Printf("user not found\n")
+			return
+		}
+		data, err := os.ReadFile(args[2])
+		if err != nil {
+			fmt.Printf("can't read file\n")
+			return
+		}
+		deliverate(user.ID, args[3], data)
+	case "cleanup":
+		arg := "30"
+		if len(args) > 1 {
+			arg = args[1]
+		}
+		cleanupdb(arg)
+	case "unplug":
+		if len(args) < 2 {
+			fmt.Printf("usage: honk unplug servername\n")
+			return
+		}
+		name := args[1]
+		unplugserver(name)
+	case "backup":
+		if len(args) < 2 {
+			fmt.Printf("usage: honk backup dirname\n")
+			return
+		}
+		name := args[1]
+		svalbard(name)
+	case "ping":
+		if len(args) < 3 {
+			fmt.Printf("usage: honk ping (from username) (to username or url)\n")
+			return
+		}
+		name := args[1]
+		targ := args[2]
+		user, err := butwhatabout(name)
+		if err != nil {
+			elog.Printf("unknown user")
+			return
+		}
+		ping(user, targ)
+	case "run":
+		serve()
+	case "backend":
+		backendServer()
+	case "test":
+		ElaborateUnitTests()
+	default:
+		elog.Fatal("unknown command")
+	}
+}
diff --git a/sensors.go b/sensors.go
index 4428c07..ef9b15f 100644
--- a/sensors.go
+++ b/sensors.go
@@ -16,10 +16,38 @@
 package main
 
 import (
+	"runtime/debug"
 	"syscall"
 	"time"
 )
 
+func init() {
+	if softwareVersion != "develop" {
+		return
+	}
+	bi, ok := debug.ReadBuildInfo()
+	if !ok {
+		return
+	}
+	var vcs, rev, mod string
+	for _, bs := range bi.Settings {
+		if bs.Key == "vcs" {
+			vcs = "/" + bs.Value
+		}
+		if bs.Key == "vcs.revision" {
+			rev = bs.Value
+			if len(rev) > 12 {
+				rev = rev[:12]
+			}
+			rev = "-" + rev
+		}
+		if bs.Key == "vcs.modified" && bs.Value == "true" {
+			mod = "+"
+		}
+	}
+	softwareVersion += vcs + rev + mod
+}
+
 type Sensors struct {
 	Memory float64
 	Uptime float64