Sync upstream Pass 52 into difflabai main - #51
Merged
Merged
Conversation
Part B: add eight Afrobeats label identifiers verified as true gaps on latest main (allow, term-span-free on overlay-only and full-catalog paths under signed-to assertion framing, true catalog-only isolation with explicit catalog: shippedCatalog confirms allow): YBNL (Olamide) + Empawa (Mr Eazi emPawa Africa, bare head - Empawa Music/Africa covered) + Jonzing World (Rema) + PentHauze (Phyno, bare head - PentHauze Music covered) + Zanku Records (Zlatan) + Plutomania Records (Shallipopi) + Hypertek Digital (2Baba) + Kukere Records (Iyanya). Skipped candidates already covered by the catalog (Starboy Entertainment, Davido Music Worldwide, Made Men Music Group, Chocolate City Music, Mavin Music, YBNL Entertainment/Nation via Nation, Empawa Music/Africa, PentHauze Music, Dvpper/Capital Hill/Loopy/Storm/Kennis/Eko/Africha/ Five Star/HKN via Music/franchise/artist spans; Marlian Music, Flyboy Inc, Baseline/Ravers/Communion/Lex/RAM/Hessle via review spans; PC/Night Slugs/Hospital/Shogun/Critical/Brownswood/First Word/ Tru Thoughts/Chess Club/Dead Oceans/Mexican Summer/Captured/Sacred/ Hardly/Ghostly/Kompakt/Anand/Lahari/Geet/Kitchen/Milk/Speed/White Hill/ Saga via work/franchise/artist spans). No commonWord gating needed (digital is allowlisted but suppression is exact-phrase only, so the Hypertek Digital bigram still fires); no other DEFAULT_ALLOWLIST collisions; short ambiguous aliases omitted (bare DMW trigram held; bare Plutomania/Zanku/Jonzing variants held as redundant to full forms). Part A: re-audited all 33 remaining music-irrelevant unscoped trademarks on the music path with true catalog-only isolation (replaceBlocklist + shippedCatalog, media music, signed-to framing) - each still fires from the shipped catalog (Adidas, Bose, Chanel, Coca-Cola, DreamWorks, Facebook, Gucci, Instagram, iPhone, Joy-Con, LEGO, Louis Vuitton, Luma, McDonald's, Microsoft, Netflix, Nintendo Switch, Nintendo Direct, Paramount, Pepsi, Prime Video, PS5 (review), Rolex, Sony Pictures, Starbucks, Steam, Switch 2, TikTok, Unity, Universal Pictures, Warner Bros, YouTube, Gemini; AirPods is catalog-silent but stays all-media as audio gear), so left unscoped per standing rule. No overlay changes in Part A. Audio/DJ gear and music platforms/distributors/labels stay all-media. Allow-path: explicit Afrobeats-label block cases on the overlay path plus near-miss splits and innocent boundary prompts (empower/zoning/ pentatonic/pluto/hyper/digital/afrobeats/lagos/cookout/zanzibar) asserted allow on both overlay and full paths. Identifiers only, never lyrics. Not legal advice. Co-authored-by: Cursor Agent <cursoragent@cursor.com>
…ai main Co-authored-by: mikkel <mikkel@255bits.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Brings difflabai main current with mikkel/copyright-censor main through Pass 52 (Afrobeats-label overlay + media-scope + allow-path, upstream 6ac7557, mikkel#55).
Pure merge preserving upstream SHA, matching prior sync-upstream-pass* PRs. Diff is upstream content only (data/blocklist.json + tests); no new blocklist work invented here.
Verification: npm test passes (159 pass, 0 fail).