Merge branch 'dev' into npiano/fix-timing-bug

berkmancenter · May 25, 2023 · d72cba0 · d72cba0
2 parents aa0a0b8 + fde5d62
commit d72cba0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
   <link
     href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,500;0,700;1,300;1,500;1,700&display=swap"
     rel="stylesheet" />
-  <title>Threads</title>
+  <title>nymspace</title>
 </head>
 
 <body>

diff --git a/src/components/Shared/FooterSection.vue b/src/components/Shared/FooterSection.vue
@@ -8,8 +8,8 @@
       target="_blank"
       class="text-xl self-center"
     >
-      Threads GitHub
-      <img :src="githubLogo" alt="Threads GitHub" class="inline-block w-8" />
+      nymspace GitHub
+      <img :src="githubLogo" alt="nymspace GitHub" class="inline-block w-8" />
     </a>
   </div>
 </template>

diff --git a/src/components/Shared/HeaderSection.vue b/src/components/Shared/HeaderSection.vue
@@ -4,12 +4,7 @@
   >
     <div>
       <router-link to="/" class="text-4xl">
-        <img
-          src="/images/threads-logo-v1.svg"
-          alt="Threads"
-          class="w-12 inline-block"
-        />
-        <p class="inline-block text-red-600">Threads</p>
+        <p class="inline-block text-red-600">nymspace</p>
       </router-link>
       <a
         v-if="showVersion"
@@ -36,7 +31,7 @@
         href="https://cyber.harvard.edu/projects/nymity"
         rel="noopener"
         target="_blank"
-        >About Threads<ExternalLinkIcon class="ml-1 inline-block w-4 h-4" />
+        >About Nymity<ExternalLinkIcon class="ml-1 inline-block w-4 h-4" />
       </a>
     </div>
   </div>

diff --git a/src/views/MessagesPage.vue b/src/views/MessagesPage.vue
@@ -242,6 +242,16 @@ const updatedMsgs = computed((x) => {
 /**
  * Send message via ws
  */
+function parseJwt (token) {
+  var base64Url = token.split('.')[1];
+  var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+  var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+  }).join(''));
+
+  return JSON.parse(jsonPayload);
+}
+
 async function sendMessage() {
   if (message.value.trim().length > 0 && !getActiveThread.value?.locked && !pseudonymMismatch.value) {
     try {
@@ -419,15 +429,15 @@ const reconnectSockets = () =>{
 }
 
 onMounted(async () => {
-  wsInstance.value = new SocketioService();
-  wsInstance.value.addDisconnectHandler(reconnectSockets);
-  reconnectSockets();
-
   const user = await loadUser();
   goodReputation.value = user.goodReputation;
   await fetchMessages(route.params.threadId);
   await fetchThreadDetails(route.params.threadId);
   messageTextArea.value?.focus();
+
+  wsInstance.value = new SocketioService();
+  wsInstance.value.addDisconnectHandler(reconnectSockets);
+  reconnectSockets();
 });
 
 onUnmounted(() => {

diff --git a/src/views/ThreadsPage.vue b/src/views/ThreadsPage.vue
@@ -176,10 +176,6 @@ const reconnectSockets = () =>{
 }
 
 onMounted(async () => {
-  wsInstance.value = new SocketioService();
-  wsInstance.value.addDisconnectHandler(reconnectSockets);
-  reconnectSockets();
-
   await loadUserThreads();
   await loadThreads(route.params.channelId);
 
@@ -189,6 +185,10 @@ onMounted(async () => {
     channel.value = getChannel(route.params.channelId);
   }
 
+  wsInstance.value = new SocketioService();
+  wsInstance.value.addDisconnectHandler(reconnectSockets);
+  reconnectSockets();
+
   setActiveChannel(channel.value);
 });