Merge pull request #1 from EmmaTheMartian/feature/mentions

Feature/mentions

.gitignore

···
 
 # vweb and database
 *.db
-*.js
 
 # Local V install
 /v/

src/api.v

···
 	return ctx.redirect('/me')
 }
 
+@['/api/user/get_name']
+fn (mut app App) api_user_get_name(mut ctx Context, username string) veb.Result {
+	user := app.get_user_by_name(username) or {
+		return ctx.server_error('no such user')
+	}
+	return ctx.text(user.get_name())
+}
+
 ////// Posts //////
 
 @['/api/post/new_post'; post]
···
 		return ctx.redirect('/login')
 	}
 
-	if user.admin || app.config.dev_mode {
+	post := app.get_post_by_id(id) or {
+		ctx.error('post does not exist')
+		return ctx.redirect('/')
+	}
+
+	if user.admin || user.id == post.author_id {
 		sql app.db {
 			delete from Post where id == id
 			delete from Like where post_id == id

src/pages.v

···
 		return ctx.redirect('/login')
 	}
 	ctx.title = '${app.config.instance.name} - ${user.get_name()}'
-	return $veb.html()
+	return ctx.redirect('/user/${user.username}')
 }
 
 fn (mut app App) admin(mut ctx Context) veb.Result {
···
 
 @['/user/:username']
 fn (mut app App) user(mut ctx Context, username string) veb.Result {
-	user := app.get_user_by_name(username) or {
+	user := app.whoami(mut ctx) or { User{} }
+	viewing := app.get_user_by_name(username) or {
 		ctx.error('user not found')
 		return ctx.redirect('/')
 	}

src/static/js/post.js

···
+const like = async id => {
+	await fetch('/api/post/like?id=' + id, {
+		method: 'GET'
+	})
+	window.location.reload()
+}
+
+const dislike = async id => {
+	await fetch('/api/post/dislike?id=' + id, {
+		method: 'GET'
+	})
+	window.location.reload()
+}
+
+const render_post_body = async (id, mention_pattern) => {
+	const element = document.getElementById(`post-${id}`)
+	var body = element.innerText
+	const matches = body.matchAll(new RegExp(mention_pattern, 'g'))
+	for (const match of matches) {
+		(await fetch('/api/user/get_name?username=' + match[0].substring(2, match[0].length - 1))).text().then(s => {
+			element.innerHTML = element.innerHTML.replace(match[0], '<a href="/user/' + match[0].substring(2, match[0].length - 1) + '">' + s + '</a>')
+		})
+	}
+}

src/static/themes/hackerman.css

···
 	--bg: black;
 	--accent-bg: black;
 	--text: green;
-	--text-light: light-green;
+	--text-light: lime;
 	--accent: green;
-	--accent-hover: light-green
+	--accent-hover: lime;
 	--accent-text: black;
 	--code: green;
 	--preformatted: green;

src/templates/components/post.html

···
-<div class="post post-full">
-	<h2><a href="/user/@{(app.get_user_by_id(post.author_id) or { app.get_unknown_user() }).username}"><strong>@{(app.get_user_by_id(post.author_id) or { app.get_unknown_user() }).get_name()}</strong></a> - @post.title</h2>
-	<pre>@post.body</pre>
-	<p><em>likes: @{app.get_net_likes_for_post(post.id)}</em></p>
-	<p><em>posted at: @post.posted_at</em></p>
-
-	@if ctx.is_logged_in()
-	<script>
-		const like = async (id) => {
-			await fetch('/api/post/like?id=' + id, {
-				method: 'GET'
-			})
-			window.location.reload()
-		}
-
-		const dislike = async (id) => {
-			await fetch('/api/post/dislike?id=' + id, {
-				method: 'GET'
-			})
-			window.location.reload()
-		}
-	</script>
-
-	<br>
-
-	<div>
-		<button onclick="like(@post.id)">
-			@if app.does_user_like_post(user.id, post.id)
-			liked :D
-			@else
-			like
-			@end
-		</button>
-		<button onclick="dislike(@post.id)">
-			@if app.does_user_dislike_post(user.id, post.id)
-			disliked D:
-			@else
-			dislike
-			@end
-		</button>
-	</div>
-	@end
-
-	@if app.config.dev_mode || (ctx.is_logged_in() && user.admin) || (ctx.is_logged_in() && post.author_id == user.id)
-	<hr>
-	<h4>admin powers:</h4>
-	<form action="/api/post/delete" method="post">
-		<input
-			type="number"
-			name="id"
-			id="id"
-			placeholder="post id"
-			value="@post.id"
-			required
-			readonly
-			hidden
-			aria-hidden
-		>
-		<input type="submit" value="delete">
-	</form>
-	@end
-</div>

src/templates/components/user/admin.html

···
-@if ctx.is_logged_in() && user.admin
-<div>
-	<h2>admin powers:</h2>
-	<form action="/api/user/set_muted" method="post">
-		<input
-			type="text"
-			name="id"
-			id="id"
-			value="@user.id"
-			required
-			readonly
-			hidden
-			aria-hidden
-		>
-		@if !user.muted
-		<input
-			type="checkbox"
-			name="muted"
-			id="muted"
-			value="true"
-			checked
-			readonly
-			hidden
-			aria-hidden
-		>
-		<input type="submit" value="mute">
-		@else
-		<input
-			type="checkbox"
-			name="muted"
-			id="muted"
-			value="false"
-			checked
-			readonly
-			hidden
-			aria-hidden
-		>
-		<input type="submit" value="unmute">
-		@end
-	</form>
-</div>
-@end

src/templates/components/user/bio.html

···
-@if user.bio != ''
-<div>
-	<h2>bio:</h2>
-	<p>@user.bio</p>
-</div>
-@end

src/templates/components/user/info.html

···
-<div>
-	<h2>user info:</h2>
-	<p>id: @user.id</p>
-	<p>username: @user.username</p>
-	<p>display name: @user.get_name()</p>
-	@if app.logged_in_as(mut ctx, user.id)
-	<p><a href="/api/user/logout">log out</a></p>
-	<p><a href="/api/user/full_logout">log out of all devices</a></p>
-	@end
-</div>

src/templates/components/user/name.html

···
-<h1>
-	@{user.get_name()}
-	(@@@user.username)
-
-	@if user.pronouns != ''
-	(@user.pronouns)
-	@end
-
-	@if user.muted && user.admin
-	[muted admin, somehow]
-	@else if user.muted
-	[muted]
-	@else if user.admin
-	[admin]
-	@end
-</h1>
-
-@if app.logged_in_as(mut ctx, user.id)
-<p>this is you!</p>
-@end

src/templates/components/user/new_post.html

···
-<div>
-	<form action="/api/post/new_post" method="post">
-		<h2>new post:</h2>
-		<input
-			type="text"
-			name="title"
-			id="title"
-			minlength="@app.config.post.title_min_len"
-			maxlength="@app.config.post.title_max_len"
-			pattern="@app.config.post.title_pattern"
-			placeholder="title"
-			required
-		>
-		<br>
-		<textarea
-			name="body"
-			id="body"
-			minlength="@app.config.post.body_min_len"
-			maxlength="@app.config.post.body_max_len"
-			rows="10"
-			cols="30"
-			placeholder="body"
-			required
-		></textarea>
-		<br>
-		<input type="submit" value="post!">
-	</form>
-</div>

src/templates/components/user/posts.html

···
-<div>
-	<h2>posts:</h2>
-	@for post in app.get_posts_from_user(user.id)
-	@include 'components/post_small.html'
-	@end
-</div>

src/templates/components/user/settings.html

···
-<div>
-	<h2>settings:</h2>
-	<form action="/api/user/set_bio" method="post">
-		<label for="bio">bio:</label>
-		<br>
-		<textarea
-			name="bio"
-			id="bio"
-			cols="30"
-			rows="10"
-			minlength="@app.config.user.bio_min_len"
-			maxlength="@app.config.user.bio_max_len"
-			required
-		>@user.bio</textarea>
-		<input type="submit" value="save">
-	</form>
-	<form action="/api/user/set_pronouns" method="post">
-		<label for="pronouns">pronouns:</label>
-		<input
-			type="text"
-			name="pronouns"
-			id="pronouns"
-			minlength="@app.config.user.pronouns_min_len"
-			maxlength="@app.config.user.pronouns_max_len"
-			pattern="@app.config.user.pronouns_pattern"
-			value="@user.pronouns"
-			required
-		>
-		<br>
-		<input type="submit" value="save">
-	</form>
-	<form action="/api/user/set_nickname" method="post">
-		<label for="nickname">nickname:</label>
-		<input
-			type="text"
-			name="nickname"
-			id="nickname"
-			pattern="@app.config.user.nickname_pattern"
-			minlength="@app.config.user.nickname_min_len"
-			maxlength="@app.config.user.nickname_max_len"
-			value="@{user.nickname or { '' }}"
-			required
-		>
-		<input type="submit" value="save">
-	</form>
-	<form action="/api/user/set_nickname" method="post">
-		<input type="submit" value="reset nickname">
-	</form>
-	@if app.config.user.allow_changing_theme
-	<br>
-	<form action="/api/user/set_theme" method="post">
-		<label for="url">theme:</label>
-		<input type="url" name="url" id="url" value="@{user.theme or { '' }}">
-		<input type="submit" value="save">
-	</form>
-	@end
-</div>

src/templates/me.html

···
-@include 'partial/header.html'
-
-@if ctx.is_logged_in()
-
-@include 'components/user/name.html'
-@include 'components/user/bio.html'
-@include 'components/user/new_post.html'
-@include 'components/user/posts.html'
-@include 'components/user/info.html'
-@include 'components/user/settings.html
-
-@else
-<p>uh oh, you are not logged in! you can log in <a href="/login">here</a></p>
-@end
-
-@include 'partial/footer.html'

src/templates/post.html

···
 @include 'partial/header.html'
-<br>
-@include 'components/post.html'
+
+<script src="/static/js/post.js"></script>
+
+<div class="post post-full">
+	<h2><a href="/user/@{(app.get_user_by_id(post.author_id) or { app.get_unknown_user() }).username}"><strong>@{(app.get_user_by_id(post.author_id) or { app.get_unknown_user() }).get_name()}</strong></a> - @post.title</h2>
+	<pre id="post-@{post.id}">@post.body</pre>
+	<p><em>likes: @{app.get_net_likes_for_post(post.id)}</em></p>
+	<p><em>posted at: @post.posted_at</em></p>
+
+	@if ctx.is_logged_in()
+	<br>
+	<div>
+		<button onclick="like(@post.id)">
+			@if app.does_user_like_post(user.id, post.id)
+			liked :D
+			@else
+			like
+			@end
+		</button>
+		<button onclick="dislike(@post.id)">
+			@if app.does_user_dislike_post(user.id, post.id)
+			disliked D:
+			@else
+			dislike
+			@end
+		</button>
+	</div>
+	@end
+
+	@if (ctx.is_logged_in() && user.admin) || (ctx.is_logged_in() && post.author_id == user.id)
+	<hr>
+	@if user.admin
+	<h4>admin powers:</h4>
+	@else if post.author_id == user.id
+	<h4>manage post:</h4>
+	@end
+	<form action="/api/post/delete" method="post">
+		<input
+			type="number"
+			name="id"
+			id="id"
+			placeholder="post id"
+			value="@post.id"
+			required
+			readonly
+			hidden
+			aria-hidden
+		>
+		<input type="submit" value="delete">
+	</form>
+	@end
+</div>
+
+<script type="module">
+	await render_post_body(@{post.id}, '@@\\(@{app.config.user.username_pattern}\\)')
+</script>
+
 @include 'partial/footer.html'

src/templates/user.html

···
 @include 'partial/header.html'
 
-@include 'components/user/name.html'
-@include 'components/user/bio.html'
-@include 'components/user/posts.html'
-@include 'components/user/info.html'
-@include 'components/user/admin.html'
+<h1>
+	@{viewing.get_name()}
+	(@@@viewing.username)
+
+	@if viewing.pronouns != ''
+	(@viewing.pronouns)
+	@end
+
+	@if viewing.muted && viewing.admin
+	[muted admin, somehow]
+	@else if viewing.muted
+	[muted]
+	@else if viewing.admin
+	[admin]
+	@end
+</h1>
+
+@if app.logged_in_as(mut ctx, viewing.id)
+<p>this is you!</p>
+
+<div>
+	<form action="/api/post/new_post" method="post">
+		<h2>new post:</h2>
+		<input
+			type="text"
+			name="title"
+			id="title"
+			minlength="@app.config.post.title_min_len"
+			maxlength="@app.config.post.title_max_len"
+			pattern="@app.config.post.title_pattern"
+			placeholder="title"
+			required
+		>
+		<br>
+		<textarea
+			name="body"
+			id="body"
+			minlength="@app.config.post.body_min_len"
+			maxlength="@app.config.post.body_max_len"
+			rows="10"
+			cols="30"
+			placeholder="body"
+			required
+		></textarea>
+		<br>
+		<input type="submit" value="post!">
+	</form>
+</div>
+@end
+
+@if viewing.bio != ''
+<div>
+	<h2>bio:</h2>
+	<p>@viewing.bio</p>
+</div>
+@end
+
+<div>
+	<h2>posts:</h2>
+	@for post in app.get_posts_from_user(viewing.id)
+	@include 'components/post_small.html'
+	@end
+</div>
+
+<div>
+	<h2>user info:</h2>
+	<p>id: @viewing.id</p>
+	<p>username: @viewing.username</p>
+	<p>display name: @viewing.get_name()</p>
+	@if app.logged_in_as(mut ctx, viewing.id)
+	<p><a href="/api/user/logout">log out</a></p>
+	<p><a href="/api/user/full_logout">log out of all devices</a></p>
+	@end
+</div>
+
+@if app.logged_in_as(mut ctx, viewing.id)
+<div>
+	<h2>user settings:</h2>
+	<form action="/api/user/set_bio" method="post">
+		<label for="bio">bio:</label>
+		<br>
+		<textarea
+			name="bio"
+			id="bio"
+			cols="30"
+			rows="10"
+			minlength="@app.config.user.bio_min_len"
+			maxlength="@app.config.user.bio_max_len"
+			required
+		>@user.bio</textarea>
+		<input type="submit" value="save">
+	</form>
+	<form action="/api/user/set_pronouns" method="post">
+		<label for="pronouns">pronouns:</label>
+		<input
+			type="text"
+			name="pronouns"
+			id="pronouns"
+			minlength="@app.config.user.pronouns_min_len"
+			maxlength="@app.config.user.pronouns_max_len"
+			pattern="@app.config.user.pronouns_pattern"
+			value="@user.pronouns"
+			required
+		>
+		<br>
+		<input type="submit" value="save">
+	</form>
+	<form action="/api/user/set_nickname" method="post">
+		<label for="nickname">nickname:</label>
+		<input
+			type="text"
+			name="nickname"
+			id="nickname"
+			pattern="@app.config.user.nickname_pattern"
+			minlength="@app.config.user.nickname_min_len"
+			maxlength="@app.config.user.nickname_max_len"
+			value="@{user.nickname or { '' }}"
+			required
+		>
+		<input type="submit" value="save">
+	</form>
+	<form action="/api/user/set_nickname" method="post">
+		<input type="submit" value="reset nickname">
+	</form>
+	@if app.config.user.allow_changing_theme
+	<br>
+	<form action="/api/user/set_theme" method="post">
+		<label for="url">theme:</label>
+		<input type="url" name="url" id="url" value="@{user.theme or { '' }}">
+		<input type="submit" value="save">
+	</form>
+	@end
+</div>
+@end
+
+@if ctx.is_logged_in() && user.admin
+<div>
+	<h2>admin powers:</h2>
+	<form action="/api/user/set_muted" method="post">
+		<input
+			type="text"
+			name="id"
+			id="id"
+			value="@user.id"
+			required
+			readonly
+			hidden
+			aria-hidden
+		>
+		@if !user.muted
+		<input
+			type="checkbox"
+			name="muted"
+			id="muted"
+			value="true"
+			checked
+			readonly
+			hidden
+			aria-hidden
+		>
+		<input type="submit" value="mute">
+		@else
+		<input
+			type="checkbox"
+			name="muted"
+			id="muted"
+			value="false"
+			checked
+			readonly
+			hidden
+			aria-hidden
+		>
+		<input type="submit" value="unmute">
+		@end
+	</form>
+</div>
+@end
 
 @include 'partial/footer.html'