update about page

.gitignore

···
 # Binaries
 /beep
 /build/
+/scripts/fetchbuildinfo
 
 # Editor/system specific metadata
 .DS_Store
···
 # Secrets
 /config.real.maple
 .env
+
+# Build data
+/buildinfo.maple
 
 # Local V and Clockwork install (Gitpod)
 /clockwork

Dockerfile

···
 
 STOPSIGNAL SIGINT
 EXPOSE 8008
-CMD ["./beep", "./config.real.maple"]
+CMD ["./beep"]

build.maple

···
 plugins = [ 'v' ]
 
+task::fetch-build-info = {
+	description = 'Fetch misc build information, mainly for the about page'
+	run = 'v scripts/fetchbuildinfo.vsh'
+}
+
+// Database
+
 task:db.init = {
 	description = 'Initialize and start a local Postgres database via Docker'
 	category = 'db'
···
 	run = 'docker rm beep-database && docker volume rm beep-data'
 }
 
+// Ngrok
+
 task:ngrok = {
 	description = 'Open an ngrok tunnel for testing.'
 	category = 'misc'
···
 	run = 'ngrok http --url=${args} http://localhost:8008'
 }
 
+// Run
+
+task:run = {
+	description = 'Run beep'
+	category = 'run'
+	depends = [':fetch-build-info']
+	run = '${v} run ${v_main} config.maple'
+}
+
+task:run.real = {
+	description = 'Run beep using config.real.maple'
+	category = 'run'
+	depends = [':fetch-build-info']
+	run = '${v} run ${v_main}'
+}
+
 task:run.watch = {
 	description = 'Watch/run beep'
 	category = 'run'
+	depends = [':fetch-build-info']
 	run = '${v} -d veb_livereload watch run ${v_main} config.maple'
 }
 
 task:run.watch.real = {
 	description = 'Watch/run beep using config.real.maple'
 	category = 'run'
-	run = '${v} watch run ${v_main} config.real.maple'
-}
-
-task:run = {
-	description = 'Run beep'
-	category = 'run'
-	run = '${v} run ${v_main} config.maple'
+	depends = [':fetch-build-info']
+	run = '${v} watch run ${v_main}'
 }
 
