From a0ee7ecef4342d378ffdf13b097cf2f618a2a635 Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Wed, 23 Sep 2020 23:05:59 -0400 Subject: [PATCH] fix(defs): update to filter reports --- .../DefinitionsTests/Global.FreeCompany.cs | 4 +++ .../DefinitionsTests/PartyFinder.RMT.cs | 2 ++ .../DefinitionsTests/Roleplay.cs | 4 +++ NoSoliciting/definitions.yaml | 28 +++++++++++++++---- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/NoSoliciting.Tests/DefinitionsTests/Global.FreeCompany.cs b/NoSoliciting.Tests/DefinitionsTests/Global.FreeCompany.cs index 5d73397..021b86d 100644 --- a/NoSoliciting.Tests/DefinitionsTests/Global.FreeCompany.cs +++ b/NoSoliciting.Tests/DefinitionsTests/Global.FreeCompany.cs @@ -20,6 +20,7 @@ namespace NoSoliciting.Tests.DefinitionsTests.Global { new TestMessage(ChatType.Shout, @"Paw Paw Grrr is currently recruiting! We are friendly bunch with constant mood for weird ideas! New? Veteran? Crafter? Doesn't matter! \tell me or Ophelia Shepard for inv :)"), new TestMessage(ChatType.Shout, "We have a beautiful mansion in the Mist with all comforts, a fleet farming for us and +20% battle exp buff on Saturdays! Send me a /tell if you want more info or a invite!"), new TestMessage(ChatType.Shout, "Nothing is a small and cozy FC looking for members! If emptiness is endless, then everything rests in nothingness. DM me to join on our endless journey!"), + new TestMessage(ChatType.Shout, "Tired of wandering through the game a lonely weeb? Want Senpai to notice you?! Fat Chocobo FC is now recruiting! Top Ranked FC on Exodus & Worldwide, 6 yrs+ running strong!"), // party finder new TestMessage("FC recruiting new and experienced players. Interested? Join party, send me a /tell or stop by the FC house for more information. "), @@ -29,11 +30,14 @@ namespace NoSoliciting.Tests.DefinitionsTests.Global { new TestMessage(" is recruiting! We're a slowly growing fc that would appreciate some new faces. /tell for more info or an inv <3"), new TestMessage("Free Company | Fallen Angel | is welcoming new players on Gilgamesh"), new TestMessage("[FC recruitment] Small/New FC looking for more members to join us. New and experienced welcomed. Send tell if interested!"), + new TestMessage(" FC is now recruiting!! we are looking for all types of players. PM me for more info :slight_smile:"), + new TestMessage("Rhotano Mercantile (18+ RP FC) is recruiting neutral and evil characters for dark RP, enquire within! https://rm-rp.carrd.co/"), }); public static object[][] DataNegatives => DefUtils.DataFromMessages(new TestMessage[] { new TestMessage("Static recruit. Not hardcore. Discord needed. tues-thurs 11:30pmEST. Join if you have questions."), new TestMessage("LF new LGBT friends to chill with in Eorzea! Join up, let's chat, and hang out. I have discord as well :)"), + new TestMessage("(Bored)Lovely Au Ra woman [Famfrit] available to be RP girlfriend/wife for long term or short term. Send tell if in need."), }); [Theory] diff --git a/NoSoliciting.Tests/DefinitionsTests/PartyFinder.RMT.cs b/NoSoliciting.Tests/DefinitionsTests/PartyFinder.RMT.cs index a07990f..6c9030b 100644 --- a/NoSoliciting.Tests/DefinitionsTests/PartyFinder.RMT.cs +++ b/NoSoliciting.Tests/DefinitionsTests/PartyFinder.RMT.cs @@ -14,6 +14,8 @@ namespace NoSoliciting.Tests.DefinitionsTests.PartyFinder { "｢ Selling ｣ ♥ Raids Trials Ultimates BLU ♥ Fast Delivery ♥ Price Match ♥ Discord→ Shion#5162", "♥ SELLING ♥ Shiva Unreal / WoL XM - Eden Savage (☆ i500/i505 ☆) - TEA/UwU/UCoB - Old raids and + | Discord add me: gin#5147", "「MinmaxØ」 Offering any  →  →  → & more, Instant delivery. Discord→ Minmax#0001", + "[Viet Rice Farmers] is selling All Content Add on Discord Heyitsjowey#2703", + "【Selling ー All the content. You want something? We got this!ーHQ teams and speed at your service!】Discord : Victoriam#4716", }); public static object[][] DataNegatives => DefUtils.DataFromStrings(new string[] { diff --git a/NoSoliciting.Tests/DefinitionsTests/Roleplay.cs b/NoSoliciting.Tests/DefinitionsTests/Roleplay.cs index e4efc65..0b74e77 100644 --- a/NoSoliciting.Tests/DefinitionsTests/Roleplay.cs +++ b/NoSoliciting.Tests/DefinitionsTests/Roleplay.cs @@ -29,6 +29,10 @@ namespace NoSoliciting.Tests.DefinitionsTests.Global { "Lucky Sevens - Primal's largest and most active RP discord - Welcomes you! discord.gg/LuckySevens", "SPAGHETTI WESTERN NIGHT AT SPAGET 2112! Free cowboy hats! Whiskey provided by the Whiskey Tears! Gilga Mist W21 P12", "(RP) Adonis Blue invites you to frolick and play within our land of enchantment. All are welcome to make merry.Lamia Gob W14 L4.", + "[18+RP] Teraflare is having a VIP sleepover at 1am EST!! Talk to management, and get your VIP access to join our shenanigans!!", + "[RP] Karaoke Night at NRAID HQ! Sign up for a chance to perform on our stage! Spectators welcome! https://discord.gg/ZhgqEqf", + " Coeurlseye Bazaar Night! 9 PM EST - Vendors, food, unique trinkets and more! Learn more at tinyurl.com/CBazaar", + "[RP] [Siren] The Black Flower Lounge is looking for new staff! waiter, bartender and escort positions open! join for info!", }); public static object[][] DataNegatives => DefUtils.DataFromStrings(new string[] { diff --git a/NoSoliciting/definitions.yaml b/NoSoliciting/definitions.yaml index c38c307..938d051 100644 --- a/NoSoliciting/definitions.yaml +++ b/NoSoliciting/definitions.yaml @@ -48,7 +48,7 @@ # slower but more flexible, and they are specified by using a regex # key, as can be seen below. -version: 37 +version: 38 # This is the URL the plugin will POST reports to. report_url: https://nosol.annaclemens.io/report @@ -117,6 +117,7 @@ party_finder: - ultimate - trial - loot + - content - regex: '\bex\b' - regex: '\bmount\b' - regex: e[1-9][0-2]? @@ -140,16 +141,21 @@ global: - - discord.gg - carrd.co - discord.io - # mentions roleplaying or fairly rp-only keywords + - tinyurl.com + # mentions roleplaying - - rp - roleplay - role play - - sfw # also catches nsfw + # mentions fairly rp-only keywords + - - sfw # also catches nsfw - '18+' - '18 +' - open - event - venue + # has a call to action + #- - join + # - regex: '\btell' # has venue type - - venue - cafe @@ -168,6 +174,7 @@ global: - bath - frat - sorority + - bazaar - regex: '\bden\b' # mentions services/activities - - entertainment @@ -181,6 +188,7 @@ global: - dance - dancing - music + - karaoke - contest - giveaway - gambling @@ -193,6 +201,9 @@ global: - maid - cowboy - merry + - girlfriend + - wife + - sleepover # specific RP names - - Lucky Sevens free_company: @@ -205,20 +216,21 @@ global: - shout - yell likelihood_threshold: 3 - # Nothing is a small and cozy FC looking for members! If emptiness is endless, then everything rests in nothingness. DM me to join on our endless journey! likely_matchers: # mentions free company - - fc - free company - recruiting - - regex: '[<«]\w+[>»]' + - regex: '[<«][\w\-]+[>»]' # contains a call to action - - join - apply - /t - dm + - pm - whisper - regex: '\btell' + - regex: '[ie]nquire' # mentions benefits - - discord - map @@ -241,13 +253,17 @@ global: - seasoned - casual - help + - player - new player - new member - new people - new face + - characters - looking for member + - lonely - regex: '\bold\b' - regex: '\bvets?\b' # has common keywords 2 - - welcom - - invite \ No newline at end of file + - invite + - Ranked \ No newline at end of file