Merge 3ce5ae21bf into 74a3d5c6c0

Update CustomEmojiService, only return local emoji

.env.docker

@@ -1034,7 +1034,7 @@ DOCKER_APP_HOST_CACHE_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/pixelfed/ca
 
 # Automatically run "One-time setup tasks" commands.
 #
-# If you are migrating to this docker-compose setup or have manually run the "One time seutp"
+# If you are migrating to this docker-compose setup or have manually run the "One time setup"
 # tasks (https://docs.pixelfed.org/running-pixelfed/installation/#setting-up-services)
 # you can set this to "0" to prevent them from running.
 #

app/Services/CustomEmojiService.php

@@ -133,6 +133,7 @@ class CustomEmojiService
 			return CustomEmoji::when(!$pgsql, function($q, $pgsql) {
 					return $q->groupBy('shortcode');
 				})
+                ->whereNull('uri')
 				->get()
 				->map(function($emojo) {
 					$url = url('storage/' . $emojo->media_path);

docker-compose.migrate.yml

@@ -1,6 +1,4 @@
 ---
-version: "3"
-
 services:
   migrate:
     image: "servercontainers/rsync"

docker-compose.yml

@@ -1,7 +1,4 @@
 ---
-# Require 3.8 to ensure people use a recent version of Docker + Compose
-version: "3.8"
-
 ###############################################################
 # Please see docker/README.md for usage information
 ###############################################################