moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

LegacyReaction変換にstarを追加 (#6013)

Browse Source
This commit is contained in:
MeiMei 2020-02-19 22:06:54 +09:00 committed by GitHub
parent b46114f4fa
commit e6c9b1d9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc/reaction-lib.ts
View File

@ -2,7 +2,7 @@ import { emojiRegex } from './emoji-regex';
import { fetchMeta } from './fetch-meta';
import { Emojis } from '../models';
const legacy10: Record<string, string> = {
const legacies: Record<string, string> = {
'like': '👍',
'love': '❤', // ここに記述する場合は異体字セレクタを入れない
'laugh': '😆',
@ -13,6 +13,7 @@ const legacy10: Record<string, string> = {
'confused': '😥',
'rip': '😇',
'pudding': '🍮',
'star': '⭐',
};
export async function getFallbackReaction(): Promise<string> {
@ -24,11 +25,11 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
const _reactions = {} as Record<string, number>;
for (const reaction of Object.keys(reactions)) {
if (Object.keys(legacy10).includes(reaction)) {
if (_reactions[legacy10[reaction]]) {
_reactions[legacy10[reaction]] += reactions[reaction];
if (Object.keys(legacies).includes(reaction)) {
if (_reactions[legacies[reaction]]) {
_reactions[legacies[reaction]] += reactions[reaction];
} else {
_reactions[legacy10[reaction]] = reactions[reaction];
_reactions[legacies[reaction]] = reactions[reaction];
}
} else {
if (_reactions[reaction]) {
@ -46,7 +47,7 @@ export async function toDbReaction(reaction?: string | null): Promise<string> {
if (reaction == null) return await getFallbackReaction();
// 文字列タイプのリアクションを絵文字に変換
if (Object.keys(legacy10).includes(reaction)) return legacy10[reaction];
if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
// Unicode絵文字
const match = emojiRegex.exec(reaction);
@ -72,6 +73,6 @@ export async function toDbReaction(reaction?: string | null): Promise<string> {
}
export function convertLegacyReaction(reaction: string): string {
if (Object.keys(legacy10).includes(reaction)) return legacy10[reaction];
if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
return reaction;
}