ソースを参照

Merge pull request #3348 from shadowfacts/emoji-schema

Change static_path on custom emojis to static_url
daniel 3 年 前
コミット
a5114bf35a
2 ファイル変更3 行追加3 行削除
  1. 2 2
      app/Models/CustomEmoji.php
  2. 1 1
      app/Services/CustomEmojiService.php

+ 2 - 2
app/Models/CustomEmoji.php

@@ -47,7 +47,7 @@ class CustomEmoji extends Model
 					return [
 						'shortcode' => $match,
 						'url' => $url,
-						'static_path' => $url,
+						'static_url' => $url,
 						'visible_in_picker' => $tag->disabled == false
 					];
 				}
@@ -57,7 +57,7 @@ class CustomEmoji extends Model
 			if($activitypub == true) {
 				return $tag && isset($tag['icon']);
 			} else {
-				return $tag && isset($tag['static_path']);
+				return $tag && isset($tag['static_url']);
 			}
 		})
 		->values()

+ 1 - 1
app/Services/CustomEmojiService.php

@@ -118,7 +118,7 @@ class CustomEmojiService
 					return [
 						'shortcode' => str_replace(':', '', $emojo->shortcode),
 						'url' => $url,
-						'static_path' => $url,
+						'static_url' => $url,
 						'visible_in_picker' => $emojo->disabled == false
 					];
 				})