Skip to content

Instantly share code, notes, and snippets.

@till
Created March 9, 2024 00:14
Show Gist options
  • Save till/6a64985abca2dd22c851e4edf5b79d88 to your computer and use it in GitHub Desktop.
Save till/6a64985abca2dd22c851e4edf5b79d88 to your computer and use it in GitHub Desktop.
diff --git a/cli.go b/cli.go
new file mode 100644
index 0000000..b7ec8c9
--- /dev/null
+++ b/cli.go
@@ -0,0 +1,231 @@
+package main
+
+import (
+ "fmt"
+ "os"
+ "strconv"
+)
+
+type cmd struct {
+ help string
+ callback func(args []string)
+}
+
+var commands = map[string]cmd{
+ "initdb": {
+ help: "initialize honk",
+ callback: func(args []string) {
+ initdb()
+ },
+ },
+ "upgrade": {
+ help: "upgrade honk",
+ callback: func(args []string) {
+ upgradedb()
+ },
+ },
+ "version": {
+ help: "print version",
+ callback: func(args []string) {
+ fmt.Println(softwareVersion)
+ os.Exit(0)
+ },
+ },
+ "admin": {
+ help: "admin interface",
+ callback: func(args []string) {
+ adminscreen()
+ },
+ },
+ "import": {
+ help: "import data into honk",
+ callback: func(args []string) {
+ if len(args) != 4 {
+ errx("import username honk|mastodon|twitter srcdir")
+ }
+ importMain(args[1], args[2], args[3])
+ },
+ },
+ "export": {
+ help: "export data from honk",
+ callback: func(args []string) {
+ if len(args) != 3 {
+ errx("export username destdir")
+ }
+ export(args[1], args[2])
+ },
+ },
+ "devel": {
+ help: "turn devel on/off",
+ callback: func(args []string) {
+ if len(args) != 2 {
+ errx("need an argument: devel (on|off)")
+ }
+ switch args[1] {
+ case "on":
+ setconfig("devel", 1)
+ case "off":
+ setconfig("devel", 0)
+ default:
+ errx("argument must be on or off")
+ }
+ },
+ },
+ "setconfig": {
+ help: "set honk config",
+ callback: func(args []string) {
+ if len(args) != 3 {
+ errx("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)
+ },
+ },
+ "adduser": {
+ help: "add a user to honk",
+ callback: func(args []string) {
+ adduser()
+ },
+ },
+ "deluser": {
+ help: "delete a user from honk",
+ callback: func(args []string) {
+ if len(args) < 2 {
+ errx("usage: honk deluser username")
+ }
+ deluser(args[1])
+ },
+ },
+ "chpass": {
+ help: "change password of an account",
+ callback: func(args []string) {
+ if len(args) < 2 {
+ errx("usage: honk chpass username")
+ }
+ chpass(args[1])
+ },
+ },
+ "follow": {
+ help: "follow an account",
+ callback: func(args []string) {
+ if len(args) < 3 {
+ errx("usage: honk follow username url")
+ }
+ user, err := butwhatabout(args[1])
+ if err != nil {
+ errx("user %s not found", args[1])
+ }
+ var meta HonkerMeta
+ mj, _ := jsonify(&meta)
+ honkerid, flavor, err := savehonker(user, args[2], "", "presub", "", mj)
+ if err != nil {
+ errx("had some trouble with that: %s", err)
+ }
+ if flavor == "presub" {
+ followyou(user, honkerid, true)
+ }
+ },
+ },
+ "unfollow": {
+ help: "unfollow an account",
+ callback: func(args []string) {
+ if len(args) < 3 {
+ errx("usage: honk unfollow username url")
+ }
+ user, err := butwhatabout(args[1])
+ if err != nil {
+ errx("user not found")
+ }
+
+ honkerid, err := gethonker(user.ID, args[2])
+ if err != nil {
+ errx("sorry couldn't find them")
+ }
+ unfollowyou(user, honkerid, true)
+ },
+ },
+ "sendmsg": {
+ help: "send a message",
+ callback: func(args []string) {
+ if len(args) < 4 {
+ errx("usage: honk send username filename rcpt")
+ }
+ user, err := butwhatabout(args[1])
+ if err != nil {
+ errx("user %s not found", args[1])
+ }
+ data, err := os.ReadFile(args[2])
+ if err != nil {
+ errx("can't read file: %s", err)
+ }
+ deliverate(user.ID, args[3], data)
+ },
+ },
+ "cleanup": {
+ help: "clean up? (enter usefull )",
+ callback: func(args []string) {
+ arg := "30"
+ if len(args) > 1 {
+ arg = args[1]
+ }
+ cleanupdb(arg)
+ },
+ },
+ "unplug": {
+ help: "not sure",
+ callback: func(args []string) {
+ if len(args) < 2 {
+ errx("usage: honk unplug servername")
+ }
+ name := args[1]
+ unplugserver(name)
+ },
+ },
+ "backup": {
+ help: "backup honk",
+ callback: func(args []string) {
+ if len(args) < 2 {
+ errx("usage: honk backup dirname")
+ }
+ name := args[1]
+ svalbard(name)
+ },
+ },
+ "ping": {
+ help: "ping from user to user/url",
+ callback: func(args []string) {
+ if len(args) < 3 {
+ errx("usage: honk ping (from username) (to username or url)")
+ }
+ name := args[1]
+ targ := args[2]
+ user, err := butwhatabout(name)
+ if err != nil {
+ errx("unknown user %s", name)
+ }
+ ping(user, targ)
+ },
+ },
+ "run": {
+ help: "run honk",
+ callback: func(args []string) {
+ serve()
+ },
+ },
+ "backend": {
+ help: "run backend",
+ callback: func(args []string) {
+ backendServer()
+ },
+ },
+ "test": {
+ help: "run test",
+ callback: func(args []string) {
+ ElaborateUnitTests()
+ },
+ },
+}
diff --git a/database.go b/database.go
index 29a332e..ba97b94 100644
--- a/database.go
+++ b/database.go
@@ -102,6 +102,15 @@ func getserveruser() *WhatAbout {
return user
}
+func gethonker(userid UserID, xid string) (int64, error) {
+ row := opendatabase().
+ QueryRow("select honkerid from honkers where xid = ? and userid = ? and flavor in ('sub')", xid, userid)
+ var honkerid int64
+
+ err := row.Scan(&honkerid)
+ return honkerid, err
+}
+
func butwhatabout(name string) (*WhatAbout, error) {
user, ok := somenamedusers.Get(name)
if !ok {
diff --git a/main.go b/main.go
index d211e97..a83a209 100644
--- a/main.go
+++ b/main.go
@@ -24,7 +24,6 @@ import (
notrand "math/rand"
"os"
"runtime/pprof"
- "strconv"
"time"
"humungus.tedunangst.com/r/webs/log"
@@ -86,6 +85,16 @@ var memprofilefd *os.File
func main() {
flag.StringVar(&dataDir, "datadir", dataDir, "data directory")
flag.StringVar(&viewDir, "viewdir", viewDir, "view directory")
+ flag.Usage = func() {
+ flag.PrintDefaults()
+ helpText := "\n available honk commands:\n"
+ for n, c := range commands {
+ helpText += fmt.Sprintf(" %s: %s\n", n, c.help)
+ }
+
+ fmt.Fprint(flag.CommandLine.Output(), helpText)
+ }
+
flag.Parse()
if *cpuprofile != "" {
f, err := os.Create(*cpuprofile)
@@ -118,12 +127,11 @@ func main() {
}
switch cmd {
case "init":
- initdb()
+ commands["init"].callback(args)
case "upgrade":
- upgradedb()
+ commands["upgrade"].callback(args)
case "version":
- fmt.Println(softwareVersion)
- os.Exit(0)
+ commands["version"].callback(args)
}
db := opendatabase()
dbversion := 0
@@ -153,134 +161,10 @@ func main() {
prepareStatements(db)
- switch cmd {
- case "admin":
- adminscreen()
- case "import":
- if len(args) != 4 {
- errx("import username honk|mastodon|twitter srcdir")
- }
- importMain(args[1], args[2], args[3])
- case "export":
- if len(args) != 3 {
- errx("export username destdir")
- }
- export(args[1], args[2])
- case "devel":
- if len(args) != 2 {
- errx("need an argument: devel (on|off)")
- }
- switch args[1] {
- case "on":
- setconfig("devel", 1)
- case "off":
- setconfig("devel", 0)
- default:
- errx("argument must be on or off")
- }
- case "setconfig":
- if len(args) != 3 {
- errx("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 {
- errx("usage: honk deluser username")
- }
- deluser(args[1])
- case "chpass":
- if len(args) < 2 {
- errx("usage: honk chpass username")
- }
- chpass(args[1])
- case "follow":
- if len(args) < 3 {
- errx("usage: honk follow username url")
- }
- user, err := butwhatabout(args[1])
- if err != nil {
- errx("user %s not found", args[1])
- }
- var meta HonkerMeta
- mj, _ := jsonify(&meta)
- honkerid, flavor, err := savehonker(user, args[2], "", "presub", "", mj)
- if err != nil {
- errx("had some trouble with that: %s", err)
- }
- if flavor == "presub" {
- followyou(user, honkerid, true)
- }
- case "unfollow":
- if len(args) < 3 {
- errx("usage: honk unfollow username url")
- }
- user, err := butwhatabout(args[1])
- if err != nil {
- errx("user not found")
- }
- 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 {
- errx("sorry couldn't find them")
- }
- unfollowyou(user, honkerid, true)
- case "sendmsg":
- if len(args) < 4 {
- errx("usage: honk send username filename rcpt")
- }
- user, err := butwhatabout(args[1])
- if err != nil {
- errx("user %s not found", args[1])
- }
- data, err := os.ReadFile(args[2])
- if err != nil {
- errx("can't read file: %s", err)
- }
- 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 {
- errx("usage: honk unplug servername")
- }
- name := args[1]
- unplugserver(name)
- case "backup":
- if len(args) < 2 {
- errx("usage: honk backup dirname")
- }
- name := args[1]
- svalbard(name)
- case "ping":
- if len(args) < 3 {
- errx("usage: honk ping (from username) (to username or url)")
- }
- name := args[1]
- targ := args[2]
- user, err := butwhatabout(name)
- if err != nil {
- errx("unknown user %s", name)
- }
- ping(user, targ)
- case "run":
- serve()
- case "backend":
- backendServer()
- case "test":
- ElaborateUnitTests()
- default:
- errx("unknown command")
+ c, ok := commands[cmd]
+ if !ok {
+ errx("don't know about %q", cmd)
}
+
+ c.callback(args)
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment