Merge branch 'dev'

AIE-Guild · Nov 3, 2014 · 601d1ba · 601d1ba
2 parents 58aafd5 + 4188d08
commit 601d1ba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/WsGreenWall.lua b/WsGreenWall.lua
@@ -417,16 +417,21 @@ function WsGreenWall:OnBridgeMessage(channel, tBundle, strSender)
                     end
                 end
 
-                -- Apply tagging.
-                if self.options.bTag then
-                    message = self:TagMessage(message, tBundle.guild_tag)
-                end
+                if tBundle.event_type == EVENT_CHAT then
+
+                    -- Apply tagging.
+                    if self.options.bTag then
+                        message = self:TagMessage(message, tBundle.guild_tag)
+                    end
 
-                -- Clean up unprintable characters.
-                message = self:GroomMessage(message)
+                    -- Clean up unprintable characters.
+                    message = self:GroomMessage(message)
 
-                -- Generate an event for the received chat message.
-                Event_FireGenericEvent("ChatMessage", self.channel[chanId].target, message)
+                    -- Generate an event for the received chat message.
+                    Event_FireGenericEvent("ChatMessage", self.channel[chanId].target, message)
+
+                end
+
             end
 
         end
@@ -725,7 +730,7 @@ function WsGreenWall:ChannelFlush(nChannelId)
                     confederation   = self.confederation,
                     guild           = self.guild,
                     guild_tag       = self.guild_tag,
-                    event_type      = EVENT_CHAT,                    
+                    event_type      = nType,                    
                     type            = nChannelId, -- For backwards compatibility with 1.0.0-beta and earlier.
                     encrypted       = false,
                     nonce           = nil,

diff --git a/toc.xml b/toc.xml
@@ -26,7 +26,7 @@ SOFTWARE.
 
 -->
 <?xml version="1.0" encoding="UTF-8"?>
-<Addon Author="Mark Rogaski" APIVersion="9" Name="WsGreenWall" Version="1.0.2" Description="Guild chat bridging for WildStar.">
+<Addon Author="Mark Rogaski" APIVersion="9" Name="WsGreenWall" Version="1.1.0" Description="Guild chat bridging for WildStar.">
     <Script Name="WsGreenWall.lua"/>
     <Form Name="WsGreenWall.xml"/>
     <Script Name="Libs\Base64.lua"/>