Merge branch '1810-user-follow' into 'develop'

draft : User follow with trackfavorite activity

Closes #1810

See merge request funkwhale/funkwhale!2774

api/Dockerfile

@@ -39,7 +39,7 @@ RUN set -eux; \
   zlib-dev \
   py3-cryptography=41.0.7-r0 \
   py3-lxml=4.9.3-r1 \
-  py3-pillow=10.2.0-r0 \
+  py3-pillow=10.3.0-r0 \
   py3-psycopg2=2.9.9-r0 \
   py3-watchfiles=0.19.0-r1 \
   python3-dev
@@ -99,7 +99,7 @@ RUN set -eux; \
   libxslt \
   py3-cryptography=41.0.7-r0 \
   py3-lxml=4.9.3-r1 \
-  py3-pillow=10.2.0-r0 \
+  py3-pillow=10.3.0-r0 \
   py3-psycopg2=2.9.9-r0 \
   py3-watchfiles=0.19.0-r1 \
   python3 \

front/package.json

@@ -73,7 +73,7 @@
     "@types/semantic-ui": "2.2.9",
     "@types/showdown": "2.0.6",
     "@types/vue-virtual-scroller": "npm:@earltp/vue-virtual-scroller",
-    "@typescript-eslint/eslint-plugin": "6.20.0",
+    "@typescript-eslint/eslint-plugin": "7.1.0",
     "@vitejs/plugin-vue": "5.0.3",
     "@vitest/coverage-v8": "1.3.1",
     "@vue-macros/volar": "0.13.3",
@@ -81,30 +81,31 @@
     "@vue/eslint-config-standard": "8.0.1",
     "@vue/eslint-config-typescript": "12.0.0",
     "@vue/test-utils": "2.2.7",
-    "@vue/tsconfig": "0.1.3",
+    "@vue/tsconfig": "0.5.1",
     "cypress": "13.6.4",
-    "eslint": "8.30.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-html": "7.1.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint": "8.57.0",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-html": "8.0.0",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-vue": "9.8.0",
+    "eslint-plugin-vue": "9.22.0",
     "jsdom": "24.0.0",
-    "jsonc-eslint-parser": "2.1.0",
+    "jsonc-eslint-parser": "2.4.0",
     "msw": "2.2.1",
     "msw-auto-mock": "0.18.0",
+    "patch-package": "8.0.0",
     "rollup-plugin-visualizer": "5.9.0",
     "sass": "1.57.1",
     "sinon": "15.0.2",
     "standardized-audio-context-mock": "9.6.32",
-    "typescript": "4.9.5",
+    "typescript": "5.3.3",
     "unplugin-vue-macros": "2.4.6",
     "utility-types": "3.10.0",
     "vite": "5.1.3",
     "vitest": "1.3.1",
-    "vue-tsc": "1.6.5",
+    "vue-tsc": "1.8.27",
     "workbox-core": "6.5.4",
     "workbox-precaching": "6.5.4",
     "workbox-routing": "6.5.4",

front/src/components/common/HumanDate.vue

@@ -13,13 +13,14 @@ const props = withDefaults(defineProps<Props>(), {
 })
 
 const date = computed(() => new Date(props.date))
+
 // TODO (wvffle): Translate useTimeAgo
 const realDate = useTimeAgo(date)
 </script>
 
 <template>
   <time
-    :datetime="date"
+    :datetime="date.toString()"
     :title="momentFormat(date)"
   >
     <i

front/src/locales/nl.json

@@ -3203,6 +3203,7 @@
       "allow": "Toelaten",
       "deny": "Afwijzen",
       "funkwhaleInstance": "Officiële Glitchtip server van Funkwhale",
