|
@@ -433,11 +433,11 @@ function pleroma_add_emoji {
|
433
|
433
|
image_extension='gif'
|
434
|
434
|
fi
|
435
|
435
|
|
436
|
|
- if [ ! -d $PLEROMA_DIR/custom_emoji ]; then
|
437
|
|
- mkdir -p $PLEROMA_DIR/custom_emoji
|
|
436
|
+ if [ ! -d $PLEROMA_DIR/priv/static/emoji ]; then
|
|
437
|
+ mkdir -p $PLEROMA_DIR/priv/static/emoji
|
438
|
438
|
fi
|
439
|
439
|
|
440
|
|
- image_filename=$PLEROMA_DIR/custom_emoji/${shortcode}.${image_extension}
|
|
440
|
+ image_filename=$PLEROMA_DIR/priv/static/emoji/${shortcode}.${image_extension}
|
441
|
441
|
wget "$image_url" -O $image_filename
|
442
|
442
|
if [ ! -f $image_filename ]; then
|
443
|
443
|
dialog --title $"Add Custom Emoji" \
|
|
@@ -446,8 +446,8 @@ function pleroma_add_emoji {
|
446
|
446
|
fi
|
447
|
447
|
|
448
|
448
|
if [[ "$image_url" == *'.jpg' || "$image_url" == *'.jpeg' || "$image_url" == *'.gif' ]]; then
|
449
|
|
- convert $image_filename -resize $emoji_resolution $PLEROMA_DIR/custom_emoji/${shortcode}.png
|
450
|
|
- if [ ! -f $PLEROMA_DIR/custom_emoji/${shortcode}.png ]; then
|
|
449
|
+ convert $image_filename -resize $emoji_resolution $PLEROMA_DIR/priv/static/emoji/${shortcode}.png
|
|
450
|
+ if [ ! -f $PLEROMA_DIR/priv/static/emoji/${shortcode}.png ]; then
|
451
|
451
|
dialog --title $"Add Custom Emoji" \
|
452
|
452
|
--msgbox $"Unable to convert empji image to png format" 6 60
|
453
|
453
|
return
|
|
@@ -457,7 +457,7 @@ function pleroma_add_emoji {
|
457
|
457
|
rm $image_filename
|
458
|
458
|
|
459
|
459
|
image_extension='png'
|
460
|
|
- image_filename=$PLEROMA_DIR/custom_emoji/${shortcode}.${image_extension}
|
|
460
|
+ image_filename=$PLEROMA_DIR/priv/static/emoji/${shortcode}.${image_extension}
|
461
|
461
|
else
|
462
|
462
|
convert $image_filename -resize $emoji_resolution $image_filename
|
463
|
463
|
fi
|