Makefile

@@ -128,5 +128,7 @@ build-image:
 	  --no-cache \
 	  --platform linux/amd64 \
 	  --build-arg "VERSION=$$(version_ci)" \
+	  --tag docker.io/naskya/firefish \
 	  --tag registry.code.naskya.net/naskya/firefish \
+	  --tag "registry.code.naskya.net/naskya/firefish:$$(version_ci | cut -d':' -f2)" \
 	  .

neko/update/utils

@@ -43,11 +43,15 @@ contains() {
 }
 
 version() {
-  COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g')
-  printf '%s+neko' "${COMMIT_DATE}"
+  UPSTREAM_VERSION=$(pnpm pkg get version | sed -e 's/"//g')
+  COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g' | cut -c 3-)
+  COMMIT_HASH_INITIAL=$(printf '%s' "$(git rev-parse FETCH_HEAD)" | cut -c 1-2)
+  printf '%s+neko:%s.%s' "${UPSTREAM_VERSION}" "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
 }
 
 version_ci() {
-  COMMIT_DATE=$(git show --no-patch --pretty='%cs' HEAD | sed -e 's/-//g')
-  printf '%s+neko' "${COMMIT_DATE}"
+  UPSTREAM_VERSION=$(grep '"version":' package.json | cut -d '"' -f 4)
+  COMMIT_DATE=$(git show --no-patch --pretty='%cs' HEAD | sed -e 's/-//g' | cut -c 3-)
+  COMMIT_HASH_INITIAL=$(printf '%s' "$(git rev-parse HEAD)" | cut -c 1-2)
+  printf '%s+neko:%s.%s' "${UPSTREAM_VERSION}" "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
 }

package.json

@@ -1,6 +1,7 @@
 {
 	"name": "firefish",
-	"version": "neko",
+	"version": "1.0.5-rc",
+	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://code.naskya.net/naskya/firefish"

packages/backend/src/server/activitypub/featured.ts

@@ -36,7 +36,7 @@ export default async (ctx: Router.RouterContext) => {
 	const pinnedNotes = (
 		await Promise.all(
 			pinning.map((pinnedNote) =>
-				Notes.findOneByOrFail({ id: pinnedNote.noteId }),
+				this.notesRepository.findOneByOrFail({ id: pinnedNote.noteId }),
 			),
 		)
 	).filter(