+      "message": "De stacksporen zullen gedeeld worden naar { 0 } om ons te helpen begrijpen waarom en hoe deze fout is gebeurd.",
       "title": "Om de kwaliteit van onze diensten te verbeteren, zouden we informatie willen verzamelen van de crashes die gebeuren tijdens jouw sessie."
     },
     "serviceWorker": {
@@ -3214,6 +3215,28 @@
     }
   },
   "views": {
+    "ChooseInstance": {
+      "button": {
+        "submit": "Indienen"
+      },
+      "header": {
+        "chooseInstance": "Kies je server",
+        "failure": "Het is niet mogelijk om verbinding te maken met de opgegeven URL",
+        "suggestions": "Aanbevelingen"
+      },
+      "help": {
+        "notFunkwhaleServer": "Het opgegeven adres is geen Funkwhale-server",
+        "selectPod": "Selecteer met welke Funkwhale-server je wil verbinden. Voer zelf de URL in, of kies een van de suggesties.",
+        "serverDown": "De server is mogelijk niet beschikbaar"
+      },
+      "label": {
+        "url": "Server-URL"
+      },
+      "message": {
+        "currentConnection": "U bent nu verbonden met { 0 }. Als je doorgaat wordt je verbinding verbroken met je huidige instance en je lokale data zal worden verwijderd.",
+        "newUrl": "Je gebruikt nu de Funkwhale-server op { url }"
+      }
+    },
     "Notifications": {
       "button": {
         "read": "Alles markeren als gelezen",
@@ -4587,28 +4610,6 @@
         },
         "title": "Radio"
       }
-    },
-    "ChooseInstance": {
-      "button": {
-        "submit": "Indienen"
-      },
-      "header": {
-        "chooseInstance": "Kies je server",
-        "failure": "Het is niet mogelijk om verbinding te maken met de opgegeven URL",
-        "suggestions": "Aanbevelingen"
-      },
-      "help": {
-        "notFunkwhaleServer": "Het opgegeven adres is geen Funkwhale-server",
-        "selectPod": "Selecteer met welke Funkwhale-server je wil verbinden. Voer zelf de URL in, of kies een van de suggesties.",
-        "serverDown": "De server is mogelijk niet beschikbaar"
-      },
-      "label": {
-        "url": "Server-URL"
-      },
-      "message": {
-        "currentConnection": "U bent nu verbonden met { 0 }. Als je doorgaat wordt je verbinding verbroken met je huidige instance en je lokale data zal worden verwijderd.",
-        "newUrl": "Je gebruikt nu de Funkwhale-server op { url }"
-      }
     }
   }
 }

front/src/shims-vue.d.ts

@@ -1,3 +1,11 @@
+// NOTE: This has to be in a file that is loaded before shims-vuex.d.ts as shims-vuex.d.ts imports from 'vuex'
+declare module 'vuex' {
+  export * from 'vuex/types/index.d.ts'
+  export * from 'vuex/types/helpers.d.ts'
+  export * from 'vuex/types/logger.d.ts'
+  export * from 'vuex/types/vue.d.ts'
+}
+
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
   // eslint-disable-next-line @typescript-eslint/ban-types

front/src/types.ts

@@ -6,7 +6,7 @@ import type { RootState } from '~/store'
 
 // eslint-disable-next-line
 import type { ComponentPublicInstance } from '@vue/runtime-core'
-import type { QueueTrack } from './composables/audio/queue'
+import type { QueueTrack } from '~/composables/audio/queue'
 
 export type FunctionRef = Element | ComponentPublicInstance | null
 

front/tsconfig.json

@@ -1,11 +1,11 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "compilerOptions": {
     "baseUrl": ".",
     "sourceMap": true,
     "noUnusedLocals": true,
     "experimentalDecorators": true,
-    "typeRoots": ["node_modules/@types"],
+    "typeRoots": ["node_modules", "node_modules/@types"],
     "types": [
       "vitest/globals",
       "vite/client",
@@ -19,13 +19,7 @@
       "~/*": ["src/*"]
     }
   },
-  "include": [
-    "src/**/*.d.ts",
-    "src/**/*.ts",
-    "src/**/*.vue",
-    "vite.config.ts",
-    "test/**/*.ts"
-  ],
+  "include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts", "test/**/*.ts"],
   "vueCompilerOptions": {
     "plugins": [
       "@vue-macros/volar/define-options",