external/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2024-11-10 01:02:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer

Browse source
This commit is contained in:
Ajay 2023-10-02 19:56:12 -04:00
commit 9dd8b28812
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/routes/postSkipSegments.ts
View file

@ -179,7 +179,7 @@ async function checkUserActiveWarning(userID: HashedUserID): Promise<CheckResult
return {
pass: false,
errorMessage: defaultMessage + (warnings[0]?.reason?.length > 0 ? `\n\nWarning reason: '${warnings[0].reason}'` : ""),
errorMessage: defaultMessage + (warnings[0]?.reason?.length > 0 ? `\n\nTip message: '${warnings[0].reason}'` : ""),
errorCode: 403
};
}

4
src/routes/postWarning.ts
View file

@ -62,7 +62,7 @@ export async function postWarning(req: Request, res: Response): Promise<Response
"run", 'UPDATE "warnings" SET "enabled" = 1, "reason" = ? WHERE "userID" = ? AND "issueTime" = ?',
[reason, userID, previousWarning.issueTime]
);
resultStatus = "re-enabled";
resultStatus = "re-enabled for";
} else {
return res.sendStatus(409);
}
@ -93,7 +93,7 @@ export async function postWarning(req: Request, res: Response): Promise<Response
}
return res.status(200).json({
message: `Warning ${resultStatus} user '${userID}'.`,
message: `Tip ${resultStatus} user '${userID}'.`,
});
} catch (e) {
Logger.error(e as string);

2
src/routes/voteOnSponsorTime.ts
View file

@ -384,7 +384,7 @@ export async function vote(ip: IPAddress, UUID: SegmentUUID, paramUserID: UserID
lock.unlock();
return { status: 403, message: "Vote rejected due to a tip from a moderator. This means that we noticed you were making some common mistakes that are not malicious, and we just want to clarify the rules. " +
"Could you please send a message in Discord or Matrix so we can further help you?" +
`${(warningReason.length > 0 ? ` Warning reason: '${warningReason}'` : "")}` };
`${(warningReason.length > 0 ? ` Tip message: '${warningReason}'` : "")}` };
}
// we can return out of the function early if the user is banned after warning checks

2
test/cases/postSkipSegmentsWarnings.ts
View file

@ -63,7 +63,7 @@ describe("postSkipSegments Warnings", () => {
const expected = "Submission rejected due to a tip from a moderator. This means that we noticed you were making some common mistakes"
+ " that are not malicious, and we just want to clarify the rules. "
+ "Could you please send a message in discord.gg/SponsorBlock or matrix.to/#/#sponsor:ajay.app so we can further help you? "
+ `Your userID is ${warnUser01Hash}.\n\nWarning reason: '${reason}'`;
+ `Your userID is ${warnUser01Hash}.\n\nTip message: '${reason}'`;
assert.strictEqual(errorMessage, expected);
done();