enhance(backend): 絵文字の連合でライセンス欄を相互にやり取りするように (#15182)
* enhance(backend): 絵文字の連合でライセンス欄を相互にやり取りするように Co-authored-by: Kisaragi Marine <kisaragi.effective@gmail.com> Co-authored-by: ruruke <123709459+ruruke@users.noreply.github.com> * fix CHANGELOG.md --------- Co-authored-by: Kisaragi Marine <kisaragi.effective@gmail.com> Co-authored-by: ruruke <123709459+ruruke@users.noreply.github.com> Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
This commit is contained in:
@@ -183,6 +183,9 @@ export class ApRendererService {
|
||||
// || emoji.originalUrl してるのは後方互換性のため(publicUrlはstringなので??はだめ)
|
||||
url: emoji.publicUrl || emoji.originalUrl,
|
||||
},
|
||||
_misskey_license: {
|
||||
freeText: emoji.license
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
|
@@ -408,6 +408,8 @@ export class ApNoteService {
|
||||
originalUrl: tag.icon.url,
|
||||
publicUrl: tag.icon.url,
|
||||
updatedAt: new Date(),
|
||||
// _misskey_license が存在しなければ `null`
|
||||
license: (tag._misskey_license?.freeText ?? null)
|
||||
});
|
||||
|
||||
const emoji = await this.emojisRepository.findOneBy({ host, name });
|
||||
@@ -429,6 +431,8 @@ export class ApNoteService {
|
||||
publicUrl: tag.icon.url,
|
||||
updatedAt: new Date(),
|
||||
aliases: [],
|
||||
// _misskey_license が存在しなければ `null`
|
||||
license: (tag._misskey_license?.freeText ?? null)
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
@@ -242,6 +242,11 @@ export interface IApEmoji extends IObject {
|
||||
type: 'Emoji';
|
||||
name: string;
|
||||
updated: string;
|
||||
// Misskey拡張。後方互換性のためにoptional。
|
||||
// 将来の拡張性を考慮してobjectにしている
|
||||
_misskey_license?: {
|
||||
freeText: string | null;
|
||||
};
|
||||
}
|
||||
|
||||
export const isEmoji = (object: IObject): object is IApEmoji =>
|
||||
|
Reference in New Issue
Block a user