From 5b4166ff30248e0d088ce150940469baaacda262 Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Tue, 31 May 2022 20:47:50 -0700
Subject: [PATCH] Fix focusing on topic when using ctx menu Edit Topic action

---
 client/components/Chat.vue              | 17 +++++++++--------
 client/components/MessageTypes/join.vue |  2 +-
 client/js/commands/join.ts              |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/components/Chat.vue b/client/components/Chat.vue
index 2bd3df61..0c2f8a7a 100644
--- a/client/components/Chat.vue
+++ b/client/components/Chat.vue
@@ -236,14 +236,16 @@ export default defineComponent({
 			}
 		);
 
-		const editTopicRef = ref(props.channel.editTopic);
-		watch(editTopicRef, (newTopic) => {
-			if (newTopic) {
-				void nextTick(() => {
-					topicInput.value?.focus();
-				});
+		watch(
+			() => props.channel.editTopic,
+			(newTopic) => {
+				if (newTopic) {
+					void nextTick(() => {
+						topicInput.value?.focus();
+					});
+				}
 			}
-		});
+		);
 
 		onMounted(() => {
 			channelChanged();
@@ -260,7 +262,6 @@ export default defineComponent({
 			messageList,
 			topicInput,
 			specialComponent,
-			editTopicRef,
 			hideUserVisibleError,
 			editTopic,
 			saveTopic,
diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index 2cc451c9..baeab726 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -6,7 +6,7 @@
 			<i class="account"> [{{ message.account }}]</i>
 		</template>
 		<template v-if="message.gecos">
-			<i class="realname"> {{ message.gecos }} </i>
+			<i class="realname"> {{ message.gecos }}</i>
 		</template>
 		has joined the channel
 	</span>
diff --git a/client/js/commands/join.ts b/client/js/commands/join.ts
index c4b75e85..5bb40aec 100644
--- a/client/js/commands/join.ts
+++ b/client/js/commands/join.ts
@@ -2,7 +2,7 @@ import socket from "../socket";
 import {store} from "../store";
 import {switchToChannel} from "../router";
 
-function input(args) {
+function input(args: string[]) {
 	if (args.length > 0) {
 		let channels = args[0];