|
|
@@ -136,10 +136,10 @@ class PatternCog(BaseCog):
|
|
136
|
136
|
# return patterns
|
|
137
|
137
|
|
|
138
|
138
|
def __get_patterns(self, guild: Guild) -> dict:
|
|
139
|
|
- patterns = Storage.get_state_value(guild, 'PatternsCog.patterns')
|
|
|
139
|
+ patterns = Storage.get_state_value(guild, 'PatternCog.patterns')
|
|
140
|
140
|
if patterns is None:
|
|
141
|
141
|
patterns = {}
|
|
142
|
|
- patterns_encoded = Storage.get_config_value(guild, 'PatternsCog.patterns')
|
|
|
142
|
+ patterns_encoded = Storage.get_config_value(guild, 'PatternCog.patterns')
|
|
143
|
143
|
if patterns_encoded:
|
|
144
|
144
|
for pe in patterns_encoded:
|
|
145
|
145
|
name = pe.get('name')
|
|
|
@@ -149,7 +149,7 @@ class PatternCog(BaseCog):
|
|
149
|
149
|
patterns[name] = ps
|
|
150
|
150
|
except RuntimeError as e:
|
|
151
|
151
|
self.log(guild, f'Error parsing saved statement "{name}". Skipping: {statement}')
|
|
152
|
|
- Storage.set_state_value(guild, 'PatternsCog.patterns', patterns)
|
|
|
152
|
+ Storage.set_state_value(guild, 'PatternCog.patterns', patterns)
|
|
153
|
153
|
return patterns
|
|
154
|
154
|
|
|
155
|
155
|
def __save_patterns(self, guild: Guild, patterns: dict) -> None:
|
|
|
@@ -159,7 +159,7 @@ class PatternCog(BaseCog):
|
|
159
|
159
|
'name': name,
|
|
160
|
160
|
'statement': statement.original,
|
|
161
|
161
|
})
|
|
162
|
|
- Storage.set_config_value(guild, 'PatternsCog.patterns', to_save)
|
|
|
162
|
+ Storage.set_config_value(guild, 'PatternCog.patterns', to_save)
|
|
163
|
163
|
|
|
164
|
164
|
@commands.Cog.listener()
|
|
165
|
165
|
async def on_message(self, message: Message) -> None:
|
|
|
@@ -258,14 +258,16 @@ class PatternCog(BaseCog):
|
|
258
|
258
|
)
|
|
259
|
259
|
@commands.has_permissions(ban_members=True)
|
|
260
|
260
|
@commands.guild_only()
|
|
261
|
|
- async def patterns(self, context: commands.Context):
|
|
|
261
|
+ async def pattern(self, context: commands.Context):
|
|
262
|
262
|
'Message pattern matching'
|
|
263
|
263
|
if context.invoked_subcommand is None:
|
|
264
|
264
|
await context.send_help()
|
|
265
|
265
|
|
|
266
|
|
- @patterns.command(
|
|
|
266
|
+ @pattern.command(
|
|
267
|
267
|
brief='Adds a custom pattern',
|
|
268
|
|
- description='Adds a custom pattern. Patterns use a simplified expression language. Full documentation found here: https://git.rixafrix.com/ialbert/python-app-rocketbot/src/branch/master/patterns.md',
|
|
|
268
|
+ description='Adds a custom pattern. Patterns use a simplified ' + \
|
|
|
269
|
+ 'expression language. Full documentation found here: ' + \
|
|
|
270
|
+ 'https://git.rixafrix.com/ialbert/python-app-rocketbot/src/branch/master/patterns.md',
|
|
269
|
271
|
usage='<pattern_name> <expression...>',
|
|
270
|
272
|
ignore_extra=True
|
|
271
|
273
|
)
|
|
|
@@ -284,7 +286,7 @@ class PatternCog(BaseCog):
|
|
284
|
286
|
f'{CONFIG["failure_emoji"]} Error parsing statement. {e}',
|
|
285
|
287
|
mention_author=False)
|
|
286
|
288
|
|
|
287
|
|
- @patterns.command(
|
|
|
289
|
+ @pattern.command(
|
|
288
|
290
|
brief='Removes a custom pattern',
|
|
289
|
291
|
usage='<pattern_name>'
|
|
290
|
292
|
)
|
|
|
@@ -301,7 +303,7 @@ class PatternCog(BaseCog):
|
|
301
|
303
|
f'{CONFIG["failure_emoji"]} No pattern named `{name}`.',
|
|
302
|
304
|
mention_author=False)
|
|
303
|
305
|
|
|
304
|
|
- @patterns.command(
|
|
|
306
|
+ @pattern.command(
|
|
305
|
307
|
brief='Lists all patterns'
|
|
306
|
308
|
)
|
|
307
|
309
|
async def list(self, context: commands.Context) -> None:
|