Changeset 373

Timestamp:

04/15/08 00:23:42 (9 months ago)

Author:

tomoyo

Message:

とりあえず適当にモードを使うことで特定のチャンネルはエコーバックしないようにする機能を追加。

Location:

TwitterIrcGateway/TwitterIrcGatewayCore

Files:

• Group.cs (modified) (5 diffs)
• IRCClient/ChannelMode.cs (added)
• IRCClient/ChannelModeTypes.cs (added)
• Session.cs (modified) (4 diffs)
• TwitterIrcGatewayCore.csproj (modified) (2 diffs)

TwitterIrcGateway/TwitterIrcGatewayCore/Group.cs

@@ -6 +6 @@
 using System.IO;
 using System.Xml;
+using Misuzilla.Net.Irc;
 
 namespace Misuzilla.Applications.TwitterIrcGateway
@@ -54 +55 @@
                 retGroups[group.Name] = group;
                 group.IsJoined = false;
+                group.ChannelModes = group.ChannelModes == null ? new List<ChannelMode>() : group.ChannelModes;
             }
 
@@ -67 +69 @@
         public Boolean IsJoined { get; set; }
         public String Topic { get; set; }
+        public List<ChannelMode> ChannelModes { get; set; }
 
         public Group()
         {
+            ChannelModes = new List<ChannelMode>();
         }
 
@@ -80 +84 @@
             Name = name;
             Members = new List<string>();
+            ChannelModes = new List<ChannelMode>();
         }
 
@@ -110 +115 @@
         }
 
+        public Boolean IgnoreEchoBack
+        {
+            get
+            {
+                return ChannelModes.Exists(mode => mode.Mode == ChannelModeTypes.Private);
+            }
+        }
+
         #region IComparable �����o
 

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -66 +66 @@
             MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_LIST);
             MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_TIGGC);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_TOPIC);
+            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_MODE);
 
             _groups = new Groups();
@@ -413 +413 @@
                     SendNumericReply(NumericReply.RPL_ENDOFNAMES, channelName, "End of NAMES list");
                     group.IsJoined = true;
+
+                    // mode
+                    foreach (ChannelMode mode in group.ChannelModes)
+                    {
+                        Send(new ModeMessage(channelName, mode.ToString()));
+                    }
                     
                     // Set topic of client, if topic was set
@@ -736 +742 @@
                         foreach (Group group in _groups.Values)
                         {
-                            if (group.IsJoined && String.Compare(message.Receiver, group.Name, true) != 0)
+                            if (group.IsJoined && !group.IgnoreEchoBack && String.Compare(message.Receiver, group.Name, true) != 0)
                             {
                                 if (_server.BroadcastUpdateMessageIsNotice)
@@ -866 +872 @@
             }
         }
-
+        
+        void MessageRecieved_MODE(object sender, MessageRecievedEventArgs e)
+        {
+            if (String.Compare(e.Message.Command, "MODE", true) != 0) return;
+            ModeMessage modeMsg = e.Message as ModeMessage;
+            // チャンネルターゲットのみ
+            if (modeMsg.CommandParams[0].StartsWith("#"))
+            {
+                String channel = modeMsg.CommandParams[0];
+                String modeArgs = modeMsg.CommandParams[1];
+                Group group;
+                if (!_groups.TryGetValue(channel, out group))
+                {
+                    SendErrorReply(ErrorReply.ERR_NOSUCHCHANNEL);
+                }
+                
+                foreach (ChannelMode mode in ChannelMode.Parse(modeArgs))
+                {
+                    foreach (ChannelMode mode2 in new List<ChannelMode>(group.ChannelModes))
+                    {
+                        if (mode2.Mode == mode.Mode && mode2.Parameter == mode.Parameter)
+                        {
+                            if (mode.IsRemove)
+                            {
+                                // すでにあって削除
+                                group.ChannelModes.Remove(mode2);
+                            }
+                            else
+                            {
+                                // すでにある
+                                goto NEXT;
+                            }
+                        }
+                    }
+                    
+                    if (!mode.IsRemove)
+                    {
+                        group.ChannelModes.Add(mode);
+                    }
+                    SendServer(new ModeMessage(channel, mode.ToString()));
+                    SaveGroups();
+                NEXT:
+                    ;
+                }
+            }
+        }
         #endregion
 

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterIrcGatewayCore.csproj

@@ -3 +3 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A256703-BDC7-4E96-8AC3-89A56A2AFB86}</ProjectGuid>
@@ -43 +43 @@
     <Compile Include="Filter.cs" />
     <Compile Include="Group.cs" />
+    <Compile Include="IRCClient\ChannelMode.cs" />
+    <Compile Include="IRCClient\ChannelModeTypes.cs" />
     <Compile Include="IRCClient\Converter.cs" />
     <Compile Include="IRCClient\ErrorReply.cs" />