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

Add virtual bad word list; Load if dump is missing #3977

Merged
merged 3 commits into from Jul 30, 2018

Conversation

Projects
None yet
5 participants
@B3n30
Contributor

B3n30 commented Jul 22, 2018

This will load the bad word list generated with https://github.com/B3n30/citra_system_archives if no dumped file was found.

The only bad word in the list is "badword".


This change is Reviewable

@cluezbot

This comment has been minimized.

cluezbot commented Jul 22, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-07-22T20:52:31Z: 8388e55...B3n30:728fa58ceff7f28e11afa510acff68bbed0febce

@B3n30 B3n30 force-pushed the B3n30:bad_word_list branch from 728fa58 to 7605e26 Jul 22, 2018

@cluezbot

This comment has been minimized.

cluezbot commented Jul 22, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-07-22T20:55:59Z: 8388e55...B3n30:7605e26b94fac143cff7d089b3f63b71bef8b7a5

@legoj15

This comment has been minimized.

legoj15 commented Jul 22, 2018

I feel like some users would see the lack of bad words in the list as a feature haha

@@ -0,0 +1,131 @@
// Git Hash: 47cdc9394501a61406529e3037763745c9642b23
unsigned char BAD_WORD_LIST_DATA[] = {

This comment has been minimized.

@lioncash

lioncash Jul 23, 2018

Member

This could just be a std::array, which would make the length variable unnecessary. This should also be put in a cpp file and just be exposed via an extern const, otherwise this can cause copying of the entire data if it's referenced in multiple translation units.

This comment has been minimized.

@wwylele

wwylele Jul 23, 2018

Member

@lioncash The code is generated by xxd and I don't really want to read more code messing around the type and structure in the generated code...

This comment has been minimized.

@lioncash

lioncash Jul 23, 2018

Member

Cool (I still don't see an issue here, but I don't care about arguing about it). At the very least both the array and the size should be const.

This comment has been minimized.

@B3n30

B3n30 Jul 24, 2018

Contributor

I manually added const for now. I will look into automatically converting the files generated with xxd into cpp files.

LOG_WARNING(
Service_FS,
"Bad Word List file missing. Loading open source replacement from memory");
std::vector<u8> bad_word_list_file;

This comment has been minimized.

@lioncash

lioncash Jul 23, 2018

Member
std::vector<u8> bad_word_list_file(std::begin(BAD_WORD_LIST_DATA), std::end(BAD_WORD_LIST_DATA));
@cluezbot

This comment has been minimized.

cluezbot commented Jul 24, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-07-24T21:33:43Z: 8388e55...B3n30:8a2c44be5688db1cea22ba7c485e8befc892e673

@cluezbot

This comment has been minimized.

cluezbot commented Jul 28, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-07-28T10:07:23Z: 8388e55...B3n30:97fda30839d148562a4d6b0b64e124814a37f360

@wwylele wwylele merged commit 1f14ebf into citra-emu:master Jul 30, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment