Merge pull request #1550 from mchangrh/stricter-ts

add noFallThrough, inplicitReturn, update packages
This commit is contained in:
Ajay Ramachandran
2022-11-04 17:06:36 -04:00
committed by GitHub
12 changed files with 1300 additions and 1734 deletions

View File

@@ -59,16 +59,16 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
switch(request.message) {
case "openConfig":
chrome.tabs.create({url: chrome.runtime.getURL('options/options.html' + (request.hash ? '#' + request.hash : ''))});
return;
return false;
case "openHelp":
chrome.tabs.create({url: chrome.runtime.getURL('help/index.html')});
return;
return false;
case "openUpsell":
chrome.tabs.create({url: chrome.runtime.getURL('upsell/index.html')});
return;
return false;
case "openPage":
chrome.tabs.create({url: chrome.runtime.getURL(request.url)});
return;
return false;
case "sendRequest":
sendRequestToCustomServer(request.type, request.url, request.data).then(async (response) => {
callback({
@@ -112,6 +112,8 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
popupPort[sender.tab.id]?.postMessage(request);
}
return false;
default:
return false;
}
});

View File

@@ -373,6 +373,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
</span>
);
}
return null;
}
getSubmissionChooser(): JSX.Element[] {

View File

@@ -2112,11 +2112,11 @@ async function vote(type: number, UUID: SegmentUUID, category?: Category, skipNo
return response;
}
async function voteAsync(type: number, UUID: SegmentUUID, category?: Category): Promise<VoteResponse> {
async function voteAsync(type: number, UUID: SegmentUUID, category?: Category): Promise<VoteResponse | undefined> {
const sponsorIndex = utils.getSponsorIndexFromUUID(sponsorTimes, UUID);
// Don't vote for preview sponsors
if (sponsorIndex == -1 || sponsorTimes[sponsorIndex].source !== SponsorSourceType.Server) return;
if (sponsorIndex == -1 || sponsorTimes[sponsorIndex].source !== SponsorSourceType.Server) return Promise.resolve(undefined);
// See if the local time saved count and skip count should be saved
if (type === 0 && sponsorSkipped[sponsorIndex] || type === 1 && !sponsorSkipped[sponsorIndex]) {

View File

@@ -744,7 +744,7 @@ class PreviewBar {
chaptersContainer.style.display = "none";
}
return;
return [];
}
segments ??= [];

View File

@@ -67,9 +67,11 @@ class MessageHandler {
// To prevent clickjacking
let allowPopup = window === window.top;
window.addEventListener("message", async (e) => {
window.addEventListener("message", async (e): Promise<void> => {
if (e.source !== window.parent) return;
if (e.origin.endsWith('.youtube.com')) return allowPopup = true;
if (e.origin.endsWith('.youtube.com')) {
allowPopup = true;
}
});
//make this a function to allow this to run on the content page

View File

@@ -319,6 +319,7 @@ export default class Utils {
return selection;
}
}
return { name: "None", option: 0} as CategorySelection;
}
/**

View File

@@ -148,5 +148,13 @@ export function getGuidelineInfo(category: Category): TextBox[] {
icon: "icons/check-smaller.svg",
text: chrome.i18n.getMessage(`category_${category}_guideline3`)
}];
default:
return [{
icon: "icons/segway.png",
text: chrome.i18n.getMessage(`generic_guideline1`)
}, {
icon: "icons/right-arrow.svg",
text: chrome.i18n.getMessage(`generic_guideline2`)
}];
}
}

View File

@@ -22,5 +22,7 @@ export function urlTimeToSeconds(time: string): number {
return hours * 3600 + minutes * 60 + seconds;
} else if (/\d+/.test(time)) {
return parseInt(time, 10);
} else {
return 0;
}
}