Block channels #4230
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| function normalizeId(channelId) { | ||
| return channelId.replace("/channel/", ""); | ||
| } | ||
|
|
||
| export function isChannelBlocked(channelUrl) { | ||
| return new Promise(resolve => { | ||
| var tx = window.db.transaction("blocked_channels", "readonly"); | ||
| var store = tx.objectStore("blocked_channels"); | ||
| store.count(normalizeId(channelUrl)).onsuccess = e => { | ||
| const result = e.target.result; | ||
| resolve(result > 0); | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| export function addBlockedChannel(channelId, name) { | ||
| var tx = window.db.transaction("blocked_channels", "readwrite"); | ||
| var store = tx.objectStore("blocked_channels"); | ||
| store.add({ channelId, name }); | ||
| } | ||
|
|
||
| export function removeBlockedChannel(channelId) { | ||
| var tx = window.db.transaction("blocked_channels", "readwrite"); | ||
| var store = tx.objectStore("blocked_channels"); | ||
| store.delete(channelId); | ||
| } | ||
|
|
||
| export function getBlockedChannels() { | ||
| return new Promise(resolve => { | ||
| let blockedChannels = []; | ||
| var tx = window.db.transaction("blocked_channels", "readonly"); | ||
| var store = tx.objectStore("blocked_channels"); | ||
| const cursor = store.index("channelId").openCursor(); | ||
| cursor.onsuccess = e => { | ||
| const cursor = e.target.result; | ||
| if (cursor) { | ||
| blockedChannels.push(cursor.value); | ||
| cursor.continue(); | ||
| } else { | ||
| resolve(blockedChannels); | ||
| } | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| export async function toggleChannelBlock(channelUrl, name) { | ||
| const channelId = normalizeId(channelUrl); | ||
| return new Promise(resolve => { | ||
| var tx = window.db.transaction("blocked_channels", "readwrite"); | ||
| var store = tx.objectStore("blocked_channels"); | ||
| store.count(channelId).onsuccess = e => { | ||
| const result = e.target.result; | ||
| if (result > 0) { | ||
| store.delete(channelId); | ||
| } else { | ||
| store.add({ channelId, name }); | ||
| } | ||
| resolve(result === 0); | ||
| }; | ||
| }); | ||
| } | ||
|
Comment on lines
+1
to
+61
Contributor
There was a problem hiding this comment. Inconsistent ID normalization causes lookup/storage mismatches.
This breaks when:
Or conversely, duplicate entries could be created for the same channel. Proposed fix: normalize consistently everywhere function normalizeId(channelId) {
return channelId.replace("/channel/", "");
}
export function addBlockedChannel(channelId, name) {
var tx = window.db.transaction("blocked_channels", "readwrite");
var store = tx.objectStore("blocked_channels");
- store.add({ channelId, name });
+ store.add({ channelId: normalizeId(channelId), name });
}
export function removeBlockedChannel(channelId) {
var tx = window.db.transaction("blocked_channels", "readwrite");
var store = tx.objectStore("blocked_channels");
- store.delete(channelId);
+ store.delete(normalizeId(channelId));
}
export async function toggleChannelBlock(channelId, name) {
return new Promise(resolve => {
var tx = window.db.transaction("blocked_channels", "readwrite");
var store = tx.objectStore("blocked_channels");
- store.count(normalizeId(channelId)).onsuccess = e => {
+ const normalized = normalizeId(channelId);
+ store.count(normalized).onsuccess = e => {
const result = e.target.result;
if (result > 0) {
- store.delete(channelId);
+ store.delete(normalized);
} else {
- store.add({ channelId, name });
+ store.add({ channelId: normalized, name });
}
resolve(result === 0);
};
});
}🤖 Prompt for AI Agents |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
blockedstate becomes stale when component is re-activated from cachefetchBlockedStatus()is only called fromgetChannelData()(triggered inonMounted). When the component re-activates from keep-alive (e.g., after the user unblocks a channel in Preferences and navigates back),blocked.valueretains its stale value and the button shows the wrong label.fetchSubscribedStatushas the same gap, but this is a new feature and trivial to fix:🛠️ Proposed fix
onActivated(() => { if (channel.value && !channel.value.error) document.title = channel.value.name + " - Piped"; window.addEventListener("scroll", handleScroll); if (channel.value && !channel.value.error) updateWatched(channel.value.relatedStreams); + if (channel.value && !channel.value.error) fetchBlockedStatus(); });Also applies to: 282-286
🤖 Prompt for AI Agents