Commit 0421d229 authored by nanahira's avatar nanahira

rework imagmagick

parent fdf719a9
Pipeline #6728 failed with stages
in 15 seconds
FROM node:12-buster-slim FROM node:bullseye-slim
RUN apt update && apt -y install libmagick++-dev python3 build-essential mariadb-client-10.3 && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* RUN apt update && apt -y install libmagick++-dev python3 build-essential mariadb-client-10.3 && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
......
This diff is collapsed.
...@@ -20,13 +20,11 @@ ...@@ -20,13 +20,11 @@
"test:coverage": "npm run test -- --coverage" "test:coverage": "npm run test -- --coverage"
}, },
"dependencies": { "dependencies": {
"@types/gm": "^1.18.9", "@xzeldon/imagemagick-native": "^1.9.5",
"@types/underscore": "^1.10.23", "axios": "^0.24.0",
"axios": "^0.20.0",
"cookie-parser": "~1.4.4", "cookie-parser": "~1.4.4",
"debug": "~2.6.9", "debug": "~2.6.9",
"express": "~4.16.1", "express": "~4.16.1",
"imagemagick-native-12": "^1.9.3",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"promise-mysql": "^4.1.3", "promise-mysql": "^4.1.3",
"underscore": "^1.11.0" "underscore": "^1.11.0"
...@@ -34,10 +32,12 @@ ...@@ -34,10 +32,12 @@
"devDependencies": { "devDependencies": {
"@types/cookie-parser": "^1.4.2", "@types/cookie-parser": "^1.4.2",
"@types/express": "^4.17.6", "@types/express": "^4.17.6",
"@types/gm": "^1.18.10",
"@types/jest": "^25.2.3", "@types/jest": "^25.2.3",
"@types/morgan": "^1.9.0", "@types/morgan": "^1.9.0",
"@types/node": "^14.10.3", "@types/node": "^14.10.3",
"@types/supertest": "^2.0.9", "@types/supertest": "^2.0.9",
"@types/underscore": "^1.11.3",
"concurrently": "^5.2.0", "concurrently": "^5.2.0",
"jest": "^26.0.1", "jest": "^26.0.1",
"nodemon": "^2.0.4", "nodemon": "^2.0.4",
......
...@@ -34,7 +34,7 @@ async function getAvatarURL(usernames: string[]): Promise<string> { ...@@ -34,7 +34,7 @@ async function getAvatarURL(usernames: string[]): Promise<string> {
async function getURLFromUsername(username: string) { async function getURLFromUsername(username: string) {
//const possibleNames = await getRealUsername(username); //const possibleNames = await getRealUsername(username);
return await getAvatarURL([username]); return getAvatarURL([username]);
} }
interface QueryResult{ interface QueryResult{
......
declare module 'imagemagick-native-12';
import { Processor } from "./processor"; import { Processor } from "./processor";
import magick from "imagemagick-native-12"; import magick from "@xzeldon/imagemagick-native";
import { CutData } from "./utility"; import { CutData } from "./utility";
import cluster from "cluster"; import cluster from "cluster";
import util from "util"; import util from "util";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment