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.

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

0.4.2 #267

Merged
merged 50 commits into from
May 22, 2024
Merged

0.4.2 #267

merged 50 commits into from
May 22, 2024

Conversation

rougetimelord
Copy link
Collaborator

@rougetimelord rougetimelord commented Apr 17, 2024

This is a long-lived branch, intended to aggregate all changes planned for version 0.4.2.

Pull requests should be made against this branch. Merges to this branch should be done via a merge commit. When ready, this branch should be merged to main via a squash commit.

Changelog

Deployment Checklist

  1. merge all pull requests to llb
  2. ensure src/manifest.ts and package.json have the correct version number
  3. use makefile to generate zips (make chrome, make firefox)
    • chrome should be tested with npm run build
    • test firefox locally using zip
  4. merge llb to main

Need some diff to start an LLB PR
I did an oopsie whoopsie and flipped the logic in my brain!!
With the new integrations system I want to document everything that gets sent over so other extension devs can implement their own checks that use data that we don't.
Idk what happened here? Did I write code past my bed time? Maybe, no one can ever truly know
[fix] remove reference to chrome.runtime.restartAfterDelay
… as an integration

External extensions can now send a request to Blue Blocker to be registered as a new integration. New integrations registered in this way are set to the disabled state by default, and the user of Blue Block still has to manually set the permissions of the new integration in order for the integration functionality to be enabled. This feature just makes it so that extension users do not have to find the extension ID of an external extension to register an integration.
…rompt

[feat] integration registration prompt
@rougetimelord rougetimelord self-assigned this May 3, 2024
explain 'i'

Reapply "case insensitive"

This reverts commit ae0aa51.

Revert "case insensitive"

This reverts commit 2272caa.

case insensitive

Update index.ts

Update index.html

Update shared.ts

Stylizing changes, refactor element name, add status element

[Fix[ Unclosed textarea tag that caused safelist and integrations buttons to not render

Add a warning to the option explanation

Change to a better console log string

Use input number rules for textarea

Should make the textarea look more cohesive with the rest of the UI

[Fix] Typo

Refactor disallowed words update func, remove uneeded error logging, strip whitespace before storing

Update shared.ts

remove unused function
kheina and others added 6 commits May 8, 2024 18:48
The array.join method does not add the separator to the end of the last array entry, but we need the lookahead on each entry to make sure we don't match on fragments inside of a word
Copy link
Collaborator Author

@rougetimelord rougetimelord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commenting so I can close my review, github is confusing me

@rougetimelord
Copy link
Collaborator Author

rougetimelord commented May 20, 2024

Going to start testing! Can confirm that with the fixes the extension can queue and block people again

@rougetimelord
Copy link
Collaborator Author

rougetimelord commented May 20, 2024

Problems:

  • Empty disallowed words list seems to spam block everything
  • Disallowed words blocking logic does not respect the pause collection setting not an issue, i think...
  • TypeError in popup script, line 72: cannot read property of undefined " join"

@MaxIsJoe
Copy link
Contributor

Problems:

  • Empty disallowed words list seems to spam block everything

image

I added this check specifically to address this issue in my original PR.

@rougetimelord
Copy link
Collaborator Author

Problems:

  • Empty disallowed words list seems to spam block everything

image

I added this check specifically to address this issue in my original PR.

Yea, but then we switched to precompiling the regex, so I'll futz around with it

@rougetimelord
Copy link
Collaborator Author

Ok that's all the bugs I've found so far squashed. Going to keep testing for tonight to see if something pops up, but I think we're close to being able to merge.

@kheina
Copy link
Collaborator

kheina commented May 21, 2024

I'll do another review and some testing tonight after work. hopefully it can go out tonight

@kheina
Copy link
Collaborator

kheina commented May 21, 2024

I'll do another review and some testing tonight after work. hopefully it can go out tonight

I'll probably also just push a bunch of styling changes/fixes since I'm pretty particular about the appearance of the popup menu

@rougetimelord
Copy link
Collaborator Author

I'll do another review and some testing tonight after work. hopefully it can go out tonight

I'll probably also just push a bunch of styling changes/fixes since I'm pretty particular about the appearance of the popup menu

Go ham! I think having the setting be hidden behind a checkbox if not enabled would make a lot of sense in terms of not cluttering up the interface, kinda like what the skip threshold setting does

@kheina
Copy link
Collaborator

kheina commented May 21, 2024

I'll do another review and some testing tonight after work. hopefully it can go out tonight

I'll probably also just push a bunch of styling changes/fixes since I'm pretty particular about the appearance of the popup menu

Go ham! I think having the setting be hidden behind a checkbox if not enabled would make a lot of sense in terms of not cluttering up the interface, kinda like what the skip threshold setting does

I went ham

if (user.legacy?.blocking || (config.mute && user.legacy?.muting)) {
return;
}
// set up this funky little function so that we can return to exit early from verified block but continue with other steps
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this, might be worth splitting this function out in the future

src/popup/index.ts Show resolved Hide resolved
@rougetimelord
Copy link
Collaborator Author

One approval pls 👉🏻👈🏻

Copy link
Collaborator

@kheina kheina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

way too much shit in one PR tbh. lets try to keep them smaller from here on out (even for the releases

@kheina kheina merged commit 20a1598 into main May 22, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants