HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

refactor: ♻️ unessicary function

Browse source
This commit is contained in:
ThatOneCalculator 2023-09-20 22:53:00 -07:00
parent bbb2396d89
commit d9274de0a7
No known key found for this signature in database
GPG key ID: 8703CACD01000000
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/misc/reaction-lib.ts
View file

@ -90,7 +90,3 @@ export function decodeReaction(str: string): DecodedReaction {
host: undefined, host: undefined,
}; };
} }
export function convertToDecoded(reaction: string): string {
return decodeReaction(reaction).reaction;
}

4
packages/backend/src/models/repositories/note-reaction.ts
View file

@ -2,7 +2,7 @@ import { db } from "@/db/postgre.js";
import { NoteReaction } from "@/models/entities/note-reaction.js"; import { NoteReaction } from "@/models/entities/note-reaction.js";
import { Notes, Users } from "../index.js"; import { Notes, Users } from "../index.js";
import type { Packed } from "@/misc/schema.js"; import type { Packed } from "@/misc/schema.js";
import { convertToDecoded } from "@/misc/reaction-lib.js"; import { decodeReaction } from "@/misc/reaction-lib.js";
import type { User } from "@/models/entities/user.js"; import type { User } from "@/models/entities/user.js";
export const NoteReactionRepository = db.getRepository(NoteReaction).extend({ export const NoteReactionRepository = db.getRepository(NoteReaction).extend({
@ -27,7 +27,7 @@ export const NoteReactionRepository = db.getRepository(NoteReaction).extend({
id: reaction.id, id: reaction.id,
createdAt: reaction.createdAt.toISOString(), createdAt: reaction.createdAt.toISOString(),
user: await Users.pack(reaction.user ?? reaction.userId, me), user: await Users.pack(reaction.user ?? reaction.userId, me),
type: convertToDecoded(reaction.reaction), type: decodeReaction(reaction.reaction).reaction,
...(opts.withNote ...(opts.withNote
? { ? {
// may throw error // may throw error

5
packages/backend/src/models/repositories/note.ts
View file

@ -15,7 +15,6 @@ import type { Packed } from "@/misc/schema.js";
import { nyaize } from "@/misc/nyaize.js"; import { nyaize } from "@/misc/nyaize.js";
import { awaitAll } from "@/prelude/await-all.js"; import { awaitAll } from "@/prelude/await-all.js";
import { import {
convertToDecoded,
convertReactions, convertReactions,
decodeReaction, decodeReaction,
} from "@/misc/reaction-lib.js"; } from "@/misc/reaction-lib.js";
@ -77,7 +76,7 @@ async function populateMyReaction(
if (_hint_?.myReactions) { if (_hint_?.myReactions) {
const reaction = _hint_.myReactions.get(note.id); const reaction = _hint_.myReactions.get(note.id);
if (reaction) { if (reaction) {
return convertToDecoded(reaction.reaction); return decodeReaction(reaction.reaction).reaction;
} else if (reaction === null) { } else if (reaction === null) {
return undefined; return undefined;
} }
@ -90,7 +89,7 @@ async function populateMyReaction(
}); });
if (reaction) { if (reaction) {
return convertToDecoded(reaction.reaction); return decodeReaction(reaction.reaction).reaction;
} }
return undefined; return undefined;