From 499a0ea289bdd35299b21264632099fcda9815b2 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 11:34:04 +0100
Subject: [PATCH 01/56] change providerEndpouint to providername

---
 api/src/db/schema.ts       | 23 ++++++++++----
 api/src/routes/auth.ts     | 61 +++++++++++++++++++++++---------------
 api/src/types/responses.ts | 26 ++++++++--------
 3 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/api/src/db/schema.ts b/api/src/db/schema.ts
index 81bfd596c..86d1f5a30 100644
--- a/api/src/db/schema.ts
+++ b/api/src/db/schema.ts
@@ -4,9 +4,10 @@ import { boolean, text, serial, pgTable as table, timestamp, integer, pgView } f
 export const users = table('users', {
   id: serial().primaryKey(),
   name: text().notNull(),
+  displayName: text('display_name').notNull().unique(),
   webId: text('web_id').notNull().unique(),
   email: text('email').notNull().unique(),
-  providerEndpoint: text('provider_endpoint').notNull(),
+  providerName: text('provider_name').notNull() // This is done so there is no import here. It crashes the drizzle:push command
 })
 
 export const usersRelations = relations(users, ({one}) => ({
@@ -18,23 +19,33 @@ export const posts = table('posts', {
   content: text().notNull(),
   createdAt: timestamp('created_at', { withTimezone: true }).defaultNow(),
   isPublic: boolean('is_public').notNull(),
-  authorId: integer('author_id').notNull().references(() => users.id),
+  authorId: integer('author_id').notNull()
 })
 
+export const postsRelations = relations(posts, ({ one }) => ({
+  author: one(users, {
+    fields: [posts.authorId],
+    references: [users.id]
+  })
+}))
+
+// Views
 export const postsView = pgView('posts_view', {
   id: serial().primaryKey(),
   content: text().notNull(),
   createdAt: timestamp('created_at', { withTimezone: true }).defaultNow(),
   isPublic: boolean('is_public').notNull(),
-  authorId: integer('author_id').notNull().references(() => users.id),
-  authorName: text("author_name").notNull(),
+  authorId: integer('author_id')
+    .notNull()
+    .references(() => users.id),
+  authorName: text('author_name').notNull(),
   authorWebId: text('author_web_id').notNull().unique(),
-  authorProviderEndpoint: text('author_provider_endpoint').notNull(),
+  authorProviderEndpoint: text('author_provider_endpoint').notNull()
 }).as(sql`SELECT
     posts.*,
     users.name as author_name,
     users.web_id as author_web_id,
-    users.provider_endpoint as author_provider_endpoint
+    users.provider_name as author_provider_name
   FROM posts
   INNER JOIN users on posts.author_id = users.id
   WHERE posts.is_public = true`)
diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index 3732d7c30..10bb93239 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -1,14 +1,22 @@
-import { users } from "../db/schema"
-import ActivityPod from "../services/ActivityPod"
-import { type PodProviderSignInResponse, type SelectUsers, viablePodProviders, signinResponse, signUpBody, signinBody } from "../types"
-import { eq } from "drizzle-orm"
-import Elysia, { t } from "elysia"
-import { db } from ".."
-import setupPlugin from "./setup"
-import { getTokenObject } from "../services/jwt"
-import User from "../decorater/User"
+import { users } from '../db/schema'
+import ActivityPod from '../services/ActivityPod'
+import {
+  type PodProviderSignInResponse,
+  type SelectUsers,
+  signinResponse,
+  signUpBody,
+  signinBody,
+  viablePodProviders
+} from '../types'
+import { eq } from 'drizzle-orm'
+import Elysia, { t } from 'elysia'
+import { db } from '..'
+import setupPlugin from './setup'
+import { getTokenObject } from '../services/jwt'
+import User from '../decorater/User'
+import { HTTPError } from 'ky'
 
-const authPlugin = new Elysia({name: 'auth'})
+const authPlugin = new Elysia({ name: 'auth' })
   .use(setupPlugin)
   .post(
     '/signin',
@@ -17,13 +25,13 @@ const authPlugin = new Elysia({name: 'auth'})
       if (auth && (await jwt.verify(auth))) {
         return error(204, "You're already logged in")
       }
-      const { username, password, providerEndpoint } = body
+      const { username, password, providerName } = body
 
       let providerResponse: PodProviderSignInResponse
 
       // try to signIn to the endpoint
       try {
-        providerResponse = await ActivityPod.signIn(providerEndpoint, username, password)
+        providerResponse = await ActivityPod.signIn(viablePodProviders[providerName], username, password)
       } catch (e) {
         console.error('Error while logging in to endpoint: ', e)
         return error(400, "Endpoint didn't respond with a 200 status code")
@@ -43,9 +51,10 @@ const authPlugin = new Elysia({name: 'auth'})
               .insert(users)
               .values({
                 name: username as string,
+                displayName: username as string,
                 email: username as string,
                 webId: providerResponse.webId,
-                providerEndpoint: providerEndpoint
+                providerName
               })
               .returning()
           }
@@ -91,11 +100,11 @@ const authPlugin = new Elysia({name: 'auth'})
       if (auth && (await jwt.verify(auth))) {
         return "You're already logged in"
       }
-      const { username, password, email, providerEndpoint } = body
+      const { username, password, email, providerName } = body
 
       // try to sign up the user with the current provider
       try {
-        const providerResponse = await ActivityPod.signup(providerEndpoint, username, password, email)
+        const providerResponse = await ActivityPod.signup(viablePodProviders[providerName], username, password, email)
         let userResponse: SelectUsers[] = []
 
         if (providerResponse.token === undefined) {
@@ -106,12 +115,16 @@ const authPlugin = new Elysia({name: 'auth'})
             const user = await db.select().from(users).where(eq(users.webId, providerResponse.webId))
             if (user.length === 0) {
               // the user is not in the database yet, so we need to create a new user
-              userResponse = await db.insert(users).values({
-                name: username as string,
-                email,
-                webId: providerResponse.webId,
-                providerEndpoint: providerEndpoint
-              }).returning()
+              userResponse = await db
+                .insert(users)
+                .values({
+                  name: username as string,
+                  displayName: username as string,
+                  email,
+                  webId: providerResponse.webId,
+                  providerName
+                })
+                .returning()
             }
           } catch (e) {
             console.error('Error while checking if user is in the database: ', e)
@@ -124,8 +137,8 @@ const authPlugin = new Elysia({name: 'auth'})
             user: userResponse[0]
           }
         }
-      } catch (e: any) {
-        if (e.name === 'HTTPError') {
+      } catch (e: unknown) {
+        if (e instanceof HTTPError) {
           const errorJson = await e.response.json()
           console.error('Error while signing up the user', errorJson)
           return error(errorJson.code, errorJson.message)
@@ -140,7 +153,7 @@ const authPlugin = new Elysia({name: 'auth'})
       response: {
         200: signinResponse,
         400: t.String(),
-        500: t.String(),
+        500: t.String()
       }
     }
   )
diff --git a/api/src/types/responses.ts b/api/src/types/responses.ts
index a8a0b5f5d..7f521c3a3 100644
--- a/api/src/types/responses.ts
+++ b/api/src/types/responses.ts
@@ -2,16 +2,16 @@ import { t, type Static } from 'elysia'
 import { _selectUsers } from './db'
 import { viablePodProviders } from './enums'
 import { createSchemaFactory } from 'drizzle-typebox'
-import { posts, postsView, users } from '../db/schema'
+import { postsView, users } from '../db/schema'
 
-const {createSelectSchema} = createSchemaFactory({typeboxInstance: t})
+const { createSelectSchema } = createSchemaFactory({ typeboxInstance: t })
 
 // Auth
 // SignIn
 export const signinBody = t.Object({
   username: t.String(),
   password: t.String(),
-  providerEndpoint: viablePodProviders
+  providerName: viablePodProviders
 })
 export type SignInBody = Static<typeof signinBody>
 
@@ -25,7 +25,7 @@ export const signUpBody = t.Object({
   username: t.String(),
   password: t.String(),
   email: t.String(),
-  providerEndpoint: viablePodProviders
+  providerName: viablePodProviders
 })
 export type SignUpBody = Static<typeof signUpBody>
 
@@ -35,14 +35,14 @@ export const selectUser = createSelectSchema(users)
 // Posts
 export const selectPost = createSelectSchema(postsView)
 export type SelectPost = {
-  id: number;
-  content: string;
-  isPublic: boolean;
-  createdAt: string;
-  authorId: number;
+  id: number
+  content: string
+  isPublic: boolean
+  createdAt: string
+  authorId: number
   author: {
-    id: number;
-    name: string;
-    webId: string;
-  };
+    id: number
+    name: string
+    webId: string
+  }
 }

From fada10b5ee85bb8db96df3ae7eb0c23cee0dbebb Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 11:46:14 +0100
Subject: [PATCH 02/56] change enum to contain names not endpoints

---
 api/src/routes/auth.ts |  6 +++---
 api/src/types/enums.ts | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index 10bb93239..4222f5522 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -6,7 +6,7 @@ import {
   signinResponse,
   signUpBody,
   signinBody,
-  viablePodProviders
+  podProviderEndpoint
 } from '../types'
 import { eq } from 'drizzle-orm'
 import Elysia, { t } from 'elysia'
@@ -31,7 +31,7 @@ const authPlugin = new Elysia({ name: 'auth' })
 
       // try to signIn to the endpoint
       try {
-        providerResponse = await ActivityPod.signIn(viablePodProviders[providerName], username, password)
+        providerResponse = await ActivityPod.signIn(podProviderEndpoint[providerName], username, password)
       } catch (e) {
         console.error('Error while logging in to endpoint: ', e)
         return error(400, "Endpoint didn't respond with a 200 status code")
@@ -104,7 +104,7 @@ const authPlugin = new Elysia({ name: 'auth' })
 
       // try to sign up the user with the current provider
       try {
-        const providerResponse = await ActivityPod.signup(viablePodProviders[providerName], username, password, email)
+        const providerResponse = await ActivityPod.signup(podProviderEndpoint[providerName], username, password, email)
         let userResponse: SelectUsers[] = []
 
         if (providerResponse.token === undefined) {
diff --git a/api/src/types/enums.ts b/api/src/types/enums.ts
index 0e6fc1bb2..7446dbb89 100644
--- a/api/src/types/enums.ts
+++ b/api/src/types/enums.ts
@@ -1,5 +1,13 @@
 import { t } from 'elysia'
 
-export const viablePodProviders = t.Enum({
-  'http://localhost:3000': 'http://localhost:3000'
-})
+export const vibaleProviderNames = ['memory.']
+
+export enum ViablePodProvider {
+  'memory.' = 'memory.'
+}
+
+export const podProviderEndpoint: { [key in ViablePodProvider]: string } = {
+  'memory.': 'http://localhost:3000'
+}
+
+export const viablePodProviders = t.Enum(ViablePodProvider)

From 117f692e828280de1f0782c3d4396048dbfc1f04 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 11:46:56 +0100
Subject: [PATCH 03/56] change site to provider providerName instead of
 endpoint

---
 frontend/src/components/SignInForm.vue |  4 ++--
 frontend/src/components/SignupForm.vue |  4 ++--
 frontend/src/stores/authStore.ts       | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/SignInForm.vue b/frontend/src/components/SignInForm.vue
index 4a355dc59..284e6c9ec 100644
--- a/frontend/src/components/SignInForm.vue
+++ b/frontend/src/components/SignInForm.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { useAuthStore } from '@/stores/authStore'
-import type { ProviderEndpoints } from '@/types/api'
 import MemoryButton from '@/components/MemoryButton.vue'
 import MemoryInput from './MemoryInput.vue'
 import { ref } from 'vue'
+import { ViablePodProvider } from '#api/types'
 
 // Form
 const username = ref('')
 const password = ref('')
-const endpoint = ref<ProviderEndpoints>('http://localhost:3000')
+const endpoint = ref<ViablePodProvider>(ViablePodProvider['memory.'])
 // Validation
 const formIsValid = ref(true)
 const formLifeCheck = ref(false)
diff --git a/frontend/src/components/SignupForm.vue b/frontend/src/components/SignupForm.vue
index 704b874ff..2ac95e9ee 100644
--- a/frontend/src/components/SignupForm.vue
+++ b/frontend/src/components/SignupForm.vue
@@ -3,9 +3,9 @@ import { validateEmail, validatePassword, validateUsername } from '@/controller/
 import { useAuthStore } from '@/stores/authStore'
 import MemoryButton from '@/components/MemoryButton.vue'
 import MemoryInput from '@/components/MemoryInput.vue'
-import type { ProviderEndpoints } from '@/types/api'
 import { ref } from 'vue'
 import { ProviderSignUpErrors } from '@/types'
+import { ViablePodProvider } from '#api/types'
 
 // Store
 const authStore = useAuthStore()
@@ -15,7 +15,7 @@ const username = ref('test')
 const email = ref('test@test.com')
 const password = ref('testtest')
 const confirmPassword = ref('testtest')
-const endpoint = ref<ProviderEndpoints>('http://localhost:3000')
+const endpoint = ref<ViablePodProvider>(ViablePodProvider['memory.'])
 // Validation
 const formIsValid = ref(true)
 const formLifeCheck = ref(false)
diff --git a/frontend/src/stores/authStore.ts b/frontend/src/stores/authStore.ts
index 2687442a9..f627b1c49 100644
--- a/frontend/src/stores/authStore.ts
+++ b/frontend/src/stores/authStore.ts
@@ -1,4 +1,4 @@
-import type { SignUpBody, SignInResponse } from '#api/types'
+import type { SignUpBody, SignInResponse, ViablePodProvider } from '#api/types'
 import { ApiClient } from '@/controller/api'
 import type { ApiErrors, App, ProviderEndpoints, User } from '@/types'
 import { defineStore } from 'pinia'
@@ -55,16 +55,16 @@ export const useAuthStore = defineStore('auth', () => {
    * Trys to signIn the user with the given username and password and endpoint
    * @param {string} username - username
    * @param {string} password - password
-   * @param {ProviderEndpoints} providerEndpoint - endpoint
+   * @param {ViablePodProvider} providerName - endpoint
    * @returns {void | ApiErrors} - when successful it redirects to home, returns ApiErrors if error
    */
   async function signin(
     username: string,
     password: string,
-    providerEndpoint: ProviderEndpoints
+    providerName: ViablePodProvider
   ): Promise<void | ApiErrors> {
     try {
-      const { data: response, status } = await client.signin({ username, password, providerEndpoint })
+      const { data: response, status } = await client.signin({ username, password, providerName })
       if (status === 200) {
         const signInResponse = response as SignInResponse
 
@@ -81,18 +81,18 @@ export const useAuthStore = defineStore('auth', () => {
   }
   /**
    * Signup a new user
-   * @param email - email
-   * @param username - username
-   * @param password - password
-   * @param providerEndpoint - provider
+   * @param {string} email - email
+   * @param {string} username - username
+   * @param {string} password - password
+   * @param {ViablePodProvider} providerName - provider
    */
   async function signup(
     email: string,
     username: string,
     password: string,
-    providerEndpoint: ProviderEndpoints
+    providerName: ViablePodProvider
   ): Promise<void | ApiErrors> {
-    const body: SignUpBody = { username, password, email, providerEndpoint }
+    const body: SignUpBody = { username, password, email, providerName }
     const { data: response, status } = await client.signup(body)
     if (status === 200) {
       const signupResponse = response as SignInResponse

From aecb548e9398abcad4fb718d901b99c56e3b850f Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 11:48:28 +0100
Subject: [PATCH 04/56] make some changes to complie with eslint rules

---
 api/src/db/schema.ts                            | 2 +-
 api/src/types/db.ts                             | 2 +-
 frontend/{eslint.config.ts => eslint.config.js} | 0
 frontend/src/stores/authStore.ts                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename frontend/{eslint.config.ts => eslint.config.js} (100%)

diff --git a/api/src/db/schema.ts b/api/src/db/schema.ts
index 86d1f5a30..d84142a0a 100644
--- a/api/src/db/schema.ts
+++ b/api/src/db/schema.ts
@@ -1,4 +1,4 @@
-import { relations, eq, sql } from 'drizzle-orm'
+import { relations, sql } from 'drizzle-orm'
 import { boolean, text, serial, pgTable as table, timestamp, integer, pgView } from 'drizzle-orm/pg-core'
 
 export const users = table('users', {
diff --git a/api/src/types/db.ts b/api/src/types/db.ts
index 8b71a0c38..003d38d13 100644
--- a/api/src/types/db.ts
+++ b/api/src/types/db.ts
@@ -20,4 +20,4 @@ export type CreatePost = Static<typeof _createPost>
 export const _createUser = createInsertSchema(users)
 export type CreateUser = Static<typeof _createUser>
 export const _selectUsers = createSelectSchema(users)
-export interface SelectUsers extends Static<typeof _selectUsers> {}
+export type SelectUsers = Static<typeof _selectUsers>
diff --git a/frontend/eslint.config.ts b/frontend/eslint.config.js
similarity index 100%
rename from frontend/eslint.config.ts
rename to frontend/eslint.config.js
diff --git a/frontend/src/stores/authStore.ts b/frontend/src/stores/authStore.ts
index f627b1c49..cc29c1b88 100644
--- a/frontend/src/stores/authStore.ts
+++ b/frontend/src/stores/authStore.ts
@@ -1,6 +1,6 @@
 import type { SignUpBody, SignInResponse, ViablePodProvider } from '#api/types'
 import { ApiClient } from '@/controller/api'
-import type { ApiErrors, App, ProviderEndpoints, User } from '@/types'
+import type { ApiErrors, User } from '@/types'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'

From a999b79dd305a316ad08648abfbad421adff028f Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:14:03 +0100
Subject: [PATCH 05/56] code: move macro to setup

---
 api/src/index.ts        | 17 -----------------
 api/src/routes/setup.ts | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/api/src/index.ts b/api/src/index.ts
index 2890cad7e..862894e6b 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -1,28 +1,11 @@
 import { Elysia } from 'elysia'
 import { drizzle } from 'drizzle-orm/node-postgres'
-import { _createPost, _selectUsers } from './types'
 import { postsPlugin, authPlugin, setupPlugin } from './routes'
 
 export const db = drizzle({ connection: process.env.DB_URL || '', casing: 'snake_case' })
 
 export const app = new Elysia()
   .use(setupPlugin)
-  .macro({
-    isSignedIn: enabled => {
-      if (!enabled) return
-
-      return {
-        async beforeHandle({ headers: { auth }, jwt, error, user }) {
-          const authValue = await jwt.verify(auth)
-          if (!authValue) {
-            return error(401, 'You must be signed in to do that')
-          } else {
-            user.loadUser(JSON.parse(authValue.user as string))
-          }
-        }
-      }
-    }
-  })
   .use(authPlugin)
   .use(postsPlugin)
   .listen(process.env.API_PORT || 8796)
diff --git a/api/src/routes/setup.ts b/api/src/routes/setup.ts
index 9fc3225ee..e6377bc32 100644
--- a/api/src/routes/setup.ts
+++ b/api/src/routes/setup.ts
@@ -12,5 +12,21 @@ const setupPlugin = new Elysia({ name: 'setup' })
   )
   .use(cors())
   .decorate('user', new User())
+  .macro({
+    isSignedIn: enabled => {
+      if (!enabled) return
+
+      return {
+        async beforeHandle({ headers: { auth }, jwt, error, user }) {
+          const authValue = await jwt.verify(auth)
+          if (!authValue) {
+            return error(401, 'You must be signed in to do that')
+          } else {
+            user.loadUser(authValue.user as string)
+          }
+        }
+      }
+    }
+  })
 
 export default setupPlugin

From 94b6ad25329b9ce0575e44e652122386b256062e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:15:21 +0100
Subject: [PATCH 06/56] fix: use function to compute token

---
 api/src/routes/auth.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index 4222f5522..6fc5acb9f 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -130,7 +130,8 @@ const authPlugin = new Elysia({ name: 'auth' })
             console.error('Error while checking if user is in the database: ', e)
             return error(500, 'Error while checking user')
           }
-          const authToken = await jwt.sign({ webId: providerResponse.webId, token: providerResponse.token })
+          const tokenObject = getTokenObject(new User(userResponse[0], providerResponse.token))
+          const authToken = await jwt.sign(tokenObject)
 
           return {
             token: authToken,

From 13614d2b393274bc7f62d21686d2fd8303acd27e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:15:41 +0100
Subject: [PATCH 07/56] code: remove useless route

---
 api/src/routes/auth.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index 6fc5acb9f..b2b1638ab 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -83,16 +83,6 @@ const authPlugin = new Elysia({ name: 'auth' })
       detail: 'Logs in a with a pod provider and sets an auth cookie for the user'
     }
   )
-  .get(
-    '/logout',
-    async ({ cookie: { auth } }) => {
-      auth.remove()
-      return 'You have been logged out'
-    },
-    {
-      detail: 'Removes the auth cookie'
-    }
-  )
   .post(
     '/signup',
     async ({ body, error, headers: { auth }, jwt }) => {

From 2e0ee7e710bcae2bfdd20eabee66d2935322c892 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:16:54 +0100
Subject: [PATCH 08/56] code: clean up User class

---
 api/src/decorater/User.ts | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/api/src/decorater/User.ts b/api/src/decorater/User.ts
index 2ab35e719..4b0a16b5f 100644
--- a/api/src/decorater/User.ts
+++ b/api/src/decorater/User.ts
@@ -1,17 +1,13 @@
 import type { SelectUsers } from "../types"
 
 export default class User {
-  userId: number
-  userName: string
-  token: string
-  endpoint: string
+  userId: number = 0
+  userName: string = ''
+  token: string = ''
+  provider: string = ''
+  endpoint: string = ''
 
   constructor(dbUser?: SelectUsers, token?: string) {
-    this.userId = 0
-    this.userName = ''
-    this.token = ''
-    this.endpoint = ''
-
     if (dbUser) {
       this.userId = dbUser.id
       this.userName = dbUser.name
@@ -33,20 +29,7 @@ export default class User {
     return `${this.endpoint}/${this.userName}`
   }
 
-  setUser(userId: number, userName: string, token: string, endpoint: string) {
-    this.userId = userId
-    this.userName = userName
-    this.token = token
-    this.endpoint = endpoint
-  }
-
-  setUsername(userName: string) {
-    const userIdSplit = userName.split('/')
-    this.userName = userName
-    this.endpoint = userIdSplit[userIdSplit.length - 2]
   }
 
-  setToken(token: string) {
-    this.token = token
   }
 }

From 2db43fc9e9091e28595055205b477c57b578af5c Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:17:31 +0100
Subject: [PATCH 09/56] fix: endpoint now gets computed from provierName

---
 api/src/decorater/User.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/api/src/decorater/User.ts b/api/src/decorater/User.ts
index 4b0a16b5f..afa9d45d0 100644
--- a/api/src/decorater/User.ts
+++ b/api/src/decorater/User.ts
@@ -1,4 +1,4 @@
-import type { SelectUsers } from "../types"
+import { podProviderEndpoint, ViablePodProvider, type SelectUsers } from '../types'
 
 export default class User {
   userId: number = 0
@@ -11,24 +11,29 @@ export default class User {
     if (dbUser) {
       this.userId = dbUser.id
       this.userName = dbUser.name
-      this.endpoint = dbUser.providerEndpoint
+      this.provider = dbUser.providerName
+      this.computeValues()
     }
     if (token) {
       this.token = token
     }
   }
 
-  loadUser(oldUser: User) {
-    this.userId = oldUser.userId
-    this.userName = oldUser.userName
-    this.token = oldUser.token
-    this.endpoint = oldUser.endpoint
+  loadUser(oldUser: string) {
+    const newUser = JSON.parse(oldUser)
+    this.userId = newUser.userId
+    this.userName = newUser.userName
+    this.token = newUser.token
+    this.provider = newUser.provider
+    this.computeValues()
   }
 
-  getWebId() {
-    return `${this.endpoint}/${this.userName}`
+  private computeValues() {
+    this.endpoint = podProviderEndpoint[this.provider as ViablePodProvider]
   }
 
+  getWebId() {
+    return `${this.endpoint}/${this.userName}`
   }
 
   }

From 7a90d11016a0da5e685ec2ff4723fdbd3a576965 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:18:15 +0100
Subject: [PATCH 10/56] feat: add function to stringify a userObject to make it
 smaler

---
 api/src/decorater/User.ts |  7 +++++++
 api/src/services/jwt.ts   | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/src/decorater/User.ts b/api/src/decorater/User.ts
index afa9d45d0..b5a96777a 100644
--- a/api/src/decorater/User.ts
+++ b/api/src/decorater/User.ts
@@ -36,5 +36,12 @@ export default class User {
     return `${this.endpoint}/${this.userName}`
   }
 
+  toString() {
+    return JSON.stringify({
+      userId: this.userId,
+      userName: this.userName,
+      token: this.token,
+      provider: this.provider
+    })
   }
 }
diff --git a/api/src/services/jwt.ts b/api/src/services/jwt.ts
index a3196661c..90f26d225 100644
--- a/api/src/services/jwt.ts
+++ b/api/src/services/jwt.ts
@@ -1,12 +1,12 @@
-import type User from "../decorater/User"
-import type { JWTPayloadSpec } from "@elysiajs/jwt"
+import type User from '../decorater/User'
+import type { JWTPayloadSpec } from '@elysiajs/jwt'
 
 export interface TokenObject {
   user: string
 }
 
 export function getTokenObject(user: User): Record<string, string | number> & JWTPayloadSpec {
-    return {
-      user: JSON.stringify(user)
-    }
+  return {
+    user: user.toString()
   }
+}

From ec55e63a0dd1f898717fa32a29157ac6b2485ffa Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:20:56 +0100
Subject: [PATCH 11/56] add db initalastion to readme and dockerfile

---
 README.md             | 1 +
 docker/api.dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7a37f61f4..af0b12a43 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ Currently optimised mobile devices are:
 #### Running the api
 - go into the directory `cd api`
 - run `bun install` to install the dependencies
+- run `bun drizzle:push` to push the database schema to the database
 - run `bun dev` to start the api
 
 #### Running the frontend
diff --git a/docker/api.dockerfile b/docker/api.dockerfile
index 6715cc9fb..16e62d85f 100644
--- a/docker/api.dockerfile
+++ b/docker/api.dockerfile
@@ -6,6 +6,7 @@ COPY /api/package.json /api/bun.lock /api/.env /app/api
 
 RUN bun install --global pm2
 RUN bun install
+RUN bun drizzle:push
 
 ADD api /app/api
 RUN bun build \

From ab26d0ed9ca2ede1fbf41b00f2a9889d6d983b6c Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:21:35 +0100
Subject: [PATCH 12/56] add env creation to readme

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index af0b12a43..95a581dee 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Currently optimised mobile devices are:
 
 #### Running the api
 - go into the directory `cd api`
+- copy the `.env.example` file to `.env` and fill in the values
 - run `bun install` to install the dependencies
 - run `bun drizzle:push` to push the database schema to the database
 - run `bun dev` to start the api

From 903c924012c00812f09df67b5a89749fce24eb87 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 12:23:46 +0100
Subject: [PATCH 13/56] code: remove dev consolelogs

---
 frontend/src/stores/postsStore.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/stores/postsStore.ts b/frontend/src/stores/postsStore.ts
index 46829f54c..b7b310046 100644
--- a/frontend/src/stores/postsStore.ts
+++ b/frontend/src/stores/postsStore.ts
@@ -32,8 +32,6 @@ export const usePostsStore = defineStore('posts', () => {
     if (postResponse.status === 200) posts.value.push(postResponse.data)
   }
 
-  console.log('posts: ', posts)
-  console.log('posts: ', posts.value.length)
   // Init store
   if (posts.value.length === 0) {
     fetchPosts()

From d91ed22ce7017d359fef84a4c1d53f229e762c68 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 13:30:35 +0100
Subject: [PATCH 14/56] feat: add util function to handle webIds

---
 api/src/test/user.test.ts | 57 +++++++++++++++++++++++++++++++++++++++
 api/src/util/user.ts      | 49 +++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 api/src/test/user.test.ts
 create mode 100644 api/src/util/user.ts

diff --git a/api/src/test/user.test.ts b/api/src/test/user.test.ts
new file mode 100644
index 000000000..fdb533274
--- /dev/null
+++ b/api/src/test/user.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, test } from 'bun:test'
+import { decodeWebId, encodeWebId } from '@/util/user'
+import User from '@/decorater/User'
+
+describe('User Util', () => {
+  describe('decodeWebId', () => {
+    test('decodeWebId', () => {
+      const webId = '@test@memory.'
+      const encoded = decodeWebId(webId)
+
+      expect(encoded.username).toBe('test')
+      expect(encoded.provider).toBe('memory.')
+      expect(encoded.endpoint).toBe('http://localhost:3000')
+    })
+
+    test('decodeWebId - with a not viably pod provider', () => {
+      const webId = '@test@test.'
+
+      expect(() => {
+        decodeWebId(webId)
+      }).toThrow('The provider is not a viable pod provider')
+    })
+  })
+  describe('encodeWebId', () => {
+    test('encodeWebId', () => {
+      const webId = '@test@memory.'
+      const encoded = encodeWebId('http://localhost:3000/test')
+
+      expect(encoded).toBe(webId)
+    })
+
+    test('encodeWebId - with User object', () => {
+      const webId = '@test@memory.'
+
+      const testUser = new User()
+      testUser.loadUser(JSON.stringify({ userId: 1, username: 'test', token: 'test', provider: 'memory.' }))
+      const encoded = encodeWebId(testUser)
+      expect(encoded).toBe(webId)
+    })
+
+    test('encodeWebId - with a not viably pod provider webId', () => {
+      expect(() => {
+        encodeWebId('notValidProvider/test')
+      }).toThrow('The provider is not a viable pod provider')
+    })
+
+    test('encodeWebId - with a not viably user object', () => {
+      expect(() => {
+        const invalidUser = new User()
+        invalidUser.loadUser(
+          JSON.stringify({ userId: 1, username: 'test', token: 'test', provider: 'notAPodProvider.' })
+        )
+        encodeWebId(invalidUser)
+      }).toThrow('The provider is not a viable pod provider')
+    })
+  })
+})
diff --git a/api/src/util/user.ts b/api/src/util/user.ts
new file mode 100644
index 000000000..4c3ada7af
--- /dev/null
+++ b/api/src/util/user.ts
@@ -0,0 +1,49 @@
+import type User from '@/decorater/User'
+import { podProviderEndpoint, ViablePodProvider } from '@/types'
+
+/**
+ * Encodes a webId to a partial User object
+ * @param {string} webId - The webId to encode (e.g. @test@memory.)
+ * @returns
+ */
+export function decodeWebId(webId: string): {
+  username: string
+  provider: string
+  endpoint: string
+} {
+  const [username, provider] = webId.split('@').slice(1)
+
+  if (!Object.keys(podProviderEndpoint).includes(provider)) throw new Error('The provider is not a viable pod provider')
+
+  return {
+    username: username,
+    provider: provider,
+    endpoint: podProviderEndpoint[provider as ViablePodProvider]
+  }
+}
+
+/**
+ * Decodes a User object to a webId
+ * @param {User} string - The username of the user
+ * @returns {string} - The webId of the user
+ */
+export function encodeWebId(user: User): string
+export function encodeWebId(providerWebId: string): string
+export function encodeWebId(user_or_providerWebId: User | string): string {
+  if (typeof user_or_providerWebId === 'string') {
+    const username = user_or_providerWebId.split('/').pop()
+    const endpoint = user_or_providerWebId.split('/').slice(0, -1).join('/')
+    let name = ''
+    Object.entries(podProviderEndpoint).forEach(([providerName, providerEndpoint]) => {
+      if (providerEndpoint === endpoint) {
+        name = providerName
+      }
+    })
+    if (name === '') throw new Error('The provider is not a viable pod provider')
+    return `@${username}@${name}`
+  } else {
+    if (!Object.keys(podProviderEndpoint).includes(user_or_providerWebId.provider))
+      throw new Error('The provider is not a viable pod provider')
+    return `@${user_or_providerWebId.username}@${user_or_providerWebId.provider}`
+  }
+}

From a5dbbf8af6a55628f4aa9a73de95d75553b0ccb3 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 13:31:08 +0100
Subject: [PATCH 15/56] code: change userName variable to username

---
 api/src/decorater/User.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/src/decorater/User.ts b/api/src/decorater/User.ts
index b5a96777a..65f55a00d 100644
--- a/api/src/decorater/User.ts
+++ b/api/src/decorater/User.ts
@@ -1,8 +1,9 @@
+import { encodeWebId } from '@/util/user'
 import { podProviderEndpoint, ViablePodProvider, type SelectUsers } from '../types'
 
 export default class User {
   userId: number = 0
-  userName: string = ''
+  username: string = ''
   token: string = ''
   provider: string = ''
   endpoint: string = ''
@@ -10,7 +11,7 @@ export default class User {
   constructor(dbUser?: SelectUsers, token?: string) {
     if (dbUser) {
       this.userId = dbUser.id
-      this.userName = dbUser.name
+      this.username = dbUser.name
       this.provider = dbUser.providerName
       this.computeValues()
     }
@@ -22,7 +23,7 @@ export default class User {
   loadUser(oldUser: string) {
     const newUser = JSON.parse(oldUser)
     this.userId = newUser.userId
-    this.userName = newUser.userName
+    this.username = newUser.username
     this.token = newUser.token
     this.provider = newUser.provider
     this.computeValues()
@@ -33,13 +34,13 @@ export default class User {
   }
 
   getWebId() {
-    return `${this.endpoint}/${this.userName}`
+    return encodeWebId(this)
   }
 
   toString() {
     return JSON.stringify({
       userId: this.userId,
-      userName: this.userName,
+      username: this.username,
       token: this.token,
       provider: this.provider
     })

From 1261caa43f79ad324927325487baeece65d9f232 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 13:31:50 +0100
Subject: [PATCH 16/56] code: use new util function

---
 api/src/routes/auth.ts          | 5 +++--
 api/src/routes/posts.ts         | 6 +++---
 api/src/services/ActivityPod.ts | 2 +-
 api/src/types/enums.ts          | 2 --
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index b2b1638ab..03c8a322b 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -15,6 +15,7 @@ import setupPlugin from './setup'
 import { getTokenObject } from '../services/jwt'
 import User from '../decorater/User'
 import { HTTPError } from 'ky'
+import { encodeWebId } from '@/util/user'
 
 const authPlugin = new Elysia({ name: 'auth' })
   .use(setupPlugin)
@@ -53,7 +54,7 @@ const authPlugin = new Elysia({ name: 'auth' })
                 name: username as string,
                 displayName: username as string,
                 email: username as string,
-                webId: providerResponse.webId,
+                webId: encodeWebId(providerResponse.webId),
                 providerName
               })
               .returning()
@@ -111,7 +112,7 @@ const authPlugin = new Elysia({ name: 'auth' })
                   name: username as string,
                   displayName: username as string,
                   email,
-                  webId: providerResponse.webId,
+                  webId: encodeWebId(providerResponse.webId),
                   providerName
                 })
                 .returning()
diff --git a/api/src/routes/posts.ts b/api/src/routes/posts.ts
index 6681a8bbb..2726ea934 100644
--- a/api/src/routes/posts.ts
+++ b/api/src/routes/posts.ts
@@ -15,13 +15,13 @@ const postsRoutes = new Elysia({ name: 'posts' })
     async ({ error, body, user }) => {
       const { content, isPublic } = body
 
-      const addressats = [`${user.endpoint}/${user.userName}/followers`]
+      const addressats = [`${user.endpoint}/${user.username}/followers`]
       if (isPublic) addressats.push('https://www.w3.org/ns/activitystreams#Public')
 
       const post = {
         '@context': 'https://www.w3.org/ns/activitystreams',
         type: 'Note',
-        attributedTo: `${user.endpoint}/${user.userName}`,
+        attributedTo: `${user.endpoint}/${user.username}`,
         content: content,
         to: addressats
       }
@@ -47,7 +47,7 @@ const postsRoutes = new Elysia({ name: 'posts' })
           createdAt: newPosts[0].createdAt?.toString() || '',
           author: {
             id: user.userId,
-            name: user.userName,
+            name: user.username,
             webId: user.getWebId()
           }
         }
diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index a78cf2c39..93662b559 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -30,7 +30,7 @@ export default abstract class ActivityPod {
 
   static async createPost(user: User, post: NoteCreateRequest) {
     const response = await ky
-      .post(`${user.endpoint}/${user.userName}/outbox`, {
+      .post(`${user.endpoint}/${user.username}/outbox`, {
         headers: {
           Authorization: `Bearer ${user.token}`
         },
diff --git a/api/src/types/enums.ts b/api/src/types/enums.ts
index 7446dbb89..11e5fc9d1 100644
--- a/api/src/types/enums.ts
+++ b/api/src/types/enums.ts
@@ -5,9 +5,7 @@ export const vibaleProviderNames = ['memory.']
 export enum ViablePodProvider {
   'memory.' = 'memory.'
 }
-
 export const podProviderEndpoint: { [key in ViablePodProvider]: string } = {
   'memory.': 'http://localhost:3000'
 }
-
 export const viablePodProviders = t.Enum(ViablePodProvider)

From 0eacace49b249479a5c0358ac9fd0855295014b6 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 13:44:52 +0100
Subject: [PATCH 17/56] fix: use new function to check for webId

---
 api/src/routes/auth.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/api/src/routes/auth.ts b/api/src/routes/auth.ts
index 03c8a322b..076672a9a 100644
--- a/api/src/routes/auth.ts
+++ b/api/src/routes/auth.ts
@@ -45,7 +45,8 @@ const authPlugin = new Elysia({ name: 'auth' })
         let dbUser: SelectUsers[] = []
         // the endpoint returned like expected now check if the user is already in the database
         try {
-          dbUser = await db.select().from(users).where(eq(users.webId, providerResponse.webId))
+          const webId = encodeWebId(providerResponse.webId)
+          dbUser = await db.select().from(users).where(eq(users.webId, webId))
           if (dbUser.length === 0) {
             // the user is not in the database yet, so we need to create a new user
             dbUser = await db
@@ -54,7 +55,7 @@ const authPlugin = new Elysia({ name: 'auth' })
                 name: username as string,
                 displayName: username as string,
                 email: username as string,
-                webId: encodeWebId(providerResponse.webId),
+                webId: webId,
                 providerName
               })
               .returning()
@@ -103,7 +104,8 @@ const authPlugin = new Elysia({ name: 'auth' })
         } else {
           // the provider created a new user, so we need to create a new user in the database
           try {
-            const user = await db.select().from(users).where(eq(users.webId, providerResponse.webId))
+            const webId = encodeWebId(providerResponse.webId)
+            const user = await db.select().from(users).where(eq(users.webId, webId))
             if (user.length === 0) {
               // the user is not in the database yet, so we need to create a new user
               userResponse = await db
@@ -112,7 +114,7 @@ const authPlugin = new Elysia({ name: 'auth' })
                   name: username as string,
                   displayName: username as string,
                   email,
-                  webId: encodeWebId(providerResponse.webId),
+                  webId: webId,
                   providerName
                 })
                 .returning()

From f0beb1be3f7e2c3694d458904e19759b86d2e0c1 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 13:45:20 +0100
Subject: [PATCH 18/56] code: add prefix to posts to make routes esyer

---
 api/src/routes/posts.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/routes/posts.ts b/api/src/routes/posts.ts
index 2726ea934..787e7aa5a 100644
--- a/api/src/routes/posts.ts
+++ b/api/src/routes/posts.ts
@@ -5,13 +5,13 @@ import { _createPost, selectQueryObject, type SelectPost } from '../types'
 import { db } from '..'
 import setupPlugin from './setup'
 
-const postsRoutes = new Elysia({ name: 'posts' })
+const postsRoutes = new Elysia({ name: 'posts', prefix: '/posts' })
   .use(setupPlugin)
   .guard({
     isSignedIn: true
   })
   .post(
-    '/posts',
+    '/',
     async ({ error, body, user }) => {
       const { content, isPublic } = body
 
@@ -65,7 +65,7 @@ const postsRoutes = new Elysia({ name: 'posts' })
     }
   )
   .get(
-    '/posts',
+    '/',
     async ({ query: { limit, offset } }) => {
       const postsQuery = await db
         .select({

From 30d2da6c805de6e649d74c6f8df3b29431ba0073 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 14:11:22 +0100
Subject: [PATCH 19/56] code: add exception for _ to eslint

---
 api/eslint.config.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/api/eslint.config.js b/api/eslint.config.js
index e64ccc5a4..309fdf527 100644
--- a/api/eslint.config.js
+++ b/api/eslint.config.js
@@ -1,12 +1,28 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import tseslint from "typescript-eslint";
-
+import globals from 'globals'
+import pluginJs from '@eslint/js'
+import tseslint from 'typescript-eslint'
 
 /** @type {import('eslint').Linter.Config[]} */
 export default [
-  {files: ["**/*.{js,mjs,cjs,ts}"]},
-  {languageOptions: { globals: globals.browser }},
+  { files: ['**/*.{js,mjs,cjs,ts}'] },
+  { languageOptions: { globals: globals.browser } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
-];
\ No newline at end of file
+  {
+    rules: {
+      'no-unused-vars': ['off'],
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          args: 'all',
+          argsIgnorePattern: '^_',
+          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          ignoreRestSiblings: true
+        }
+      ]
+    }
+  }
+]

From bea0dfcc6de966ec5c227c28d29ca0c7f7e96d8e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 14:50:43 +0100
Subject: [PATCH 20/56] feat: add check for memoryWebids to util

---
 api/src/test/user.test.ts | 21 +++++++++++++++++++++
 api/src/util/user.ts      | 12 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/api/src/test/user.test.ts b/api/src/test/user.test.ts
index fdb533274..a91d24429 100644
--- a/api/src/test/user.test.ts
+++ b/api/src/test/user.test.ts
@@ -29,6 +29,27 @@ describe('User Util', () => {
       expect(encoded).toBe(webId)
     })
 
+    test('encodeWebId - with a memory webId', () => {
+      const webId = '@test@memory.'
+      const encoded = encodeWebId(webId)
+
+      expect(encoded).toBe(webId)
+    })
+
+    test('encodeWebId - with a memory webId that has a invalid provider', () => {
+      const invalidMemoryWebId = '@test@test.'
+      expect(() => {
+        encodeWebId(invalidMemoryWebId)
+      }).toThrow('The provider is not a viable pod provider')
+    })
+
+    test('encodeWebId - with a corrupted memory webId', () => {
+      const corruptedWebId = 'test@memory'
+      expect(() => {
+        encodeWebId(corruptedWebId)
+      }).toThrow('The provider is not a viable pod provider')
+    })
+
     test('encodeWebId - with User object', () => {
       const webId = '@test@memory.'
 
diff --git a/api/src/util/user.ts b/api/src/util/user.ts
index 4c3ada7af..1a2595bb7 100644
--- a/api/src/util/user.ts
+++ b/api/src/util/user.ts
@@ -39,7 +39,17 @@ export function encodeWebId(user_or_providerWebId: User | string): string {
         name = providerName
       }
     })
-    if (name === '') throw new Error('The provider is not a viable pod provider')
+    if (name === '') {
+      //check if provided webId is already a memory webId
+      const split = user_or_providerWebId.split('@')
+      if (split.length === 3) {
+        // check if provider is valid
+        if (!Object.keys(podProviderEndpoint).includes(split[2]))
+          throw new Error('The provider is not a viable pod provider')
+        return user_or_providerWebId
+      }
+      throw new Error('The provider is not a viable pod provider')
+    }
     return `@${username}@${name}`
   } else {
     if (!Object.keys(podProviderEndpoint).includes(user_or_providerWebId.provider))

From 9543d04f3ccac819ec5b06531dc665cbb9f380b4 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:00:00 +0100
Subject: [PATCH 21/56] feat: add followers table

---
 api/src/db/schema.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/api/src/db/schema.ts b/api/src/db/schema.ts
index d84142a0a..fb62bffe2 100644
--- a/api/src/db/schema.ts
+++ b/api/src/db/schema.ts
@@ -10,10 +10,20 @@ export const users = table('users', {
   providerName: text('provider_name').notNull() // This is done so there is no import here. It crashes the drizzle:push command
 })
 
-export const usersRelations = relations(users, ({one}) => ({
-  posts: one(posts),
+export const usersRelations = relations(users, ({ many }) => ({
+  posts: many(posts),
+  followers: many(users)
 }))
 
+export const followers = table('followers', {
+  followerId: integer('follower_id')
+    .notNull()
+    .references(() => users.id),
+  followedId: integer('followed_id')
+    .notNull()
+    .references(() => users.id)
+})
+
 export const posts = table('posts', {
   id: serial().primaryKey(),
   content: text().notNull(),

From b25eef64f274080ce0ef0cfc062a2eef371f937c Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:00:55 +0100
Subject: [PATCH 22/56] add webId and ProviderWebId directly to userClass

---
 api/src/decorater/User.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api/src/decorater/User.ts b/api/src/decorater/User.ts
index 65f55a00d..783db06df 100644
--- a/api/src/decorater/User.ts
+++ b/api/src/decorater/User.ts
@@ -7,6 +7,8 @@ export default class User {
   token: string = ''
   provider: string = ''
   endpoint: string = ''
+  webId: string = ''
+  providerWebId: string = ''
 
   constructor(dbUser?: SelectUsers, token?: string) {
     if (dbUser) {
@@ -31,6 +33,8 @@ export default class User {
 
   private computeValues() {
     this.endpoint = podProviderEndpoint[this.provider as ViablePodProvider]
+    this.webId = encodeWebId(this)
+    this.providerWebId = this.endpoint + '/' + this.username
   }
 
   getWebId() {

From 730147f2c4e3c66226edbd73482d26ad72c40cda Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:01:41 +0100
Subject: [PATCH 23/56] feat: add function to save following to Pod

---
 api/src/services/ActivityPod.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index 93662b559..9c5fc1de1 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -1,5 +1,5 @@
 import ky from 'ky'
-import type { NoteCreateRequest, PodProviderSignInResponse } from '../types'
+import type { FollowRequest, NoteCreateRequest, PodProviderSignInResponse } from '../types'
 import type User from '../decorater/User'
 
 export default abstract class ActivityPod {
@@ -39,4 +39,16 @@ export default abstract class ActivityPod {
       .json()
     return response
   }
+
+  static async follow(body: FollowRequest, user: User) {
+    const response = await ky
+      .post(`${user.endpoint}/${user.username}/outbox`, {
+        headers: {
+          Authorization: `Bearer ${user.token}`
+        },
+        json: body
+      })
+      .json()
+    return response
+  }
 }

From 357f5bfc66cf3d7ffd4b8ee5980e93882bc71aa5 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:02:09 +0100
Subject: [PATCH 24/56] code: move PodProvider Types to own file and unify them

---
 api/src/types/activityPod.ts | 22 ++++++++++++++++++++++
 api/src/types/index.ts       | 16 ++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 api/src/types/activityPod.ts

diff --git a/api/src/types/activityPod.ts b/api/src/types/activityPod.ts
new file mode 100644
index 000000000..823d8dd7e
--- /dev/null
+++ b/api/src/types/activityPod.ts
@@ -0,0 +1,22 @@
+export enum PodRequestTypes {
+  Follow = 'Follow',
+  Undo = 'Undo'
+}
+
+interface PodRequest<O, T = string> {
+  '@context': 'https://www.w3.org/ns/activitystreams'
+  type: PodRequestTypes
+  actor: string
+  object: O
+  to: T
+}
+
+export type FollowRequest = PodRequest<string>
+export type UnfollowRequest = PodRequest<Omit<FollowRequest, '@context' | 'to'>>
+export type NoteCreateRequest = PodRequest<string, string[]>
+
+export interface PodProviderSignInResponse {
+  token: string
+  webId: string
+  newUser: boolean
+}
diff --git a/api/src/types/index.ts b/api/src/types/index.ts
index 03c168145..a775607e4 100644
--- a/api/src/types/index.ts
+++ b/api/src/types/index.ts
@@ -1,18 +1,6 @@
-export interface PodProviderSignInResponse {
-  token: string
-  webId: string
-  newUser: boolean
-}
-
-export interface NoteCreateRequest {
-  '@context': string
-  type: string
-  attributedTo: string
-  content: string
-  to: string[]
-}
-
 // Export all Types from diffrent files
 export * from './responses'
 export * from './db'
 export * from './enums'
+export * from './errors'
+export * from './activityPod'

From eaf495d9481a0729b4562fd9b3d44bc9468f7072 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:02:50 +0100
Subject: [PATCH 25/56] feat: add route that allows users to follow eachother

---
 api/src/index.ts        |  3 +-
 api/src/routes/index.ts |  1 +
 api/src/routes/users.ts | 72 +++++++++++++++++++++++++++++++++++++++++
 api/src/types/errors.ts |  6 ++++
 4 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 api/src/routes/users.ts
 create mode 100644 api/src/types/errors.ts

diff --git a/api/src/index.ts b/api/src/index.ts
index 862894e6b..384872c94 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -1,6 +1,6 @@
 import { Elysia } from 'elysia'
 import { drizzle } from 'drizzle-orm/node-postgres'
-import { postsPlugin, authPlugin, setupPlugin } from './routes'
+import { postsPlugin, authPlugin, setupPlugin, usersPlugin } from './routes'
 
 export const db = drizzle({ connection: process.env.DB_URL || '', casing: 'snake_case' })
 
@@ -8,6 +8,7 @@ export const app = new Elysia()
   .use(setupPlugin)
   .use(authPlugin)
   .use(postsPlugin)
+  .use(usersPlugin)
   .listen(process.env.API_PORT || 8796)
 
 console.info(`Listening on port ${process.env.API_PORT}`)
diff --git a/api/src/routes/index.ts b/api/src/routes/index.ts
index 519d9ff84..e5f19c227 100644
--- a/api/src/routes/index.ts
+++ b/api/src/routes/index.ts
@@ -1,3 +1,4 @@
 export { default as authPlugin } from './auth'
 export { default as postsPlugin } from './posts'
 export { default as setupPlugin } from './setup'
+export { default as usersPlugin } from './users'
diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
new file mode 100644
index 000000000..65eda9595
--- /dev/null
+++ b/api/src/routes/users.ts
@@ -0,0 +1,72 @@
+import { Elysia, t } from 'elysia'
+import setupPlugin from './setup'
+import { decodeWebId, encodeWebId } from '@/util/user'
+import { FollowErrors, PodRequestTypes } from '@/types'
+import { db } from '..'
+import { eq, and } from 'drizzle-orm'
+import { users, followers } from '@/db/schema'
+import ActivityPod from '@/services/ActivityPod'
+
+export default new Elysia({ name: 'user', prefix: '/user' })
+  .use(setupPlugin)
+  .guard({
+    isSignedIn: true
+  })
+  .get(
+    '/:followerWebId/follow',
+    async ({ user, params: { followerWebId }, error }) => {
+      try {
+        // check if user to follow is on memory
+        const webId = encodeWebId(user)
+        if (webId === followerWebId) return error(400, FollowErrors.IsSelf)
+
+        // check if user to follow is on memory
+        const toFollow = await db.select().from(users).where(eq(users.webId, followerWebId)).limit(1)
+        if (toFollow.length === 0) return error(400, FollowErrors.NotOnMemory)
+        const userToFollow = toFollow[0]
+
+        // check if user is already following the user
+        const following = await db
+          .select()
+          .from(followers)
+          .where(and(eq(followers.followerId, user.userId), eq(followers.followedId, userToFollow.id)))
+          .limit(1)
+        if (following.length > 0) return error(400, FollowErrors.AlreadyFollowing)
+
+        // Follow the user
+        const decodedFollowedWebId = decodeWebId(followerWebId)
+        const followedPodProviderWebId = decodedFollowedWebId.endpoint + '/' + decodedFollowedWebId.username
+        await ActivityPod.follow(
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            type: PodRequestTypes.Follow,
+            actor: user.providerWebId,
+            object: followedPodProviderWebId,
+            to: followedPodProviderWebId
+          },
+          user
+        )
+        // add the relationship to the database
+        await db.insert(followers).values({
+          followerId: user.userId,
+          followedId: userToFollow.id
+        })
+
+        return 'Success'
+      } catch (_) {
+        console.log(_)
+        return error(400, FollowErrors.NotValidProvider)
+      }
+    },
+    {
+      isSignedIn: true,
+      detail: 'Follows a user',
+      params: t.Object({
+        followerWebId: t.String()
+      }),
+      response: {
+        200: t.String(),
+        400: t.Enum(FollowErrors)
+      }
+    }
+  )
diff --git a/api/src/types/errors.ts b/api/src/types/errors.ts
new file mode 100644
index 000000000..2cbc02698
--- /dev/null
+++ b/api/src/types/errors.ts
@@ -0,0 +1,6 @@
+export enum FollowErrors {
+  NotOnMemory = 'The user to follow is not on the memory.',
+  NotValidProvider = 'The provider of the user to follow is not a viable pod provider.',
+  AlreadyFollowing = 'User already follows the user.',
+  IsSelf = 'Cannot follow yourself.'
+}

From 3a3bb2a903a15ebd4bed375620ac0a13c06ea869 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Wed, 29 Jan 2025 15:15:47 +0100
Subject: [PATCH 26/56] add routes to got folllowed users and following users

---
 api/src/routes/users.ts    | 51 ++++++++++++++++++++++++++++++++++++--
 api/src/types/responses.ts |  7 ++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 65eda9595..233465869 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -1,7 +1,7 @@
 import { Elysia, t } from 'elysia'
 import setupPlugin from './setup'
 import { decodeWebId, encodeWebId } from '@/util/user'
-import { FollowErrors, PodRequestTypes } from '@/types'
+import { FollowErrors, followersResponse, PodRequestTypes, selectQueryObject, type FollowersResponse } from '@/types'
 import { db } from '..'
 import { eq, and } from 'drizzle-orm'
 import { users, followers } from '@/db/schema'
@@ -12,6 +12,54 @@ export default new Elysia({ name: 'user', prefix: '/user' })
   .guard({
     isSignedIn: true
   })
+  .get(
+    '/following',
+    async ({ user, query: { limit, offset } }) => {
+      const followingResponse = await db
+        .select({
+          id: users.id,
+          username: users.displayName,
+          webId: users.webId
+        })
+        .from(followers)
+        .leftJoin(users, eq(followers.followedId, users.id))
+        .where(eq(followers.followerId, user.userId))
+        .limit(limit)
+        .offset(offset)
+      return followingResponse as FollowersResponse[]
+    },
+    {
+      detail: 'Returns the users the user is following',
+      response: {
+        200: t.Array(followersResponse)
+      },
+      query: selectQueryObject
+    }
+  )
+  .get(
+    '/followers',
+    async ({ user, query: { limit, offset } }) => {
+      const followersResponse = await db
+        .select({
+          id: users.id,
+          username: users.displayName,
+          webId: users.webId
+        })
+        .from(followers)
+        .leftJoin(users, eq(followers.followerId, users.id))
+        .where(eq(followers.followedId, user.userId))
+        .limit(limit)
+        .offset(offset)
+      return followersResponse as FollowersResponse[]
+    },
+    {
+      detail: 'Returns the followers of the user',
+      query: selectQueryObject,
+      response: {
+        200: t.Array(followersResponse)
+      }
+    }
+  )
   .get(
     '/:followerWebId/follow',
     async ({ user, params: { followerWebId }, error }) => {
@@ -59,7 +107,6 @@ export default new Elysia({ name: 'user', prefix: '/user' })
       }
     },
     {
-      isSignedIn: true,
       detail: 'Follows a user',
       params: t.Object({
         followerWebId: t.String()
diff --git a/api/src/types/responses.ts b/api/src/types/responses.ts
index 7f521c3a3..c820e5eee 100644
--- a/api/src/types/responses.ts
+++ b/api/src/types/responses.ts
@@ -32,6 +32,13 @@ export type SignUpBody = Static<typeof signUpBody>
 // Users
 export const selectUser = createSelectSchema(users)
 
+export const followersResponse = t.Object({
+  id: t.Number(),
+  username: t.String(),
+  webId: t.String()
+})
+export type FollowersResponse = Static<typeof followersResponse>
+
 // Posts
 export const selectPost = createSelectSchema(postsView)
 export type SelectPost = {

From 91139b2e8e66270239bba6564f716c254b947c38 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 20:59:48 +0100
Subject: [PATCH 27/56] fix: recreate the right note creation type

---
 api/src/routes/posts.ts      |  6 +++---
 api/src/types/activityPod.ts | 15 +++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/api/src/routes/posts.ts b/api/src/routes/posts.ts
index 787e7aa5a..5b471b320 100644
--- a/api/src/routes/posts.ts
+++ b/api/src/routes/posts.ts
@@ -1,7 +1,7 @@
 import Elysia, { t } from 'elysia'
 import { posts, postsView } from '../db/schema'
 import ActivityPod from '../services/ActivityPod'
-import { _createPost, selectQueryObject, type SelectPost } from '../types'
+import { _createPost, PodRequestTypes, selectQueryObject, type NoteCreateRequest, type SelectPost } from '../types'
 import { db } from '..'
 import setupPlugin from './setup'
 
@@ -18,9 +18,9 @@ const postsRoutes = new Elysia({ name: 'posts', prefix: '/posts' })
       const addressats = [`${user.endpoint}/${user.username}/followers`]
       if (isPublic) addressats.push('https://www.w3.org/ns/activitystreams#Public')
 
-      const post = {
+      const post: NoteCreateRequest = {
         '@context': 'https://www.w3.org/ns/activitystreams',
-        type: 'Note',
+        type: PodRequestTypes.Note,
         attributedTo: `${user.endpoint}/${user.username}`,
         content: content,
         to: addressats
diff --git a/api/src/types/activityPod.ts b/api/src/types/activityPod.ts
index 823d8dd7e..b98fbcd73 100644
--- a/api/src/types/activityPod.ts
+++ b/api/src/types/activityPod.ts
@@ -1,19 +1,26 @@
 export enum PodRequestTypes {
   Follow = 'Follow',
-  Undo = 'Undo'
+  Undo = 'Undo',
+  Note = 'Note'
 }
 
-interface PodRequest<O, T = string> {
+interface BasePodRequest<T> {
   '@context': 'https://www.w3.org/ns/activitystreams'
   type: PodRequestTypes
+  to: T
+}
+
+interface PodRequest<O, T = string> extends BasePodRequest<T> {
   actor: string
   object: O
-  to: T
 }
 
 export type FollowRequest = PodRequest<string>
 export type UnfollowRequest = PodRequest<Omit<FollowRequest, '@context' | 'to'>>
-export type NoteCreateRequest = PodRequest<string, string[]>
+export interface NoteCreateRequest extends BasePodRequest<string[]> {
+  attributedTo: string
+  content: string
+}
 
 export interface PodProviderSignInResponse {
   token: string

From 4072f22617c1357bd69289f04bd2c52de5e7900d Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:00:43 +0100
Subject: [PATCH 28/56] code: make follow creation route post

---
 api/src/routes/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 233465869..c6ad1ba41 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -60,7 +60,7 @@ export default new Elysia({ name: 'user', prefix: '/user' })
       }
     }
   )
-  .get(
+  .post(
     '/:followerWebId/follow',
     async ({ user, params: { followerWebId }, error }) => {
       try {

From 4358d7a584613abcf7c125aa47088d781d548042 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:05:19 +0100
Subject: [PATCH 29/56] code: add documentation for activityPods class

---
 api/src/services/ActivityPod.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index 9c5fc1de1..5b26cd9b2 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -3,6 +3,13 @@ import type { FollowRequest, NoteCreateRequest, PodProviderSignInResponse } from
 import type User from '../decorater/User'
 
 export default abstract class ActivityPod {
+  /**
+   *
+   * @param endpoint - the url of the pod provider
+   * @param username - the username of the user
+   * @param password - the password of the user
+   * @returns
+   */
   static async signIn(endpoint: string, username: string, password: string) {
     const response: PodProviderSignInResponse = await ky
       .post(`${endpoint}/auth/login`, {
@@ -15,6 +22,14 @@ export default abstract class ActivityPod {
     return response
   }
 
+  /**
+   * Singup a user with the provided credentials on the provided pod provider
+   * @param endpoint - the url of the pod provider
+   * @param username - the username of the user
+   * @param password - the password of the user
+   * @param email - the email of the user
+   * @returns the response of the signup request when ther is an error it will throw an error
+   */
   static async signup(endpoint: string, username: string, password: string, email: string) {
     const response: PodProviderSignInResponse = await ky
       .post(`${endpoint}/auth/signup`, {
@@ -28,6 +43,12 @@ export default abstract class ActivityPod {
     return response
   }
 
+  /**
+   * Create a Post (Note)
+   * @param user - the user who is creating the post
+   * @param post - the post to create
+   * @returns the response of the post request when ther is an error it will throw an error
+   */
   static async createPost(user: User, post: NoteCreateRequest) {
     const response = await ky
       .post(`${user.endpoint}/${user.username}/outbox`, {
@@ -40,6 +61,12 @@ export default abstract class ActivityPod {
     return response
   }
 
+  /**
+   * Follows a user
+   * @param {FollowRequest} body - the body of the follow request
+   * @param {User} user - the user who is following
+   * @returns returns the response of the follow request when ther is an error it will throw an error
+   */
   static async follow(body: FollowRequest, user: User) {
     const response = await ky
       .post(`${user.endpoint}/${user.username}/outbox`, {

From bf24f011eb3b0ca823d876737a6b50effba2bf91 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:05:31 +0100
Subject: [PATCH 30/56] code: remove unused import

---
 frontend/src/controller/api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index 2afe8815a..a418062c3 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -1,5 +1,5 @@
 import type { CreatePost, SelectPost, SelectQueryObject, SignInBody, SignInResponse, SignUpBody } from '#api/types'
-import { useAuthStore, type useAuthStore as AuthStore } from '@/stores/authStore'
+import { useAuthStore } from '@/stores/authStore'
 import { ApiErrorsGeneral, ProviderSignInErrors, ProviderSignUpErrors, type ApiErrors } from '@/types'
 import ky, { HTTPError } from 'ky'
 

From 98ddaaaf63f39e80ae4d8db261c496661eeb6198 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:09:51 +0100
Subject: [PATCH 31/56] code: reorder function params to make them more simular

---
 api/src/routes/users.ts         | 17 +++++++----------
 api/src/services/ActivityPod.ts |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index c6ad1ba41..42559a74f 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -84,16 +84,13 @@ export default new Elysia({ name: 'user', prefix: '/user' })
         // Follow the user
         const decodedFollowedWebId = decodeWebId(followerWebId)
         const followedPodProviderWebId = decodedFollowedWebId.endpoint + '/' + decodedFollowedWebId.username
-        await ActivityPod.follow(
-          {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            type: PodRequestTypes.Follow,
-            actor: user.providerWebId,
-            object: followedPodProviderWebId,
-            to: followedPodProviderWebId
-          },
-          user
-        )
+        await ActivityPod.follow(user, {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: PodRequestTypes.Follow,
+          actor: user.providerWebId,
+          object: followedPodProviderWebId,
+          to: followedPodProviderWebId
+        })
         // add the relationship to the database
         await db.insert(followers).values({
           followerId: user.userId,
diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index 5b26cd9b2..1e2766c20 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -63,11 +63,11 @@ export default abstract class ActivityPod {
 
   /**
    * Follows a user
-   * @param {FollowRequest} body - the body of the follow request
    * @param {User} user - the user who is following
+   * @param {FollowRequest} body - the body of the follow request
    * @returns returns the response of the follow request when ther is an error it will throw an error
    */
-  static async follow(body: FollowRequest, user: User) {
+  static async follow(user: User, body: FollowRequest) {
     const response = await ky
       .post(`${user.endpoint}/${user.username}/outbox`, {
         headers: {

From 9411bed1bdf80beba8f5c5bf1180a83aea9fd05e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:55:03 +0100
Subject: [PATCH 32/56] add api route to unfollow a user

---
 api/src/routes/users.ts         | 53 +++++++++++++++++++++++++++++++++
 api/src/services/ActivityPod.ts | 20 ++++++++++++-
 api/src/test/user.test.ts       |  1 +
 api/src/types/errors.ts         |  1 +
 api/src/util/user.ts            |  4 ++-
 5 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 42559a74f..2757d6e5e 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -114,3 +114,56 @@ export default new Elysia({ name: 'user', prefix: '/user' })
       }
     }
   )
+  .delete(
+    '/:followerWebId/unfollow',
+    async ({ params: { followerWebId }, user, error }) => {
+      try {
+        // get the id of the user to unfollow
+        const toUnfollow = await db.select().from(users).where(eq(users.webId, followerWebId)).limit(1)
+        if (toUnfollow.length === 0) return error(400, FollowErrors.NotOnMemory)
+        const userToUnfollow = toUnfollow[0]
+        const webIdToUnfollow = decodeWebId(followerWebId)
+        // check if user is following the user
+        const isFollowing = await db
+          .select()
+          .from(followers)
+          .where(and(eq(followers.followerId, user.userId), eq(followers.followedId, userToUnfollow.id)))
+          .limit(1)
+        if (isFollowing.length === 0) {
+          return error(400, FollowErrors.NotFollowing)
+        }
+
+        // send unfollow request to the pod
+        await ActivityPod.unfollow(user, {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: PodRequestTypes.Undo,
+          actor: user.providerWebId,
+          object: {
+            actor: user.providerWebId,
+            type: PodRequestTypes.Follow,
+            object: webIdToUnfollow.endpointWebId
+          },
+          to: userToUnfollow.webId
+        })
+        // remove the follow from the database
+        await db
+          .delete(followers)
+          .where(and(eq(followers.followerId, user.userId), eq(followers.followedId, userToUnfollow.id)))
+
+        return 'Success'
+      } catch (e) {
+        console.error(e)
+        return error(400, FollowErrors.NotValidProvider)
+      }
+    },
+    {
+      summary: 'Unfollow a user',
+      params: t.Object({
+        followerWebId: t.String()
+      }),
+      response: {
+        200: t.String(),
+        400: t.Enum(FollowErrors)
+      }
+    }
+  )
diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index 1e2766c20..0e8bb2719 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -1,5 +1,5 @@
 import ky from 'ky'
-import type { FollowRequest, NoteCreateRequest, PodProviderSignInResponse } from '../types'
+import type { FollowRequest, NoteCreateRequest, PodProviderSignInResponse, UnfollowRequest } from '../types'
 import type User from '../decorater/User'
 
 export default abstract class ActivityPod {
@@ -78,4 +78,22 @@ export default abstract class ActivityPod {
       .json()
     return response
   }
+
+  /**
+   * Unfollow a User
+   * @param {User} user - the user who is unfollowing
+   * @param {UnfollowRequest} body - the body of the unfollow request
+   * @returns returns the response of the unfollow request when ther is an error it will throw an error
+   */
+  static async unfollow(user: User, body: UnfollowRequest) {
+    const response = await ky
+      .post(`${user.endpoint}/${user.username}/outbox`, {
+        headers: {
+          Authorization: `Bearer ${user.token}`
+        },
+        json: body
+      })
+      .json()
+    return response
+  }
 }
diff --git a/api/src/test/user.test.ts b/api/src/test/user.test.ts
index a91d24429..3c79c4d3b 100644
--- a/api/src/test/user.test.ts
+++ b/api/src/test/user.test.ts
@@ -11,6 +11,7 @@ describe('User Util', () => {
       expect(encoded.username).toBe('test')
       expect(encoded.provider).toBe('memory.')
       expect(encoded.endpoint).toBe('http://localhost:3000')
+      expect(encoded.endpointWebId).toBe('http://localhost:3000/test')
     })
 
     test('decodeWebId - with a not viably pod provider', () => {
diff --git a/api/src/types/errors.ts b/api/src/types/errors.ts
index 2cbc02698..f914c195b 100644
--- a/api/src/types/errors.ts
+++ b/api/src/types/errors.ts
@@ -1,5 +1,6 @@
 export enum FollowErrors {
   NotOnMemory = 'The user to follow is not on the memory.',
+  NotFollowing = 'User is not following the user.',
   NotValidProvider = 'The provider of the user to follow is not a viable pod provider.',
   AlreadyFollowing = 'User already follows the user.',
   IsSelf = 'Cannot follow yourself.'
diff --git a/api/src/util/user.ts b/api/src/util/user.ts
index 1a2595bb7..3d50e21b4 100644
--- a/api/src/util/user.ts
+++ b/api/src/util/user.ts
@@ -10,6 +10,7 @@ export function decodeWebId(webId: string): {
   username: string
   provider: string
   endpoint: string
+  endpointWebId: string
 } {
   const [username, provider] = webId.split('@').slice(1)
 
@@ -18,7 +19,8 @@ export function decodeWebId(webId: string): {
   return {
     username: username,
     provider: provider,
-    endpoint: podProviderEndpoint[provider as ViablePodProvider]
+    endpoint: podProviderEndpoint[provider as ViablePodProvider],
+    endpointWebId: `${podProviderEndpoint[provider as ViablePodProvider]}/${username}`
   }
 }
 

From d634a85666aeeeda6f81f9e947d961d23d52ac51 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 21:59:30 +0100
Subject: [PATCH 33/56] code: make use of providerWebId

---
 api/src/services/ActivityPod.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/services/ActivityPod.ts b/api/src/services/ActivityPod.ts
index 0e8bb2719..bd35d23a5 100644
--- a/api/src/services/ActivityPod.ts
+++ b/api/src/services/ActivityPod.ts
@@ -51,7 +51,7 @@ export default abstract class ActivityPod {
    */
   static async createPost(user: User, post: NoteCreateRequest) {
     const response = await ky
-      .post(`${user.endpoint}/${user.username}/outbox`, {
+      .post(`${user.providerWebId}/outbox`, {
         headers: {
           Authorization: `Bearer ${user.token}`
         },
@@ -69,7 +69,7 @@ export default abstract class ActivityPod {
    */
   static async follow(user: User, body: FollowRequest) {
     const response = await ky
-      .post(`${user.endpoint}/${user.username}/outbox`, {
+      .post(`${user.providerWebId}/outbox`, {
         headers: {
           Authorization: `Bearer ${user.token}`
         },
@@ -87,7 +87,7 @@ export default abstract class ActivityPod {
    */
   static async unfollow(user: User, body: UnfollowRequest) {
     const response = await ky
-      .post(`${user.endpoint}/${user.username}/outbox`, {
+      .post(`${user.providerWebId}/outbox`, {
         headers: {
           Authorization: `Bearer ${user.token}`
         },

From c0d384244ccd82c50bac7f008962e9d6e4f91eeb Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 22:06:51 +0100
Subject: [PATCH 34/56] code: add descriptive comment

---
 api/src/routes/users.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 2757d6e5e..8182a68b7 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -151,8 +151,8 @@ export default new Elysia({ name: 'user', prefix: '/user' })
           .where(and(eq(followers.followerId, user.userId), eq(followers.followedId, userToUnfollow.id)))
 
         return 'Success'
-      } catch (e) {
-        console.error(e)
+      } catch (_) {
+        // this only happens when the decodeWebId throws an error
         return error(400, FollowErrors.NotValidProvider)
       }
     },

From 944bf01f562b512e18273ce6a57f26620bfc632e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Thu, 30 Jan 2025 23:03:13 +0100
Subject: [PATCH 35/56] feat: change styling of postheader

change flex to grid to make it possible to trunacte user webIds
---
 frontend/src/components/PostList.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/PostList.vue b/frontend/src/components/PostList.vue
index 8e7a60736..bb5cec914 100644
--- a/frontend/src/components/PostList.vue
+++ b/frontend/src/components/PostList.vue
@@ -13,13 +13,16 @@ const postsStore = usePostsStore()
       v-for="post in postsStore.posts"
       :key="post.id"
     >
-      <div class="user flex flex-row gap-[var(--gap-default)]">
-        <vs-icon class="h-[27px] w-[27px]" iconName="UserSquare" />
-        <div class="w-full">
+      <div class="user grid grid-cols-7 gap-[var(--gap-default)]">
+        <vs-icon class="col-span-1 h-[27px] w-[27px]" iconName="UserSquare" />
+        <div class="col-span-4">
           <p class="text-footnote font-bold">{{ post.author.name }}</p>
-          <p class="text-caption">{{ post.author.webId }} • {{ DateTime.fromISO(post.createdAt).toRelative() }}</p>
+          <p class="text-caption truncate text-ellipsis">
+            <span>{{ post.author.webId }}</span> •
+            {{ DateTime.fromISO(post.createdAt).toRelative() }}
+          </p>
         </div>
-        <MemoryButton> Follow </MemoryButton>
+        <MemoryButton class="col-span-2">Follow</MemoryButton>
       </div>
       <p>{{ post.content }}</p>
     </div>

From 6152e2dbb9bb1c40a4bc6b8a44d9b569a26f97e3 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:16:13 +0100
Subject: [PATCH 36/56] code: moving handleError to util functions

---
 frontend/src/controller/api.ts | 92 +++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index a418062c3..aa547923c 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -46,6 +46,52 @@ export class ApiClient {
     return this.authStore.token || ''
   }
 
+  /**
+   * Handles errors that are thrown by ky (all responses that are not 200 are handled here)
+   * @param {unknown} e - error that is thrown
+   * @returns ApiResponse<ApiErrors>
+   */
+  async handleError(e: unknown): Promise<ApiResponse<ApiErrors, ResponseErrors>> {
+    if (e instanceof HTTPError) {
+      const errorMessage = await e.response.text()
+      if (e.response.status === 500) {
+        if (ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors]) {
+          return {
+            data: ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors],
+            status: ResponseStatus.BAD_REQUEST
+          }
+        }
+        return {
+          data: ProviderSignUpErrors.providerSignUpDefault,
+          status: ResponseStatus.BAD_REQUEST
+        }
+      } else if (e.response.status === 401) {
+        this.authStore.logout()
+        return {
+          data: ApiErrorsGeneral.unauthorized,
+          status: 401
+        }
+      } else if (e.response.status === 400) {
+        if (ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors]) {
+          return {
+            data: ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors],
+            status: 400
+          }
+        }
+      }
+      console.log('error when requesting api: ', e)
+      console.log(await e.response.text())
+      return {
+        data: ApiErrorsGeneral.default,
+        status: e.response.status
+      }
+    }
+    return {
+      data: ApiErrorsGeneral.default,
+      status: ResponseStatus.SERVER_ERROR
+    }
+  }
+
   // Auth functions
   /**
    * Sign up a new user
@@ -115,50 +161,4 @@ export class ApiClient {
       return await this.handleError(e)
     }
   }
-
-  /**
-   * Handles errors that are thrown by ky (all responses that are not 200 are handled here)
-   * @param {unknown} e - error that is thrown
-   * @returns ApiResponse<ApiErrors>
-   */
-  async handleError(e: unknown): Promise<ApiResponse<ApiErrors, ResponseErrors>> {
-    if (e instanceof HTTPError) {
-      const errorMessage = await e.response.text()
-      if (e.response.status === 500) {
-        if (ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors]) {
-          return {
-            data: ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors],
-            status: ResponseStatus.BAD_REQUEST
-          }
-        }
-        return {
-          data: ProviderSignUpErrors.providerSignUpDefault,
-          status: ResponseStatus.BAD_REQUEST
-        }
-      } else if (e.response.status === 401) {
-        this.authStore.logout()
-        return {
-          data: ApiErrorsGeneral.unauthorized,
-          status: 401
-        }
-      } else if (e.response.status === 400) {
-        if (ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors]) {
-          return {
-            data: ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors],
-            status: 400
-          }
-        }
-      }
-      console.log('error when requesting api: ', e)
-      console.log(await e.response.text())
-      return {
-        data: ApiErrorsGeneral.default,
-        status: e.response.status
-      }
-    }
-    return {
-      data: ApiErrorsGeneral.default,
-      status: ResponseStatus.SERVER_ERROR
-    }
-  }
 }

From 4b11305c244b6c9655c52634989caa301a14527e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:27:39 +0100
Subject: [PATCH 37/56] code: make type for followUnfollow Request

---
 api/src/routes/users.ts    | 13 ++++++++++---
 api/src/types/responses.ts |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 8182a68b7..59f1137dc 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -1,7 +1,14 @@
 import { Elysia, t } from 'elysia'
 import setupPlugin from './setup'
 import { decodeWebId, encodeWebId } from '@/util/user'
-import { FollowErrors, followersResponse, PodRequestTypes, selectQueryObject, type FollowersResponse } from '@/types'
+import {
+  FollowErrors,
+  followersResponse,
+  followUnfollowResponse,
+  PodRequestTypes,
+  selectQueryObject,
+  type FollowersResponse
+} from '@/types'
 import { db } from '..'
 import { eq, and } from 'drizzle-orm'
 import { users, followers } from '@/db/schema'
@@ -109,7 +116,7 @@ export default new Elysia({ name: 'user', prefix: '/user' })
         followerWebId: t.String()
       }),
       response: {
-        200: t.String(),
+        200: followUnfollowResponse,
         400: t.Enum(FollowErrors)
       }
     }
@@ -162,7 +169,7 @@ export default new Elysia({ name: 'user', prefix: '/user' })
         followerWebId: t.String()
       }),
       response: {
-        200: t.String(),
+        200: followUnfollowResponse,
         400: t.Enum(FollowErrors)
       }
     }
diff --git a/api/src/types/responses.ts b/api/src/types/responses.ts
index c820e5eee..8d9427f48 100644
--- a/api/src/types/responses.ts
+++ b/api/src/types/responses.ts
@@ -39,6 +39,9 @@ export const followersResponse = t.Object({
 })
 export type FollowersResponse = Static<typeof followersResponse>
 
+export const followUnfollowResponse = t.String()
+export type FollowUnfollowResponse = Static<typeof followUnfollowResponse>
+
 // Posts
 export const selectPost = createSelectSchema(postsView)
 export type SelectPost = {

From d9e5e1288dfd2b4f04ecb8fcd3b7948bf196a479 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:28:11 +0100
Subject: [PATCH 38/56] code: move errors to api to have them in one place

---
 api/src/types/errors.ts        | 13 +++++++++++++
 frontend/src/controller/api.ts | 13 +++++++++++--
 frontend/src/types/enums.ts    | 20 +++-----------------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/api/src/types/errors.ts b/api/src/types/errors.ts
index f914c195b..47ab290e7 100644
--- a/api/src/types/errors.ts
+++ b/api/src/types/errors.ts
@@ -5,3 +5,16 @@ export enum FollowErrors {
   AlreadyFollowing = 'User already follows the user.',
   IsSelf = 'Cannot follow yourself.'
 }
+
+// Errors that are thrown by the pod provider
+export enum ProviderSignUpErrors {
+  providerSignUpDefault = 'Error while signing up the user',
+  'username.invalid' = 'Username is invalid',
+  'username.already.exists' = 'Username is already taken',
+  'email.invalid' = 'Email is invalid',
+  'email.already.exists' = 'Email is already taken'
+}
+
+export enum ProviderSignInErrors {
+  "Endpoint didn't respond with a 200 status code" = 'Wrong credentials'
+}
diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index aa547923c..cd3ad5a31 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -1,6 +1,15 @@
-import type { CreatePost, SelectPost, SelectQueryObject, SignInBody, SignInResponse, SignUpBody } from '#api/types'
+import type {
+  CreatePost,
+  FollowUnfollowResponse,
+  SelectPost,
+  SelectQueryObject,
+  SignInBody,
+  SignInResponse,
+  SignUpBody
+} from '#api/types'
+import { FollowErrors, ProviderSignInErrors, ProviderSignUpErrors } from '#api/types'
 import { useAuthStore } from '@/stores/authStore'
-import { ApiErrorsGeneral, ProviderSignInErrors, ProviderSignUpErrors, type ApiErrors } from '@/types'
+import { ApiErrorsGeneral, type ApiErrors } from '@/types'
 import ky, { HTTPError } from 'ky'
 
 export enum ResponseStatus {
diff --git a/frontend/src/types/enums.ts b/frontend/src/types/enums.ts
index c6a5143f7..f787eec57 100644
--- a/frontend/src/types/enums.ts
+++ b/frontend/src/types/enums.ts
@@ -1,22 +1,8 @@
-export type ApiErrors = ProviderSignUpErrors | ApiErrorsGeneral | ProviderSignInErrors
+import type { FollowErrors, ProviderSignInErrors, ProviderSignUpErrors } from '#api/types'
+
+export type ApiErrors = ProviderSignUpErrors | ApiErrorsGeneral | ProviderSignInErrors | FollowErrors
 
 export enum ApiErrorsGeneral {
   default = 'Something went wrong',
   unauthorized = 'You are not authorized to perform this action'
 }
-
-export enum ProviderSignUpErrors {
-  providerSignUpDefault = 'Error while signing up the user',
-  'username.invalid' = 'Username is invalid',
-  'username.already.exists' = 'Username is already taken',
-  'email.invalid' = 'Email is invalid',
-  'email.already.exists' = 'Email is already taken'
-}
-
-export enum ProviderSignInErrors {
-  "Endpoint didn't respond with a 200 status code" = 'Wrong credentials'
-}
-
-export enum IconNames {
-  'arrowLeft3' = 'arrow-left-3'
-}

From fc9dcef5568f4f6e7151019ce7fe301866047c68 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:37:00 +0100
Subject: [PATCH 39/56] feat: Follow Request now directly inherits UserTable.

---
 api/src/routes/users.ts    | 24 ++++++++++++++----------
 api/src/types/responses.ts |  8 ++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 59f1137dc..5668e1673 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -3,11 +3,11 @@ import setupPlugin from './setup'
 import { decodeWebId, encodeWebId } from '@/util/user'
 import {
   FollowErrors,
-  followersResponse,
+  followersFollowedResponse,
   followUnfollowResponse,
   PodRequestTypes,
   selectQueryObject,
-  type FollowersResponse
+  type FollowersFollowedResponse
 } from '@/types'
 import { db } from '..'
 import { eq, and } from 'drizzle-orm'
@@ -25,20 +25,22 @@ export default new Elysia({ name: 'user', prefix: '/user' })
       const followingResponse = await db
         .select({
           id: users.id,
-          username: users.displayName,
-          webId: users.webId
+          name: users.name,
+          webId: users.webId,
+          displayName: users.displayName,
+          providerName: users.providerName
         })
         .from(followers)
         .leftJoin(users, eq(followers.followedId, users.id))
         .where(eq(followers.followerId, user.userId))
         .limit(limit)
         .offset(offset)
-      return followingResponse as FollowersResponse[]
+      return followingResponse as FollowersFollowedResponse[]
     },
     {
       detail: 'Returns the users the user is following',
       response: {
-        200: t.Array(followersResponse)
+        200: t.Array(followersFollowedResponse)
       },
       query: selectQueryObject
     }
@@ -49,21 +51,23 @@ export default new Elysia({ name: 'user', prefix: '/user' })
       const followersResponse = await db
         .select({
           id: users.id,
-          username: users.displayName,
-          webId: users.webId
+          name: users.name,
+          webId: users.webId,
+          displayName: users.displayName,
+          providerName: users.providerName
         })
         .from(followers)
         .leftJoin(users, eq(followers.followerId, users.id))
         .where(eq(followers.followedId, user.userId))
         .limit(limit)
         .offset(offset)
-      return followersResponse as FollowersResponse[]
+      return followersResponse as FollowersFollowedResponse[]
     },
     {
       detail: 'Returns the followers of the user',
       query: selectQueryObject,
       response: {
-        200: t.Array(followersResponse)
+        200: t.Array(followersFollowedResponse)
       }
     }
   )
diff --git a/api/src/types/responses.ts b/api/src/types/responses.ts
index 8d9427f48..bc2532536 100644
--- a/api/src/types/responses.ts
+++ b/api/src/types/responses.ts
@@ -32,12 +32,8 @@ export type SignUpBody = Static<typeof signUpBody>
 // Users
 export const selectUser = createSelectSchema(users)
 
-export const followersResponse = t.Object({
-  id: t.Number(),
-  username: t.String(),
-  webId: t.String()
-})
-export type FollowersResponse = Static<typeof followersResponse>
+export const followersFollowedResponse = t.Omit(selectUser, ['email'])
+export type FollowersFollowedResponse = Static<typeof followersFollowedResponse>
 
 export const followUnfollowResponse = t.String()
 export type FollowUnfollowResponse = Static<typeof followUnfollowResponse>

From 18122ab6ff9efe76b04257a31c12c7a23d9ee862 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:42:53 +0100
Subject: [PATCH 40/56] code: remove double apiTypes

---
 frontend/src/stores/authStore.ts |  8 ++++----
 frontend/src/types/api.ts        | 16 ----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/frontend/src/stores/authStore.ts b/frontend/src/stores/authStore.ts
index cc29c1b88..6b6c11cb9 100644
--- a/frontend/src/stores/authStore.ts
+++ b/frontend/src/stores/authStore.ts
@@ -1,13 +1,13 @@
-import type { SignUpBody, SignInResponse, ViablePodProvider } from '#api/types'
+import type { SignUpBody, SignInResponse, ViablePodProvider, SelectUsers } from '#api/types'
 import { ApiClient } from '@/controller/api'
-import type { ApiErrors, User } from '@/types'
+import type { ApiErrors } from '@/types'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 export const useAuthStore = defineStore('auth', () => {
   // Default state
-  const user = ref<User>()
+  const user = ref<SelectUsers>()
   const isLoggedIn = ref<boolean>(false)
   const token = ref<string>('')
   // API
@@ -16,7 +16,7 @@ export const useAuthStore = defineStore('auth', () => {
   const router = useRouter()
 
   // Setters
-  function setUser(newValue: User | undefined) {
+  function setUser(newValue: SelectUsers | undefined) {
     user.value = newValue
     localStorage.setItem('user', JSON.stringify(newValue))
   }
diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts
index 390362d79..e69de29bb 100644
--- a/frontend/src/types/api.ts
+++ b/frontend/src/types/api.ts
@@ -1,16 +0,0 @@
-import type { App } from '#api/index.ts'
-import type { _createUser, _selectUsers, viablePodProviders } from '#api/types'
-import type { Static } from '@sinclair/typebox'
-
-// Enums
-export type ProviderEndpoints = Static<typeof viablePodProviders>
-
-// Table entries
-export type User = Static<typeof _selectUsers>
-
-// Create Objects
-export type CreateUser = Static<typeof _createUser>
-
-// Route Responses
-
-export type { App }

From 5ced2b537b4da8a127e634b41e42627b333298b9 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 10:44:29 +0100
Subject: [PATCH 41/56] code: move types to api file

---
 frontend/src/controller/api.ts | 27 ++++++++-------------------
 frontend/src/types/api.ts      | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index cd3ad5a31..fb7253832 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -9,27 +9,16 @@ import type {
 } from '#api/types'
 import { FollowErrors, ProviderSignInErrors, ProviderSignUpErrors } from '#api/types'
 import { useAuthStore } from '@/stores/authStore'
-import { ApiErrorsGeneral, type ApiErrors } from '@/types'
+import {
+  ApiErrorsGeneral,
+  ResponseStatus,
+  type ApiErrors,
+  type ApiResponse,
+  type DetailedApiResponse,
+  type ResponseErrors
+} from '@/types'
 import ky, { HTTPError } from 'ky'
 
-export enum ResponseStatus {
-  OK = 200,
-  UNAUTHORIZED = 401,
-  BAD_REQUEST = 400,
-  SERVER_ERROR = 500
-}
-
-export type ResponseErrors = ResponseStatus.UNAUTHORIZED | ResponseStatus.BAD_REQUEST | ResponseStatus.SERVER_ERROR
-
-export type ResponseSuccess = ResponseStatus.OK
-
-export interface ApiResponse<T, S extends ResponseStatus = ResponseStatus> {
-  data: T
-  status: S
-}
-
-export type DetailedApiResponse<T> = ApiResponse<ApiErrors, ResponseErrors> | ApiResponse<T, ResponseSuccess>
-
 /**
  * ApiClient is a class that handles all requests to the api and handles non 200 responses
  */
diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts
index e69de29bb..05816b989 100644
--- a/frontend/src/types/api.ts
+++ b/frontend/src/types/api.ts
@@ -0,0 +1,19 @@
+import type { ApiErrors } from './enums'
+
+export enum ResponseStatus {
+  OK = 200,
+  UNAUTHORIZED = 401,
+  BAD_REQUEST = 400,
+  SERVER_ERROR = 500
+}
+
+export type ResponseErrors = ResponseStatus.UNAUTHORIZED | ResponseStatus.BAD_REQUEST | ResponseStatus.SERVER_ERROR
+
+export type ResponseSuccess = ResponseStatus.OK
+
+export interface ApiResponse<T, S extends ResponseStatus = ResponseStatus> {
+  data: T
+  status: S
+}
+
+export type DetailedApiResponse<T> = ApiResponse<ApiErrors, ResponseErrors> | ApiResponse<T, ResponseSuccess>

From e544ddb8f082b630015e9493ba97d2769f01deec Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:03:28 +0100
Subject: [PATCH 42/56] feat: add store that hold followers and following users

---
 frontend/src/controller/api.ts   | 77 ++++++++++++++++++++++++++++++++
 frontend/src/stores/userStore.ts | 68 ++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 frontend/src/stores/userStore.ts

diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index fb7253832..5b693ac60 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -1,5 +1,6 @@
 import type {
   CreatePost,
+  FollowersFollowedResponse,
   FollowUnfollowResponse,
   SelectPost,
   SelectQueryObject,
@@ -53,6 +54,7 @@ export class ApiClient {
     if (e instanceof HTTPError) {
       const errorMessage = await e.response.text()
       if (e.response.status === 500) {
+        // SignUp Errors
         if (ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors]) {
           return {
             data: ProviderSignUpErrors[errorMessage as keyof typeof ProviderSignUpErrors],
@@ -70,12 +72,20 @@ export class ApiClient {
           status: 401
         }
       } else if (e.response.status === 400) {
+        // SignIn Errors
         if (ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors]) {
           return {
             data: ProviderSignInErrors[errorMessage as keyof typeof ProviderSignInErrors],
             status: 400
           }
         }
+        // Follow/UnfollowErrors
+        else if (FollowErrors[errorMessage as keyof typeof FollowErrors]) {
+          return {
+            data: FollowErrors[errorMessage as keyof typeof FollowErrors],
+            status: 400
+          }
+        }
       }
       console.log('error when requesting api: ', e)
       console.log(await e.response.text())
@@ -159,4 +169,71 @@ export class ApiClient {
       return await this.handleError(e)
     }
   }
+
+  // User functions
+  /**
+   * Follows a user
+   * @param {string} userId - id of the user to follow
+   * @returns {Promise<ApiResponse>} - response of the request
+   */
+  async followUser(userId: string): Promise<DetailedApiResponse<string>> {
+    try {
+      const response = await this.authRequest.post<FollowUnfollowResponse>(`${this.baseUrl}/users/${userId}/follow`)
+      return {
+        data: await response.text(),
+        status: response.status
+      }
+    } catch (e) {
+      return await this.handleError(e)
+    }
+  }
+
+  /**
+   * Unfollow a user
+   * @param {string} userId - id of the user to unfollow
+   * @returns {Promise<DetailedApiResponse<string>>}
+   */
+  async unfollowUser(userId: string): Promise<DetailedApiResponse<string>> {
+    try {
+      const response = await this.authRequest.post<string>(`${this.baseUrl}/users/${userId}/unfollow`)
+      return {
+        data: await response.text(),
+        status: response.status
+      }
+    } catch (e) {
+      return await this.handleError(e)
+    }
+  }
+
+  /**
+   * Fetches the users that the user is following
+   * @returns {Promise<DetailedApiResponse<FollowersFollowedResponse[]>>}
+   */
+  async fetchFollowing(): Promise<DetailedApiResponse<FollowersFollowedResponse[]>> {
+    try {
+      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/users/following`)
+      return {
+        data: await response.json(),
+        status: response.status
+      }
+    } catch (e) {
+      return await this.handleError(e)
+    }
+  }
+
+  /**
+   * Fetches the users that the user is following
+   * @returns {Promise<DetailedApiResponse<FollowersFollowedResponse[]>>}
+   */
+  async fetchFollowers(): Promise<DetailedApiResponse<FollowersFollowedResponse[]>> {
+    try {
+      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/users/followers`)
+      return {
+        data: await response.json(),
+        status: response.status
+      }
+    } catch (e) {
+      return await this.handleError(e)
+    }
+  }
 }
diff --git a/frontend/src/stores/userStore.ts b/frontend/src/stores/userStore.ts
new file mode 100644
index 000000000..3bcbfdae2
--- /dev/null
+++ b/frontend/src/stores/userStore.ts
@@ -0,0 +1,68 @@
+import type { FollowersFollowedResponse } from '#api/types'
+import { ApiClient } from '@/controller/api'
+import { ResponseStatus } from '@/types'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+/**
+ * Store handeling all things user related
+ */
+export const useUserStore = defineStore('user', async () => {
+  const client = new ApiClient()
+
+  // store vars
+  const following = ref<FollowersFollowedResponse[]>([])
+  const followers = ref<FollowersFollowedResponse[]>([])
+
+  /**
+   * Follows a user
+   * @param userWebId - webId of the user to follow
+   */
+  async function followUser(userWebId: string) {
+    await client.followUser(userWebId)
+  }
+
+  async function unfollowUser(userWebId: string) {
+    await client.unfollowUser(userWebId)
+  }
+
+  /**
+   * Get all the users that the current user is following
+   * @returns {Promise<void>}
+   */
+  async function getFollowing(): Promise<void> {
+    const response = await client.fetchFollowing()
+
+    if (response.status === ResponseStatus.OK) {
+      following.value = response.data
+    } else {
+      console.error('Error when fetching following: ', response.data)
+    }
+  }
+
+  /**
+   * Get all the users that follow the current user
+   */
+  async function getFollowers(): Promise<void> {
+    const response = await client.fetchFollowers()
+
+    if (response.status === ResponseStatus.OK) {
+      followers.value = response.data
+    } else {
+      console.error('Error when fetching followers: ', response.data)
+    }
+  }
+
+  // Init
+  await getFollowing()
+  await getFollowers()
+
+  return {
+    following,
+    followers,
+    getFollowing,
+    getFollowers,
+    followUser,
+    unfollowUser
+  }
+})

From 2eb1d73a343ec19651c3590b6f97eaff8fa37ce3 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:49:02 +0100
Subject: [PATCH 43/56] code: add linting command to api and exclude build dirs

---
 api/package.json          |  5 ++++-
 frontend/eslint.config.js | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/api/package.json b/api/package.json
index 70de621a9..20c60a50d 100644
--- a/api/package.json
+++ b/api/package.json
@@ -8,7 +8,10 @@
     "test": "bun test",
     "drizzle:push": "drizzle-kit push",
     "drizzle:migrate": "drizzle-kit migrate",
-    "drizzle:generate": "drizzle-kit generate"
+    "drizzle:generate": "drizzle-kit generate",
+    "lint": "bunx eslint src",
+    "lint:fix": "bunx eslint --fix src",
+    "format": "bunx prettier src --write"
   },
   "type": "module",
   "devDependencies": {
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
index 84b2cefa0..05b93c3bc 100644
--- a/frontend/eslint.config.js
+++ b/frontend/eslint.config.js
@@ -11,20 +11,20 @@ import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
 export default defineConfigWithVueTs(
   {
     name: 'app/files-to-lint',
-    files: ['**/*.{ts,mts,tsx,vue}'],
+    files: ['**/*.{ts,mts,tsx,vue}']
   },
 
   {
     name: 'app/files-to-ignore',
-    ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'],
+    ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', '**/ios/**', '**/android/**']
   },
 
   pluginVue.configs['flat/essential'],
   vueTsConfigs.recommended,
-  
+
   {
     ...pluginVitest.configs.recommended,
-    files: ['src/**/__tests__/*'],
+    files: ['src/**/__tests__/*']
   },
-  skipFormatting,
+  skipFormatting
 )

From 5a4c9955365995e46620e380a53d75e606900fae Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:50:11 +0100
Subject: [PATCH 44/56] feat: make follow and unfollow request return user

---
 api/src/routes/users.ts    | 23 ++++++++++++++++++-----
 api/src/types/responses.ts |  3 ---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/api/src/routes/users.ts b/api/src/routes/users.ts
index 5668e1673..8b2184321 100644
--- a/api/src/routes/users.ts
+++ b/api/src/routes/users.ts
@@ -4,7 +4,6 @@ import { decodeWebId, encodeWebId } from '@/util/user'
 import {
   FollowErrors,
   followersFollowedResponse,
-  followUnfollowResponse,
   PodRequestTypes,
   selectQueryObject,
   type FollowersFollowedResponse
@@ -108,7 +107,14 @@ export default new Elysia({ name: 'user', prefix: '/user' })
           followedId: userToFollow.id
         })
 
-        return 'Success'
+        const returnObject: FollowersFollowedResponse = {
+          id: userToFollow.id,
+          name: userToFollow.name,
+          webId: userToFollow.webId,
+          displayName: userToFollow.displayName,
+          providerName: userToFollow.providerName
+        }
+        return returnObject
       } catch (_) {
         console.log(_)
         return error(400, FollowErrors.NotValidProvider)
@@ -120,7 +126,7 @@ export default new Elysia({ name: 'user', prefix: '/user' })
         followerWebId: t.String()
       }),
       response: {
-        200: followUnfollowResponse,
+        200: followersFollowedResponse,
         400: t.Enum(FollowErrors)
       }
     }
@@ -161,7 +167,14 @@ export default new Elysia({ name: 'user', prefix: '/user' })
           .delete(followers)
           .where(and(eq(followers.followerId, user.userId), eq(followers.followedId, userToUnfollow.id)))
 
-        return 'Success'
+        const returnObject: FollowersFollowedResponse = {
+          id: userToUnfollow.id,
+          name: userToUnfollow.name,
+          webId: userToUnfollow.webId,
+          displayName: userToUnfollow.displayName,
+          providerName: userToUnfollow.providerName
+        }
+        return returnObject
       } catch (_) {
         // this only happens when the decodeWebId throws an error
         return error(400, FollowErrors.NotValidProvider)
@@ -173,7 +186,7 @@ export default new Elysia({ name: 'user', prefix: '/user' })
         followerWebId: t.String()
       }),
       response: {
-        200: followUnfollowResponse,
+        200: followersFollowedResponse,
         400: t.Enum(FollowErrors)
       }
     }
diff --git a/api/src/types/responses.ts b/api/src/types/responses.ts
index bc2532536..458e9344d 100644
--- a/api/src/types/responses.ts
+++ b/api/src/types/responses.ts
@@ -35,9 +35,6 @@ export const selectUser = createSelectSchema(users)
 export const followersFollowedResponse = t.Omit(selectUser, ['email'])
 export type FollowersFollowedResponse = Static<typeof followersFollowedResponse>
 
-export const followUnfollowResponse = t.String()
-export type FollowUnfollowResponse = Static<typeof followUnfollowResponse>
-
 // Posts
 export const selectPost = createSelectSchema(postsView)
 export type SelectPost = {

From 1228757d12c018afe3db91fa9c5e56407a8b9dd5 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:50:38 +0100
Subject: [PATCH 45/56] code: make user icon logout for dev

---
 frontend/src/components/BottomBar.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/BottomBar.vue b/frontend/src/components/BottomBar.vue
index ff594e903..994a0ed1d 100644
--- a/frontend/src/components/BottomBar.vue
+++ b/frontend/src/components/BottomBar.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
+import { useAuthStore } from '@/stores/authStore'
 import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
 const router = useRouter()
+
+const authStore = useAuthStore()
 </script>
 
 <template>
@@ -23,7 +26,7 @@ const router = useRouter()
       <vs-icon iconName="Messages2" />
     </div>
     <div>
-      <vs-icon iconName="UserSquare" />
+      <vs-icon iconName="UserSquare" @click="authStore.logout()" />
     </div>
   </div>
 </template>

From e9aa891e9f4b259536a0f2663c29dd33df5ff755 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:51:06 +0100
Subject: [PATCH 46/56] feat: make apirequest work with new responses

---
 frontend/src/controller/api.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/src/controller/api.ts b/frontend/src/controller/api.ts
index 5b693ac60..6e9372855 100644
--- a/frontend/src/controller/api.ts
+++ b/frontend/src/controller/api.ts
@@ -1,7 +1,6 @@
 import type {
   CreatePost,
   FollowersFollowedResponse,
-  FollowUnfollowResponse,
   SelectPost,
   SelectQueryObject,
   SignInBody,
@@ -176,11 +175,11 @@ export class ApiClient {
    * @param {string} userId - id of the user to follow
    * @returns {Promise<ApiResponse>} - response of the request
    */
-  async followUser(userId: string): Promise<DetailedApiResponse<string>> {
+  async followUser(userId: string): Promise<DetailedApiResponse<FollowersFollowedResponse>> {
     try {
-      const response = await this.authRequest.post<FollowUnfollowResponse>(`${this.baseUrl}/users/${userId}/follow`)
+      const response = await this.authRequest.post<FollowersFollowedResponse>(`${this.baseUrl}/user/${userId}/follow`)
       return {
-        data: await response.text(),
+        data: await response.json(),
         status: response.status
       }
     } catch (e) {
@@ -193,11 +192,11 @@ export class ApiClient {
    * @param {string} userId - id of the user to unfollow
    * @returns {Promise<DetailedApiResponse<string>>}
    */
-  async unfollowUser(userId: string): Promise<DetailedApiResponse<string>> {
+  async unfollowUser(userId: string): Promise<DetailedApiResponse<FollowersFollowedResponse>> {
     try {
-      const response = await this.authRequest.post<string>(`${this.baseUrl}/users/${userId}/unfollow`)
+      const response = await this.authRequest.post<FollowersFollowedResponse>(`${this.baseUrl}/user/${userId}/unfollow`)
       return {
-        data: await response.text(),
+        data: await response.json(),
         status: response.status
       }
     } catch (e) {
@@ -211,7 +210,7 @@ export class ApiClient {
    */
   async fetchFollowing(): Promise<DetailedApiResponse<FollowersFollowedResponse[]>> {
     try {
-      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/users/following`)
+      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/user/following`)
       return {
         data: await response.json(),
         status: response.status
@@ -227,7 +226,7 @@ export class ApiClient {
    */
   async fetchFollowers(): Promise<DetailedApiResponse<FollowersFollowedResponse[]>> {
     try {
-      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/users/followers`)
+      const response = await this.authRequest.get<FollowersFollowedResponse[]>(`${this.baseUrl}/user/followers`)
       return {
         data: await response.json(),
         status: response.status

From 8aa978a63f694d91b083f2c0c9b63f7faae6c300 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:54:19 +0100
Subject: [PATCH 47/56] feat: make it possible to follow user

---
 frontend/src/components/PostList.vue |  6 ++++-
 frontend/src/stores/userStore.ts     | 39 +++++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/PostList.vue b/frontend/src/components/PostList.vue
index bb5cec914..829434ee6 100644
--- a/frontend/src/components/PostList.vue
+++ b/frontend/src/components/PostList.vue
@@ -2,8 +2,10 @@
 import { usePostsStore } from '@/stores/postsStore'
 import { DateTime } from 'luxon'
 import MemoryButton from './MemoryButton.vue'
+import { useUserStore } from '@/stores/userStore'
 
 const postsStore = usePostsStore()
+const userStore = useUserStore()
 </script>
 
 <template>
@@ -22,7 +24,9 @@ const postsStore = usePostsStore()
             {{ DateTime.fromISO(post.createdAt).toRelative() }}
           </p>
         </div>
-        <MemoryButton class="col-span-2">Follow</MemoryButton>
+        <div class="col-span-2" v-if="userStore.canFollow(post.author.webId)">
+          <MemoryButton @click="userStore.followUser(post.author.webId)">Follow</MemoryButton>
+        </div>
       </div>
       <p>{{ post.content }}</p>
     </div>
diff --git a/frontend/src/stores/userStore.ts b/frontend/src/stores/userStore.ts
index 3bcbfdae2..b62485c45 100644
--- a/frontend/src/stores/userStore.ts
+++ b/frontend/src/stores/userStore.ts
@@ -3,12 +3,15 @@ import { ApiClient } from '@/controller/api'
 import { ResponseStatus } from '@/types'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
+import { useAuthStore } from './authStore'
+import { VsNotification } from 'vuesax-alpha'
 
 /**
  * Store handeling all things user related
  */
-export const useUserStore = defineStore('user', async () => {
+export const useUserStore = defineStore('user', () => {
   const client = new ApiClient()
+  const authStore = useAuthStore()
 
   // store vars
   const following = ref<FollowersFollowedResponse[]>([])
@@ -19,7 +22,22 @@ export const useUserStore = defineStore('user', async () => {
    * @param userWebId - webId of the user to follow
    */
   async function followUser(userWebId: string) {
-    await client.followUser(userWebId)
+    const response = await client.followUser(userWebId)
+    if (response.status === ResponseStatus.OK) {
+      following.value.push(response.data)
+      VsNotification({
+        title: `You are now following ${response.data.name}`,
+        content: '',
+        color: 'success'
+      })
+    } else {
+      console.error('Error when following user: ', response.data)
+      VsNotification({
+        title: 'Error while following user',
+        content: response.data,
+        color: 'danger'
+      })
+    }
   }
 
   async function unfollowUser(userWebId: string) {
@@ -53,9 +71,21 @@ export const useUserStore = defineStore('user', async () => {
     }
   }
 
+  /**
+   * Check if the current user can follow the user
+   * @param {string} userWebId - webId of the user to check
+   * @returns {boolean} - true if the user can follow the user, false if not
+   */
+  function canFollow(userWebId: string): boolean {
+    // check if the user is the current user
+    if (userWebId === authStore.user?.webId) return false
+    // check if the user is already following the user
+    return following.value.find(user => user.webId === userWebId) === undefined
+  }
+
   // Init
-  await getFollowing()
-  await getFollowers()
+  getFollowing()
+  getFollowers()
 
   return {
     following,
@@ -63,6 +93,7 @@ export const useUserStore = defineStore('user', async () => {
     getFollowing,
     getFollowers,
     followUser,
+    canFollow,
     unfollowUser
   }
 })

From 061d58a60f0df7fd789b24ef769286432467e2b7 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 11:54:32 +0100
Subject: [PATCH 48/56] code: remove unused import

---
 frontend/src/main.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index d00c70b67..39227b087 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -2,7 +2,6 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import Vuesax from 'vuesax-alpha'
 import VueSaxIcon from '@/components/VueSaxIcon.vue'
-import { VsxIcon } from 'vue-iconsax'
 
 import App from './App.vue'
 import router from './router'

From b2126fbec36d8e04970b8480bdf3fba63bc206d2 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:02:17 +0100
Subject: [PATCH 49/56] code: make scripts more descriptive

---
 frontend/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 72a60d4fe..9a0b7cbab 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,7 +10,8 @@
     "test:unit": "vitest",
     "build-only": "vite build",
     "type-check": "vue-tsc --build",
-    "lint": "eslint . --fix",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "format": "prettier --write src/",
     "sync": "cap sync",
     "open:android": "cap open android",

From 541b9b1f769f5a5b5d7e8d3ab52660bcd1dcdc88 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:10:42 +0100
Subject: [PATCH 50/56] code: format file with prettier

---
 frontend/src/assets/fonts/Butler/index.css | 78 ++++++++++++----------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/frontend/src/assets/fonts/Butler/index.css b/frontend/src/assets/fonts/Butler/index.css
index 28340bc18..18e3618cb 100644
--- a/frontend/src/assets/fonts/Butler/index.css
+++ b/frontend/src/assets/fonts/Butler/index.css
@@ -1,56 +1,62 @@
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-UltraLight.woff2') format('woff2'),
-        url('Butler-UltraLight.woff') format('woff');
-    font-weight: 200;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-UltraLight.woff2') format('woff2'),
+    url('Butler-UltraLight.woff') format('woff');
+  font-weight: 200;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-Medium.woff2') format('woff2'),
-        url('Butler-Medium.woff') format('woff');
-    font-weight: 500;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-Medium.woff2') format('woff2'),
+    url('Butler-Medium.woff') format('woff');
+  font-weight: 500;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-Light.woff2') format('woff2'),
-        url('Butler-Light.woff') format('woff');
-    font-weight: 300;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-Light.woff2') format('woff2'),
+    url('Butler-Light.woff') format('woff');
+  font-weight: 300;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-Black.woff2') format('woff2'),
-        url('Butler-Black.woff') format('woff');
-    font-weight: 900;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-Black.woff2') format('woff2'),
+    url('Butler-Black.woff') format('woff');
+  font-weight: 900;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-Bold.woff2') format('woff2'),
-        url('Butler-Bold.woff') format('woff');
-    font-weight: bold;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-Bold.woff2') format('woff2'),
+    url('Butler-Bold.woff') format('woff');
+  font-weight: bold;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler-ExtraBold.woff2') format('woff2'),
-        url('Butler-ExtraBold.woff') format('woff');
-    font-weight: 800;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler-ExtraBold.woff2') format('woff2'),
+    url('Butler-ExtraBold.woff') format('woff');
+  font-weight: 800;
+  font-style: normal;
 }
 
 @font-face {
-    font-family: 'Butler';
-    src: url('Butler.woff2') format('woff2'),
-        url('Butler.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
+  font-family: 'Butler';
+  src:
+    url('Butler.woff2') format('woff2'),
+    url('Butler.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
 }
-

From 235bfcb30eab3ec402316bfda158dcf55f5de95c Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:15:29 +0100
Subject: [PATCH 51/56] feat: add action to test for eslint, prettier and test
 compliance

---
 .github/workflows/check.yml | 34 ++++++++++++++++++++++++++++++++++
 api/package.json            |  3 ++-
 frontend/package.json       |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/check.yml

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
new file mode 100644
index 000000000..617114dd6
--- /dev/null
+++ b/.github/workflows/check.yml
@@ -0,0 +1,34 @@
+name: checks
+
+on:
+  pull_request:
+    branches:
+      - master
+      - dev
+  push:
+    branches:
+      - master
+
+jobs:
+  linting:
+    name: linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+
+      # run eslint and prettier on the frontend and api
+      - run: bun install && bun lint && bun format --check
+        working-directory: ./frontend
+      - run: bun install && bunx eslint .
+        working-directory: ./api
+  testing:
+    name: testing
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+
+      # run tests on the api
+      - run: bun install && bun test
+        working-directory: ./api
diff --git a/api/package.json b/api/package.json
index 20c60a50d..d8d40b393 100644
--- a/api/package.json
+++ b/api/package.json
@@ -11,7 +11,8 @@
     "drizzle:generate": "drizzle-kit generate",
     "lint": "bunx eslint src",
     "lint:fix": "bunx eslint --fix src",
-    "format": "bunx prettier src --write"
+    "format": "bunx prettier src/ --write",
+    "format:check": "prettier --check src/"
   },
   "type": "module",
   "devDependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 9a0b7cbab..c5a768a04 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,6 +13,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier --write src/",
+    "format:check": "prettier --check src/",
     "sync": "cap sync",
     "open:android": "cap open android",
     "open:ios": "cap open ios"

From 04275c125d9f96d29c360bf5aed9a5a70eb5d7f9 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:27:27 +0100
Subject: [PATCH 52/56] fix: make scripts check all files in folder

---
 api/package.json      | 8 ++++----
 frontend/package.json | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/package.json b/api/package.json
index d8d40b393..124430a80 100644
--- a/api/package.json
+++ b/api/package.json
@@ -9,10 +9,10 @@
     "drizzle:push": "drizzle-kit push",
     "drizzle:migrate": "drizzle-kit migrate",
     "drizzle:generate": "drizzle-kit generate",
-    "lint": "bunx eslint src",
-    "lint:fix": "bunx eslint --fix src",
-    "format": "bunx prettier src/ --write",
-    "format:check": "prettier --check src/"
+    "lint": "bunx eslint .",
+    "lint:fix": "bunx eslint --fix .",
+    "format": "bunx prettier . --write",
+    "format:check": "prettier --check ."
   },
   "type": "module",
   "devDependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index c5a768a04..84e2d7d15 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,8 +12,8 @@
     "type-check": "vue-tsc --build",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "format": "prettier --write src/",
-    "format:check": "prettier --check src/",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "sync": "cap sync",
     "open:android": "cap open android",
     "open:ios": "cap open ios"

From aba1bc052ca4bd15decd9ae0515766a93a85b0ee Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:28:01 +0100
Subject: [PATCH 53/56] fix: make eslint and prettier ignore build files

---
 api/eslint.config.js     | 4 ++++
 frontend/.prettierignore | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 frontend/.prettierignore

diff --git a/api/eslint.config.js b/api/eslint.config.js
index 309fdf527..5ea76bc09 100644
--- a/api/eslint.config.js
+++ b/api/eslint.config.js
@@ -8,6 +8,10 @@ export default [
   { languageOptions: { globals: globals.browser } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
+  {
+    name: 'app/files-to-ignore',
+    ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', 'pm2.config.js']
+  },
   {
     rules: {
       'no-unused-vars': ['off'],
diff --git a/frontend/.prettierignore b/frontend/.prettierignore
new file mode 100644
index 000000000..5cff45b98
--- /dev/null
+++ b/frontend/.prettierignore
@@ -0,0 +1,2 @@
+**/ios/**
+**/android/**
\ No newline at end of file

From 55a9c2cfdc45cd4162fa6d1cf14fe84fd192373e Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:28:12 +0100
Subject: [PATCH 54/56] code: run prettier

---
 frontend/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/index.html b/frontend/index.html
index 9e5fc8f06..9d30802cd 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="">
   <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite App</title>
   </head>
   <body>

From fe0230e788a457d223e198fbca543ee8e1c93f03 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:28:32 +0100
Subject: [PATCH 55/56] fix: make action use the bun scripts

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 617114dd6..90b782501 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -18,9 +18,9 @@ jobs:
       - uses: oven-sh/setup-bun@v2
 
       # run eslint and prettier on the frontend and api
-      - run: bun install && bun lint && bun format --check
+      - run: bun install && bun lint && bun format:check
         working-directory: ./frontend
-      - run: bun install && bunx eslint .
+      - run: bun install && bunx format:check
         working-directory: ./api
   testing:
     name: testing

From 5d16c124601278ebcd2e56d14ee5c4aa27606ad0 Mon Sep 17 00:00:00 2001
From: Clara <honjes@protonmail.com>
Date: Fri, 31 Jan 2025 12:29:18 +0100
Subject: [PATCH 56/56] fix: typo

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 90b782501..465ac8e27 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -20,7 +20,7 @@ jobs:
       # run eslint and prettier on the frontend and api
       - run: bun install && bun lint && bun format:check
         working-directory: ./frontend
-      - run: bun install && bunx format:check
+      - run: bun install && bun format:check
         working-directory: ./api
   testing:
     name: testing