v1.91.2 (#6)

Reviewed-on: https://git.pikl.uk/pikl/aur-immich/pulls/6

7 files changed, 36 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 280002db8546..bdaf4901da1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = immich
 	pkgdesc = Self-hosted photos and videos backup tool
-	pkgver = 1.90.2
-	pkgrel = 6
+	pkgver = 1.91.2
+	pkgrel = 1
 	url = https://github.com/immich-app/immich
 	arch = x86_64
 	license = MIT
@@ -13,7 +13,7 @@ pkgbase = immich
 	depends = postgresql
 	depends = nodejs
 	depends = nginx
-	depends = typesense
+	depends = pgvecto.rs=0.1.11
 	depends = zlib
 	depends = glib2
 	depends = expat
@@ -56,7 +56,7 @@ pkgbase = immich
 	depends = perl-uri
 	depends = perl-mojolicious
 	depends = perl-file-slurper
-	source = immich-1.90.2.tar.gz::https://github.com/immich-app/immich/archive/refs/tags/v1.90.2.tar.gz
+	source = immich-1.91.2.tar.gz::https://github.com/immich-app/immich/archive/refs/tags/v1.91.2.tar.gz
 	source = immich-server.service
 	source = immich-microservices.service
 	source = immich-machine-learning.service
@@ -69,16 +69,16 @@ pkgbase = immich
 	source = https://download.geonames.org/export/dump/cities500.zip
 	source = https://download.geonames.org/export/dump/admin1CodesASCII.txt
 	source = https://download.geonames.org/export/dump/admin2Codes.txt
-	sha256sums = 0b9347e3a9019a6ca95c68d6d05e68657f24e7de81d1d690e6a61e81c5c3798d
-	sha256sums = 42792b6b7c5461385395907af9bf724e02c6622603a741e86c73b1204a5ad973
-	sha256sums = ed91a977c236e4ceccea210305e4bb77464b75539063b411bd1ab90115766f4c
+	sha256sums = 67cc8d544a2430643a7ec5147c920f13188fcbd4ac2fe61a115e3443de8c01ea
+	sha256sums = 77582958979462642caeeb77cb9bc8e02ce80e5ec8f9d6aaa6c71f69ab96ea5d
+	sha256sums = dc1a3d7baf2ec4f00a4a80f88a1f28dc1092eb7a08195544cc37b6532777f5d7
 	sha256sums = d20455349cdb9409adb42cdbde48c30a176d2a5337ad148c6d2227ecc523c88a
 	sha256sums = 01707746e8718fe169b729b7b3d9e26e870bf2dbc4d1f6cdc7ed7d3839e92c0e
 	sha256sums = 4ae8a73ccbef568b7841dbdfe9b9d8a76fa78db00051317b6313a6a50a66c900
-	sha256sums = aaa0608d1169854e497aa75ce3c288bb7ced3086e65ea162f9c2faf4c9436fc5
+	sha256sums = abe44046256b32a6b629fd288e48653f02a6c4728a67806fac771ab1cad759d6
 	sha256sums = cc405c774e34cd161f00ccd882e66c2d2ce28405964bf62472ebc3f59d642060
 	sha256sums = d38cdaa031f741998f2d31504381bce4db1a8771c774a2c2bac547d7d2b3c70b
-	sha256sums = 70b9d3859031b289ff6a6c5065357dc92255308eb5b532b5a4ae1ab72cf59fbc
+	sha256sums = c709ce5853e5becec9a5557a15661a96b8075d3765eca29c64f047b31fb6d0a8
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -89,7 +89,7 @@ pkgname = immich-server
 	depends = postgresql
 	depends = nodejs
 	depends = nginx
-	depends = typesense
+	depends = pgvecto.rs=0.1.11
 	depends = zlib
 	depends = glib2
 	depends = expat
diff --git a/PKGBUILD b/PKGBUILD
index 33c081b3acb4..4672e3c60fc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: pikl <me@pikl.uk>
 pkgbase=immich
 pkgname=('immich-server' 'immich-cli')
-pkgrel=6
-pkgver=1.90.2
+pkgrel=1
+pkgver=1.91.2
 pkgdesc='Self-hosted photos and videos backup tool'
 url='https://github.com/immich-app/immich'
 license=('MIT')
@@ -13,7 +13,7 @@ makedepends=('npm' 'jq' 'python-poetry' 'ts-node')
 # combination of server/CLI deps, see split package functions
 # for individual deps and commentary
 depends=('redis' 'postgresql' 'nodejs' 'nginx'
-    'typesense' 'zlib' 'glib2' 'expat' 'librsvg' 'libexif'
+    'pgvecto.rs=0.1.11' 'zlib' 'glib2' 'expat' 'librsvg' 'libexif'
     'libwebp' 'orc' 'libjpeg-turbo' 'libgsf' 'libpng'
     'libjxl' 'libheif' 'lcms2' 'mimalloc' 'openjpeg2'
     'openexr' 'liblqr' 'libtool' 'ffmpeg'
@@ -43,16 +43,16 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/immich-app/immich/archi
         'https://download.geonames.org/export/dump/cities500.zip'
         'https://download.geonames.org/export/dump/admin1CodesASCII.txt'
         'https://download.geonames.org/export/dump/admin2Codes.txt')
-sha256sums=('0b9347e3a9019a6ca95c68d6d05e68657f24e7de81d1d690e6a61e81c5c3798d'
-            '42792b6b7c5461385395907af9bf724e02c6622603a741e86c73b1204a5ad973'
-            'ed91a977c236e4ceccea210305e4bb77464b75539063b411bd1ab90115766f4c'
+sha256sums=('67cc8d544a2430643a7ec5147c920f13188fcbd4ac2fe61a115e3443de8c01ea'
+            '77582958979462642caeeb77cb9bc8e02ce80e5ec8f9d6aaa6c71f69ab96ea5d'
+            'dc1a3d7baf2ec4f00a4a80f88a1f28dc1092eb7a08195544cc37b6532777f5d7'
             'd20455349cdb9409adb42cdbde48c30a176d2a5337ad148c6d2227ecc523c88a'
             '01707746e8718fe169b729b7b3d9e26e870bf2dbc4d1f6cdc7ed7d3839e92c0e'
             '4ae8a73ccbef568b7841dbdfe9b9d8a76fa78db00051317b6313a6a50a66c900'
-            'aaa0608d1169854e497aa75ce3c288bb7ced3086e65ea162f9c2faf4c9436fc5'
+            'abe44046256b32a6b629fd288e48653f02a6c4728a67806fac771ab1cad759d6'
             'cc405c774e34cd161f00ccd882e66c2d2ce28405964bf62472ebc3f59d642060'
             'd38cdaa031f741998f2d31504381bce4db1a8771c774a2c2bac547d7d2b3c70b'
-            '70b9d3859031b289ff6a6c5065357dc92255308eb5b532b5a4ae1ab72cf59fbc'
+            'c709ce5853e5becec9a5557a15661a96b8075d3765eca29c64f047b31fb6d0a8'
             'SKIP'
             'SKIP'
             'SKIP')
@@ -82,7 +82,11 @@ build() {
     cd "${srcdir}/${pkgbase}-${pkgver}/server"
     npm ci
     npm run build
+    cp -r node_modules/@img "${srcdir}/server-node_modules-@img"
+    rm -rf "${srcdir}/server-node_modules-@img/sharp-libvips"*
+    rm -rf "${srcdir}/server-node_modules-@img/sharp-linuxmusl-x64"
     npm prune --omit=dev --omit=optional
+    mv "${srcdir}/server-node_modules-@img/"* node_modules/@img
         
     # build machine learning (python)
     # from: ENV and RUN commands in machine-learning/Dockerfile
@@ -119,7 +123,7 @@ package_immich-server() {
     # dependencies generated from base-images repository
     # https://github.com/immich-app/base-images/blob/main/server/Dockerfile
     depends=('redis' 'postgresql' 'nodejs' 'nginx'
-        'typesense'
+        'pgvecto.rs=0.1.11'  # aur
         'zlib'
         'glib2'
         'expat'
@@ -153,18 +157,18 @@ package_immich-server() {
         'perl-capture-tiny'
         'perl-file-which'
         'perl-file-chdir'
-        'perl-pkgconfig' # other potential - libpkgconf
+        'perl-pkgconfig'  # other potential - libpkgconf
         'perl-ffi-checklib'
         'perl-test-warnings'
         'perl-test-fatal'
         'perl-test-needs'
         'perl-test2-suite'
         'perl-sort-versions'
-        'perl-path-tiny' # other potential - perl-file-path-tiny
+        'perl-path-tiny'  # other potential - perl-file-path-tiny
         'perl-try-tiny'
         'perl-term-table'
-        'perl-uri' # good enough for libany-uri-escape-perl?
-        'perl-mojolicious' # aur
+        'perl-uri'  # good enough for libany-uri-escape-perl?
+        'perl-mojolicious'  # aur
         'perl-file-slurper'
     )
     backup=("etc/immich.conf")
diff --git a/immich-microservices.service b/immich-microservices.service
index bca43ad080ae..8b1f806452c3 100644
--- a/immich-microservices.service
+++ b/immich-microservices.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Immich microservices
 Documentation=https://github.com/immich-app/immich
-Requires=typesense-server.service
 Requires=postgresql.service
 Requires=immich-server.service
 After=network.target
diff --git a/immich-server.install b/immich-server.install
index 5230240a124a..e720bff67869 100644
--- a/immich-server.install
+++ b/immich-server.install
@@ -4,6 +4,7 @@ pre_install() {
 
 post_install() {
     echo -e "\033[1;34mINFO\033[0m\033[1m: Final steps to have a working immich instance:"
+    echo -e "\033[1;34mINFO\033[0m\033[1m:     * add pgvecto.rs extension to postgres using \`sudo -u postgres psql -c 'ALTER SYSTEM SET shared_preload_libraries = \"vectors.so\"'\`. Restart of postgres service required.\033[0m"
     echo -e "\033[1;34mINFO\033[0m\033[1m:     * initialise postgres and create a database called 'immich' (https://wiki.archlinux.org/title/PostgreSQL)\033[0m"
     echo -e "\033[1;34mINFO\033[0m\033[1m:     * enable an nginx config then start nginx.service, an example that servers immich on port 8080 is given in /etc/nginx/sites-available\033[0m"
     echo -e "\033[1;34mINFO\033[0m\033[1m:     * ensure immich-server resolves to 127.0.0.1 and/or ::1, e.g. through /etc/hosts\033[0m"
diff --git a/immich-server.service b/immich-server.service
index 5fc85523f677..a584a039e44f 100644
--- a/immich-server.service
+++ b/immich-server.service
@@ -3,7 +3,6 @@ Description=Immich server
 Documentation=https://github.com/immich-app/immich
 Requires=redis.service
 Requires=postgresql.service
-Requires=typesense-server.service
 After=network.target
 Wants=network-online.target
 After=network-online.target
diff --git a/immich.conf b/immich.conf
index 1fd5c720aecf..064ec68cd866 100644
--- a/immich.conf
+++ b/immich.conf
@@ -6,11 +6,6 @@ REDIS_HOSTNAME=localhost
 
 IMMICH_MEDIA_LOCATION=/var/lib/immich/upload
 
-TYPESENSE_API_KEY=xyz
-TYPESENSE_ENABLED=true
-TYPESENSE_HOST=localhost
-TYPESENSE_DATA_DIR=/var/lib/typesense
-
 IMMICH_MACHINE_LEARNING_ENABLED=true
 
 # DISABLE_REVERSE_GEOCODING=false
diff --git a/metadata.repository.ts.patch b/metadata.repository.ts.patch
index dd1e5633cb92..31ba08febe23 100644
--- a/metadata.repository.ts.patch
+++ b/metadata.repository.ts.patch
@@ -1,15 +1,15 @@
---- server/src/infra/repositories/metadata.repository.ts	2023-12-01 08:09:16.768871873 +0000
-+++ server/src/infra/repositories/metadata.repository.ts-patched	2023-12-01 08:12:09.931850235 +0000
-@@ -35,7 +35,7 @@
- 
+--- server/src/infra/repositories/metadata.repository.ts	2023-12-17 08:39:07.719859039 +0000
++++ server/src/infra/repositories/metadata.repository.ts_patched	2023-12-17 08:48:03.819363609 +0000
+@@ -37,7 +37,7 @@
+   @RequireLock(DatabaseLock.GeodataImport)
    async init(): Promise<void> {
      this.logger.log('Initializing metadata repository');
 -    const geodataDate = await readFile('/usr/src/resources/geodata-date.txt', 'utf8');
 +    const geodataDate = await readFile('/var/lib/immich-revgeo/geodata-date.txt', 'utf8');
  
-     await this.geodataPlacesRepository.query('SELECT pg_advisory_lock($1)', [DatabaseLock.GeodataImport]);
+     const geocodingMetadata = await this.systemMetadataRepository.get(SystemMetadataKey.REVERSE_GEOCODING_STATE);
  
-@@ -117,7 +117,7 @@
+@@ -115,7 +115,7 @@
            admin2Code: lineSplit[11],
            modificationDate: lineSplit[18],
          }),
@@ -18,7 +18,7 @@
        GeodataPlacesEntity,
      );
    }
-@@ -130,7 +130,7 @@
+@@ -128,7 +128,7 @@
            key: lineSplit[0],
            name: lineSplit[1],
          }),
@@ -27,7 +27,7 @@
        GeodataAdmin1Entity,
      );
    }
-@@ -143,7 +143,7 @@
+@@ -141,7 +141,7 @@
            key: lineSplit[0],
            name: lineSplit[1],
          }),