Skip to content

Commit 555f7e9

Browse files
committed
Added ability to have more than one hex or rgb on a message
1 parent fe683a8 commit 555f7e9

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
class Kandan.Plugins.HexColorEmbed
22
@options:
3-
regex: /#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/
3+
regex: /#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/g
44

5-
template: _.template '''
6-
<span class="color-preview" style="background-color:<%= hex %>;"/>
7-
'''
5+
template: _.template '''<span class="color-preview" style="background-color:<%= hex %>;"/>'''
86

97
@init: ()->
108
Kandan.Modifiers.register @options.regex, (message, state) =>
11-
hex = message.content.match(@options.regex)[0]
12-
replacement = @options.template({hex: hex}) + hex
13-
14-
message.content = message.content.replace(hex, replacement)
9+
for hex in message.content.match(@options.regex)
10+
replacement = @options.template({hex: hex}) + hex
11+
message.content = message.content.replace(hex, replacement)
1512

1613
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
class Kandan.Plugins.RgbColorEmbed
22
@options:
3-
regex: /rgb\((\d{1,3}),\s?(\d{1,3}),\s?(\d{1,3})\)/
3+
regex: /rgb\((\d{1,3}),\s?(\d{1,3}),\s?(\d{1,3})\)/g
44

5-
template: _.template '''
6-
<span class="color-preview" style="background-color:<%= rgb %>;"/>
7-
'''
5+
template: _.template '''<span class="color-preview" style="background-color:<%= rgb %>;"/>'''
86

97
@init: ()->
108
Kandan.Modifiers.register @options.regex, (message, state) =>
11-
rgb = message.content.match(@options.regex)[0]
12-
replacement = @options.template({rgb: rgb}) + rgb
13-
14-
message.content = message.content.replace(rgb, replacement)
9+
for rgb in message.content.match(@options.regex)
10+
replacement = @options.template({rgb: rgb}) + rgb
11+
message.content = message.content.replace(rgb, replacement)
1512

1613
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
1714

0 commit comments

Comments
 (0)