|
@@ -443,6 +443,17 @@ function pleroma_add_emoji {
|
443
|
443
|
return
|
444
|
444
|
fi
|
445
|
445
|
|
|
446
|
+ if [[ "$image_url" == *'.jpg' || "$image_url" == *'.jpeg' || "$image_url" == *'.gif' ]]; then
|
|
447
|
+ convert $image_filename $PLEROMA_DIR/custom_emoji/${shortcode}.png
|
|
448
|
+ if [ ! -f $PLEROMA_DIR/custom_emoji/${shortcode}.png ]; then
|
|
449
|
+ dialog --title $"Add Custom Emoji" \
|
|
450
|
+ --msgbox $"Unable to convert empji image to png format" 6 60
|
|
451
|
+ return
|
|
452
|
+ fi
|
|
453
|
+ image_extension='png'
|
|
454
|
+ image_filename=$PLEROMA_DIR/custom_emoji/${shortcode}.${image_extension}
|
|
455
|
+ fi
|
|
456
|
+
|
446
|
457
|
if ! grep -q "${shortcode}," $image_filename; then
|
447
|
458
|
echo "${shortcode}, ${image_filename}" >> $PLEROMA_DIR/config/emoji.txt
|
448
|
459
|
else
|
|
@@ -682,6 +693,8 @@ function install_pleroma {
|
682
|
693
|
ONION_ONLY='no'
|
683
|
694
|
fi
|
684
|
695
|
|
|
696
|
+ apt-get -yq install wget imagemagick
|
|
697
|
+
|
685
|
698
|
# We need elixir 1.4+ here, so the debian repo package won't do
|
686
|
699
|
install_elixir
|
687
|
700
|
|