From 3d30658331e9bf99f4d0c9a4e6bc13d669e8cb2e Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 5 Feb 2017 09:39:19 -0500 Subject: Updated verbly (new API) Also blacklisted ethnic slurs, and updated libtwitter++. --- nancy.cpp | 16 +++++++++++----- vendor/libtwittercpp | 2 +- vendor/verbly | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/nancy.cpp b/nancy.cpp index a5a1433..523db57 100644 --- a/nancy.cpp +++ b/nancy.cpp @@ -74,7 +74,7 @@ int main(int argc, char** argv) } // verbly - verbly::data database(config["verbly_datafile"].as()); + verbly::database database(config["verbly_datafile"].as()); // Twitter twitter::auth auth; @@ -96,15 +96,21 @@ int main(int argc, char** argv) int i; while ((i = form.find("{adj}")) != std::string::npos) { - verbly::adjective adj = database.adjectives().random().limit(1).run().front(); - form.replace(i, 5, capitalize(adj.base_form())); + verbly::word adj = database.words(verbly::notion::partOfSpeech == verbly::part_of_speech::adjective).first(); + + form.replace(i, 5, capitalize(adj.getBaseForm())); } // Nouns while ((i = form.find("{noun}")) != std::string::npos) { - verbly::noun n = database.nouns().is_not_proper().random().limit(1).run().front(); - form.replace(i, 6, capitalize(n.singular_form())); + verbly::word n = database.words( + (verbly::notion::partOfSpeech == verbly::part_of_speech::noun) + && (verbly::form::proper == false) + && !(verbly::word::usageDomains %= (verbly::notion::wnid == 106718862)) // Blacklist ethnic slurs + ).first(); + + form.replace(i, 6, capitalize(n.getBaseForm())); } if (form.size() > 140) diff --git a/vendor/libtwittercpp b/vendor/libtwittercpp index d90a1e7..df90612 160000 --- a/vendor/libtwittercpp +++ b/vendor/libtwittercpp @@ -1 +1 @@ -Subproject commit d90a1e74c77ba67f25a812609fd49d479bc464dd +Subproject commit df906121dd862c0f704e44f28ee079158c431c41 diff --git a/vendor/verbly b/vendor/verbly index 1f898f3..a3a033c 160000 --- a/vendor/verbly +++ b/vendor/verbly @@ -1 +1 @@ -Subproject commit 1f898f3bd66c29672275c2c884b17ba662ced626 +Subproject commit a3a033c730a2eb4242076f5b34823190aa441cd5 -- cgit 1.4.1