Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix channel page ID handling #2457

Merged
merged 2 commits into from
Aug 8, 2022
Merged

Fix channel page ID handling #2457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272389d
Fix channel page ID check race condition
absidue Aug 1, 2022
fd119c3
Correctly handle the different channel ID types
absidue Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/renderer/components/top-nav/top-nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@ export default Vue.extend({
}

case 'channel': {
const { channelId, subPath } = result
const { channelId, idType, subPath } = result

this.$router.push({
path: `/channel/${channelId}/${subPath}`
path: `/channel/${channelId}/${subPath}`,
query: { idType }
})
break
}
Expand Down
7 changes: 5 additions & 2 deletions src/renderer/store/modules/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ const actions = {
let urlType = 'unknown'

const channelPattern =
/^\/(?:(c|channel|user)\/)?(?<channelId>[^/]+)(?:\/(join|featured|videos|playlists|about|community|channels))?\/?$/
/^\/(?:(?<type>channel|user|c)\/)?(?<channelId>[^/]+)(?:\/(join|featured|videos|playlists|about|community|channels))?\/?$/

const typePatterns = new Map([
['playlist', /^\/playlist\/?$/],
Expand Down Expand Up @@ -719,7 +719,9 @@ const actions = {

*/
case 'channel': {
const channelId = url.pathname.match(channelPattern).groups.channelId
const match = url.pathname.match(channelPattern)
const channelId = match.groups.channelId
const idType = ['channel', 'user', 'c'].indexOf(match.groups.type) + 1
if (!channelId) {
throw new Error('Channel: could not extract id')
}
Expand All @@ -741,6 +743,7 @@ const actions = {
return {
urlType: 'channel',
channelId,
idType,
subPath
}
}
Expand Down
33 changes: 20 additions & 13 deletions src/renderer/views/Channel/Channel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export default Vue.extend({
isElementListLoading: false,
currentTab: 'videos',
id: '',
idType: 0,
channelName: '',
bannerUrl: '',
thumbnailUrl: '',
Expand Down Expand Up @@ -170,7 +171,9 @@ export default Vue.extend({
watch: {
$route() {
// react to route changes...
this.originalId = this.$route.params.id
this.id = this.$route.params.id
this.idType = this.$route.query.idType ? Number(this.$route.query.idType) : 0
this.currentTab = this.$route.params.currentTab ?? 'videos'
this.latestVideosPage = 2
this.searchPage = 2
Expand Down Expand Up @@ -232,7 +235,9 @@ export default Vue.extend({
}
},
mounted: function () {
this.originalId = this.$route.params.id
this.id = this.$route.params.id
this.idType = this.$route.query.idType ? Number(this.$route.query.idType) : 0
this.currentTab = this.$route.params.currentTab ?? 'videos'
this.isLoading = true

Expand All @@ -259,21 +264,23 @@ export default Vue.extend({

getChannelInfoLocal: function () {
this.apiUsed = 'local'
const expectedId = this.id
ytch.getChannelInfo({ channelId: expectedId }).then((response) => {
const expectedId = this.originalId
ytch.getChannelInfo({ channelId: this.id, channelIdType: this.idType }).then((response) => {
if (response.alertMessage) {
this.setErrorMessage(response.alertMessage)
return
}
this.errorMessage = ''
if (expectedId !== this.id) {
if (expectedId !== this.originalId) {
return
}

const channelId = response.authorId
const channelName = response.author
const channelThumbnailUrl = response.authorThumbnails[2].url
this.id = channelId
// set the id type to 1 so that searching and sorting work
this.idType = 1
this.channelName = channelName
this.isFamilyFriendly = response.isFamilyFriendly
document.title = `${this.channelName} - ${process.env.PRODUCT_NAME}`
Expand Down Expand Up @@ -332,9 +339,9 @@ export default Vue.extend({

getChannelVideosLocal: function () {
this.isElementListLoading = true
const expectedId = this.id
ytch.getChannelVideos({ channelId: expectedId, sortBy: this.videoSortBy }).then((response) => {
if (expectedId !== this.id) {
const expectedId = this.originalId
ytch.getChannelVideos({ channelId: this.id, channelIdType: this.idType, sortBy: this.videoSortBy }).then((response) => {
if (expectedId !== this.originalId) {
return
}

Expand Down Expand Up @@ -383,9 +390,9 @@ export default Vue.extend({
this.isLoading = true
this.apiUsed = 'invidious'

const expectedId = this.id
this.invidiousGetChannelInfo(expectedId).then((response) => {
if (expectedId !== this.id) {
const expectedId = this.originalId
this.invidiousGetChannelInfo(this.id).then((response) => {
if (expectedId !== this.originalId) {
return
}

Expand Down Expand Up @@ -463,9 +470,9 @@ export default Vue.extend({
},

getPlaylistsLocal: function () {
const expectedId = this.id
ytch.getChannelPlaylistInfo({ channelId: expectedId, sortBy: this.playlistSortBy }).then((response) => {
if (expectedId !== this.id) {
const expectedId = this.originalId
ytch.getChannelPlaylistInfo({ channelId: this.id, channelIdType: this.idType, sortBy: this.playlistSortBy }).then((response) => {
if (expectedId !== this.originalId) {
return
}

Expand Down Expand Up @@ -732,7 +739,7 @@ export default Vue.extend({

searchChannelLocal: function () {
if (this.searchContinuationString === '') {
ytch.searchChannel({ channelId: this.id, query: this.lastSearchQuery }).then((response) => {
ytch.searchChannel({ channelId: this.id, channelIdType: this.idType, query: this.lastSearchQuery }).then((response) => {
console.log(response)
this.searchResults = response.items
this.isElementListLoading = false
Expand Down