-task:run.real = {
-	description = 'Run beep using config.real.maple'
-	category = 'run'
-	run = '${v} run ${v_main} config.real.maple'
-}
+// Misc
 
 task:cloc = {
 	description = 'Get the lines of code for beep!'

config.maple

···
 	// Set this to '' if your instance is closed source. This is shown on the about page.
 	source = 'https://tangled.org/emmeline.girlkisser.top/beep'
 
+	// Source for your V compiler. Unless you're using a fork of V, you shouldn't need to change this.
+	v_source = 'https://github.com/vlang/v'
+
 	// The instance's name, used for the page titles and on the homepage.
 	name = 'beep'
 	// The welcome message to show on the homepage.
···
 
 	// Toggle to allow any non-logged-in user to view data (posts, users, etc)
 	public_data = false
+
+	// Owner's username. This is linked on the about page. Leave empty to disable.
+	owner_username = ''
 }
 
 http = {

readme

···
   (assumes you already have a database somewhere)
   $ v install EmmaTheMartian.Maple
   $ v -cflags "-O3 -flto" .
-  $ ./beep config.real.maple
+  $ ./beep
 
   If `v install ...` fails then you can install Maple
   manually:

scripts/fetchbuildinfo.vsh

···
+#!/usr/bin/env v
+
+import os
+import emmathemartian.maple
+
+commit_res := os.execute('git rev-parse HEAD')
+if commit_res.exit_code != 0 {
+	eprintln('failed to fetch commit: ${commit_res.output}')
+	exit(1)
+}
+commit := commit_res.output.trim_space()
+
+maple.save_file('buildinfo.maple', {
+	'commit': maple.ValueT(commit)
+})!

src/main.v

···
 fn main() {
 	mut stopwatch := util.Stopwatch.new()
 
-	config := webapp.load_config_from(os.args[1])
-	mut app := &App{ config: config }
+	mut app := &App{
+		config: if os.args.len > 1 {
+			webapp.load_config_from(os.args[1])
+		} else if os.exists('config.real.maple') {
+			webapp.load_config_from('config.real.maple')
+		} else {
+			panic('no config found nor specified!')
+		}
+		buildinfo: if os.exists('buildinfo.maple') {
+			webapp.load_buildinfo_from('buildinfo.maple')
+		} else {
+			webapp.BuildInfo{}
+		}
+	}
 
 	// connect to database
 	util.time_it(
···
 	// make the website config, if it does not exist
 	app.get_or_create_site_config()
 
-	if config.dev_mode {
+	if app.config.dev_mode {
 		println('\033[1;31mNOTE: YOU ARE IN DEV MODE\033[0m')
 	}
 

src/templates/about.html

···
 <h1>about this instance</h1>
 
 <div>
+	<p><strong>general:</strong></p>
 	<p>name: @{app.config.instance.name}</p>
-	<p>version: @{app.config.instance.version} (commit: @{app.commit})</p>
-	<p>built at @{app.built_at} (<span id="built_at">date n/a</span>)</p>
-	<p>built using @{app.v_hash}</p>
-
-	@if app.config.instance.source != ''
-	<p>source: <a href="@{app.config.instance.source}">@{app.config.instance.source}</a></p>
+	<p>version: @{app.config.instance.version}</p>
+	<p>public: @{app.config.instance.public_data}</p>
+	@if app.config.instance.owner_username != ''
+	<p>owner: <a href="/user/@{app.config.instance.owner_username}">@{app.config.instance.owner_username}</a></p>
 	@end
 
 	<br>
-
+	<p><strong>stats:</strong></p>
 	<p>users: @{app.get_user_count()}</p>
 	<p>posts: @{app.get_post_count()}</p>
+
+	@if app.config.instance.source != ''
+	<br>
+	<p><strong>nerd info:</strong></p>
+	<p>beep source: <a href="@{app.config.instance.source}">@{app.config.instance.source}</a></p>
+	<p>beep commit: <code><a href="@{app.config.instance.source}/commit/@{app.buildinfo.commit}">@{app.buildinfo.commit}</a></code></p>
+	<p>V source: <a href="@{app.config.instance.v_source}">@{app.config.instance.v_source}</a></p>
+	<p>V commit: <code><a href="@{app.config.instance.v_source}/commit/@{app.v_hash}">@{app.v_hash}</a></code></p>
+	<p>built at <span id="built_at">date n/a</span> (unix: <code>@{app.built_at}</code>)</p>
+	@end
 </div>
 
 <script>

src/templates/partial/footer.html

···
 			<a href="/about">about</a>
 		</p>
 
-		<p>powered by <a href="https://tamgled.org/emmeline.girlkisser.top/beep">beep</a></p>
+		<p>powered by <a href="https://tangled.org/emmeline.girlkisser.top/beep">beep</a></p>
 	</footer>
 
 </body>

src/webapp/app.v

···
 	veb.StaticHandler
 	DatabaseAccess
 pub:
-	config   Config
-	commit   string = @VMODHASH
-	built_at string = @BUILD_TIMESTAMP
-	v_hash   string = @VHASH
+	config    Config
+	buildinfo BuildInfo
+	built_at  string = @BUILD_TIMESTAMP
+	v_hash    string = @VHASH
 pub mut:
 	auth       auth.Auth[pg.DB]
 	validators struct {

src/webapp/config.v

···
 		allow_changing_theme bool
 		version              string
 		source               string
+		v_source             string
 		invite_only          bool
 		invite_code          string
 		public_data          bool
+		owner_username       string
 	}
 	http        struct {
 	pub mut:
···
 	config.instance.allow_changing_theme = loaded_instance.get('allow_changing_theme').to_bool()
 	config.instance.version = loaded_instance.get('version').to_str()
 	config.instance.source = loaded_instance.get('source').to_str()
+	config.instance.v_source = loaded_instance.get('v_source').to_str()
 	config.instance.invite_only = loaded_instance.get('invite_only').to_bool()
 	config.instance.invite_code = loaded_instance.get('invite_code').to_str()
 	config.instance.public_data = loaded_instance.get('public_data').to_bool()
+	config.instance.owner_username = loaded_instance.get('owner_username').to_str()
 
 	loaded_http := loaded.get('http')
 	config.http.port = loaded_http.get('port').to_int()
···
 
 	return config
 }
+
+pub struct BuildInfo {
+pub mut:
+	commit string
+}
+
+pub fn load_buildinfo_from(file_path string) BuildInfo {
+	loaded := maple.load_file(file_path) or { panic(err) }
+	mut buildinfo := BuildInfo{}
+
+	buildinfo.commit = loaded.get('commit').to_str()
+
+	return buildinfo
+}

src/webapp/pages.v

···
 
 @['/about']
 fn (mut app App) about(mut ctx Context) veb.Result {
-	user := app.whoami(mut ctx) or { User{} }
+	user := app.whoami(mut ctx) or {
+		if !app.config.instance.public_data {
+			ctx.error('not logged in')
+			return ctx.redirect('/login')
+		}
+		User{}
+	}
 	ctx.title = '${app.config.instance.name} - about'
 	return $veb.html('../templates/about.html')
 }