Просмотр исходного кода

Merge pull request #3999 from pixelfed/staging

Staging
daniel 2 лет назад
Родитель
Сommit
37dcb1e7a1
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 1
      app/Jobs/StatusPipeline/StatusTagsPipeline.php

+ 1 - 0
CHANGELOG.md

@@ -67,6 +67,7 @@
 - Update HashtagController, improve trending hashtag endpoint ([4873c7dd](https://github.com/pixelfed/pixelfed/commit/4873c7dd))
 - Fix CustomEmoji, properly handle shortcode updates and delete old copy in case the extension changes ([bc29073a](https://github.com/pixelfed/pixelfed/commit/bc29073a))
 - Update reply pipelines, restore reply_count logic ([0d780ffb](https://github.com/pixelfed/pixelfed/commit/0d780ffb))
+- Update StatusTagsPipeline, reject if `type` not set ([91085c45](https://github.com/pixelfed/pixelfed/commit/91085c45))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

+ 1 - 1
app/Jobs/StatusPipeline/StatusTagsPipeline.php

@@ -47,7 +47,7 @@ class StatusTagsPipeline implements ShouldQueue
 
 		// Emoji
 		$tags->filter(function($tag) {
-			return $tag && $tag['type'] == 'Emoji' && isset($tag['id'], $tag['icon'], $tag['name']);
+			return $tag && isset($tag['id'], $tag['icon'], $tag['name'], $tag['type']) && $tag['type'] == 'Emoji';
 		})
 		->map(function($tag) {
 			CustomEmojiService::import($tag['id'], $this->status->id);