Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "refactor: 🔥 remove _misskey_reaction and _misskey_votes"

Browse Source 
This reverts commit b0be07fb0a.
This commit is contained in:
ThatOneCalculator 2023-09-20 22:25:18 -07:00
parent 2650445576
commit f06aebca98
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/remote/activitypub/kernel/like.ts
View File

@ -12,7 +12,11 @@ export default async (actor: CacheableRemoteUser, activity: ILike) => {
await extractEmojis(activity.tag || [], actor.host).catch(() => null); await extractEmojis(activity.tag || [], actor.host).catch(() => null);
return await create(actor, note, activity.content || activity.name) return await create(
actor,
note,
activity._misskey_reaction || activity.content || activity.name,
)
.catch((e) => { .catch((e) => {
if (e.id === "51c42bb4-931a-456b-bff7-e5a8a70dd298") { if (e.id === "51c42bb4-931a-456b-bff7-e5a8a70dd298") {
return "skip: already reacted"; return "skip: already reacted";

2
packages/backend/src/remote/activitypub/models/question.ts
View File

@ -34,7 +34,7 @@ export async function extractPollFromQuestion(
); );
const votes = question[multiple ? "anyOf" : "oneOf"]!.map( const votes = question[multiple ? "anyOf" : "oneOf"]!.map(
(x, i) => x.replies?.totalItems || 0, (x, i) => x.replies?.totalItems || x._misskey_votes || 0,
); );
return { return {

1
packages/backend/src/remote/activitypub/renderer/like.ts
View File

@ -18,6 +18,7 @@ export const renderLike = async (noteReaction: NoteReaction, note: Note) => {
...(!meta.defaultReaction.includes(reaction) ...(!meta.defaultReaction.includes(reaction)
? { ? {
content: reaction, content: reaction,
_misskey_reaction: reaction,
} }
: {}), : {}),
} as any; } as any;

2
packages/backend/src/remote/activitypub/type.ts
View File

@ -158,6 +158,7 @@ export const isQuestion = (object: IObject): object is IQuestion =>
interface IQuestionChoice { interface IQuestionChoice {
name?: string; name?: string;
replies?: ICollection; replies?: ICollection;
_misskey_votes?: number;
} }
export interface ITombstone extends IObject { export interface ITombstone extends IObject {
type: "Tombstone"; type: "Tombstone";
@ -298,6 +299,7 @@ export interface IRemove extends IActivity {
export interface ILike extends IActivity { export interface ILike extends IActivity {
type: "Like" | "EmojiReaction" | "EmojiReact"; type: "Like" | "EmojiReaction" | "EmojiReact";
_misskey_reaction?: string;
} }
export interface IAnnounce extends IActivity { export interface IAnnounce extends IActivity {