murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Scale meme text properly

Browse source
This commit is contained in:
TheEssem 2021-05-15 18:25:04 -05:00
parent 805e930a52
commit 6149ede744
No known key found for this signature in database
GPG key ID: A3F9F02129092FCA
3 changed files with 53 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
natives/meme.cc
View file

@ -27,13 +27,13 @@ Napi::Value Meme(const Napi::CallbackInfo &info) {
Image bottom_text; Image bottom_text;
readImages(&frames, Blob(data.Data(), data.Length())); readImages(&frames, Blob(data.Data(), data.Length()));
coalesceImages(&coalesced, frames.begin(), frames.end()); coalesceImages(&coalesced, frames.begin(), frames.end());
for_each(coalesced.begin(), coalesced.end(),
scaleImage(Geometry(600, 600)));
top_text.size(Geometry(to_string(coalesced.front().columns()))); int width = coalesced.front().columns();
top_text.size(Geometry(to_string(width)));
top_text.backgroundColor("none"); top_text.backgroundColor("none");
top_text.font("Impact"); top_text.font("Impact");
top_text.fontPointsize(40); top_text.fontPointsize(width / 12);
top_text.textGravity(Magick::CenterGravity); top_text.textGravity(Magick::CenterGravity);
top_text.read("pango:<span foreground='white'>" + top + "</span>"); top_text.read("pango:<span foreground='white'>" + top + "</span>");
Image top_text_fill = top_text; Image top_text_fill = top_text;
@ -48,7 +48,7 @@ Napi::Value Meme(const Napi::CallbackInfo &info) {
bottom_text.size(Geometry(to_string(coalesced.front().columns()))); bottom_text.size(Geometry(to_string(coalesced.front().columns())));
bottom_text.backgroundColor("none"); bottom_text.backgroundColor("none");
bottom_text.font("Impact"); bottom_text.font("Impact");
bottom_text.fontPointsize(40); bottom_text.fontPointsize(width / 12);
bottom_text.textGravity(Magick::CenterGravity); bottom_text.textGravity(Magick::CenterGravity);
bottom_text.read("pango:<span foreground='white'>" + bottom + "</span>"); bottom_text.read("pango:<span foreground='white'>" + bottom + "</span>");
Image bottom_text_fill = bottom_text; Image bottom_text_fill = bottom_text;

180
package-lock.json generated
View file

@ -12,7 +12,7 @@
"@top-gg/sdk": "^3.1.1", "@top-gg/sdk": "^3.1.1",
"cowsay2": "^2.0.4", "cowsay2": "^2.0.4",
"dayjs": "^1.10.4", "dayjs": "^1.10.4",
"dotenv": "^8.2.0", "dotenv": "^9.0.2",
"duckduckgo-images-api": "^1.0.5", "duckduckgo-images-api": "^1.0.5",
"emoji-regex": "^9.2.2", "emoji-regex": "^9.2.2",
"eris": "^0.15.0", "eris": "^0.15.0",
@ -24,7 +24,7 @@
"node-emoji": "^1.10.0", "node-emoji": "^1.10.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"sharp": "^0.26.3" "sharp": "^0.28.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.13.8", "@babel/eslint-parser": "^7.13.8",
@ -572,11 +572,6 @@
"sprintf-js": "~1.0.2" "sprintf-js": "~1.0.2"
} }
}, },
"node_modules/array-flatten": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
"integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
},
"node_modules/astral-regex": { "node_modules/astral-regex": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@ -1012,17 +1007,14 @@
} }
}, },
"node_modules/decompress-response": { "node_modules/decompress-response": {
"version": "6.0.0", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
"dependencies": { "dependencies": {
"mimic-response": "^3.1.0" "mimic-response": "^2.0.0"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/deep-extend": { "node_modules/deep-extend": {
@ -1090,9 +1082,9 @@
} }
}, },
"node_modules/dotenv": { "node_modules/dotenv": {
"version": "8.6.0", "version": "9.0.2",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
"integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==",
"engines": { "engines": {
"node": ">=10" "node": ">=10"
} }
@ -2137,11 +2129,11 @@
"optional": true "optional": true
}, },
"node_modules/mimic-response": { "node_modules/mimic-response": {
"version": "3.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
"engines": { "engines": {
"node": ">=10" "node": ">=8"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
@ -2706,38 +2698,6 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/prebuild-install/node_modules/decompress-response": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
"dependencies": {
"mimic-response": "^2.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/prebuild-install/node_modules/mimic-response": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/prebuild-install/node_modules/simple-get": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
"dependencies": {
"decompress-response": "^4.2.0",
"once": "^1.3.1",
"simple-concat": "^1.0.0"
}
},
"node_modules/prelude-ls": { "node_modules/prelude-ls": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@ -2989,19 +2949,17 @@
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
}, },
"node_modules/sharp": { "node_modules/sharp": {
"version": "0.26.3", "version": "0.28.2",
"resolved": "https://registry.npmjs.org/sharp/-/sharp-0.26.3.tgz", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.28.2.tgz",
"integrity": "sha512-NdEJ9S6AMr8Px0zgtFo1TJjMK/ROMU92MkDtYn2BBrDjIx3YfH9TUyGdzPC+I/L619GeYQc690Vbaxc5FPCCWg==", "integrity": "sha512-CdmySbsQVe/+ZM2j9zzvUfWumM0L0iHj1kpxJMFuyWvSuBULebvGCdOLb1f5vbbBrIGroX714Fx1wiWaKniz4A==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"array-flatten": "^3.0.0",
"color": "^3.1.3", "color": "^3.1.3",
"detect-libc": "^1.0.3", "detect-libc": "^1.0.3",
"node-addon-api": "^3.0.2", "node-addon-api": "^3.1.0",
"npmlog": "^4.1.2", "prebuild-install": "^6.1.2",
"prebuild-install": "^6.0.0", "semver": "^7.3.5",
"semver": "^7.3.2", "simple-get": "^3.1.0",
"simple-get": "^4.0.0",
"tar-fs": "^2.1.1", "tar-fs": "^2.1.1",
"tunnel-agent": "^0.6.0" "tunnel-agent": "^0.6.0"
}, },
@ -3078,25 +3036,11 @@
] ]
}, },
"node_modules/simple-get": { "node_modules/simple-get": {
"version": "4.0.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
"integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==", "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
],
"dependencies": { "dependencies": {
"decompress-response": "^6.0.0", "decompress-response": "^4.2.0",
"once": "^1.3.1", "once": "^1.3.1",
"simple-concat": "^1.0.0" "simple-concat": "^1.0.0"
} }
@ -4235,11 +4179,6 @@
"sprintf-js": "~1.0.2" "sprintf-js": "~1.0.2"
} }
}, },
"array-flatten": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
"integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
},
"astral-regex": { "astral-regex": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@ -4571,11 +4510,11 @@
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
}, },
"decompress-response": { "decompress-response": {
"version": "6.0.0", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
"requires": { "requires": {
"mimic-response": "^3.1.0" "mimic-response": "^2.0.0"
} }
}, },
"deep-extend": { "deep-extend": {
@ -4625,9 +4564,9 @@
} }
}, },
"dotenv": { "dotenv": {
"version": "8.6.0", "version": "9.0.2",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
"integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==" "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="
}, },
"duckduckgo-images-api": { "duckduckgo-images-api": {
"version": "1.0.5", "version": "1.0.5",
@ -5420,9 +5359,9 @@
"optional": true "optional": true
}, },
"mimic-response": { "mimic-response": {
"version": "3.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
}, },
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
@ -5833,31 +5772,6 @@
"simple-get": "^3.0.3", "simple-get": "^3.0.3",
"tar-fs": "^2.0.0", "tar-fs": "^2.0.0",
"tunnel-agent": "^0.6.0" "tunnel-agent": "^0.6.0"
},
"dependencies": {
"decompress-response": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
"requires": {
"mimic-response": "^2.0.0"
}
},
"mimic-response": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
},
"simple-get": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
"requires": {
"decompress-response": "^4.2.0",
"once": "^1.3.1",
"simple-concat": "^1.0.0"
}
}
} }
}, },
"prelude-ls": { "prelude-ls": {
@ -6056,18 +5970,16 @@
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
}, },
"sharp": { "sharp": {
"version": "0.26.3", "version": "0.28.2",
"resolved": "https://registry.npmjs.org/sharp/-/sharp-0.26.3.tgz", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.28.2.tgz",
"integrity": "sha512-NdEJ9S6AMr8Px0zgtFo1TJjMK/ROMU92MkDtYn2BBrDjIx3YfH9TUyGdzPC+I/L619GeYQc690Vbaxc5FPCCWg==", "integrity": "sha512-CdmySbsQVe/+ZM2j9zzvUfWumM0L0iHj1kpxJMFuyWvSuBULebvGCdOLb1f5vbbBrIGroX714Fx1wiWaKniz4A==",
"requires": { "requires": {
"array-flatten": "^3.0.0",
"color": "^3.1.3", "color": "^3.1.3",
"detect-libc": "^1.0.3", "detect-libc": "^1.0.3",
"node-addon-api": "^3.0.2", "node-addon-api": "^3.1.0",
"npmlog": "^4.1.2", "prebuild-install": "^6.1.2",
"prebuild-install": "^6.0.0", "semver": "^7.3.5",
"semver": "^7.3.2", "simple-get": "^3.1.0",
"simple-get": "^4.0.0",
"tar-fs": "^2.1.1", "tar-fs": "^2.1.1",
"tunnel-agent": "^0.6.0" "tunnel-agent": "^0.6.0"
}, },
@ -6114,11 +6026,11 @@
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
}, },
"simple-get": { "simple-get": {
"version": "4.0.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
"integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==", "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
"requires": { "requires": {
"decompress-response": "^6.0.0", "decompress-response": "^4.2.0",
"once": "^1.3.1", "once": "^1.3.1",
"simple-concat": "^1.0.0" "simple-concat": "^1.0.0"
} }

4
package.json
View file

@ -27,7 +27,7 @@
"@top-gg/sdk": "^3.1.1", "@top-gg/sdk": "^3.1.1",
"cowsay2": "^2.0.4", "cowsay2": "^2.0.4",
"dayjs": "^1.10.4", "dayjs": "^1.10.4",
"dotenv": "^8.2.0", "dotenv": "^9.0.2",
"duckduckgo-images-api": "^1.0.5", "duckduckgo-images-api": "^1.0.5",
"emoji-regex": "^9.2.2", "emoji-regex": "^9.2.2",
"eris": "^0.15.0", "eris": "^0.15.0",
@ -39,7 +39,7 @@
"node-emoji": "^1.10.0", "node-emoji": "^1.10.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"sharp": "^0.26.3" "sharp": "^0.28.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.13.8", "@babel/eslint-parser": "^7.13.8",