Changeset 367

Timestamp:

03/16/08 19:02:56 (10 months ago)

Author:

tomoyo

Message:

* 初回接続時のログをグループにも転送するようにした
* メッセージ送信ウェイトを指定できるようにした

Location:

TwitterIrcGateway

Files:

• TwitterIrcGateway/App.config (modified) (1 diff)
• TwitterIrcGateway/Program.cs (modified) (1 diff)
• TwitterIrcGateway/Settings.Designer.cs (modified) (2 diffs)
• TwitterIrcGateway/Settings.settings (modified) (1 diff)
• TwitterIrcGatewayCLI/Program.cs (modified) (3 diffs)
• TwitterIrcGatewayCore/Server.cs (modified) (1 diff)
• TwitterIrcGatewayCore/Session.cs (modified) (2 diffs)

TwitterIrcGateway/TwitterIrcGateway/App.config

@@ -56 +56 @@
                 <value>False</value>
             </setting>
+            <setting name="ClientMessageWait" serializeAs="String">
+                <value>0</value>
+            </setting>
         </Misuzilla.Applications.TwitterIrcGateway.Settings>
     </userSettings>

TwitterIrcGateway/TwitterIrcGateway/Program.cs

@@ -60 +60 @@
             _server.DisableUserList = _settings.DisableUserList;
             _server.BroadcastUpdate = _settings.BroadcastUpdate;
+            _server.ClientMessageWait = _settings.ClientMessageWait;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
             try

TwitterIrcGateway/TwitterIrcGateway/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     このコードはツールによって生成されました。
-//     ランタイム バージョン:2.0.50727.1433
+//     ランタイム バージョン:2.0.50727.1434
 //
 //     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
@@ -215 +215 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int ClientMessageWait {
+            get {
+                return ((int)(this["ClientMessageWait"]));
+            }
+            set {
+                this["ClientMessageWait"] = value;
+            }
+        }
     }
 }

TwitterIrcGateway/TwitterIrcGateway/Settings.settings

@@ -51 +51 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ClientMessageWait" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

TwitterIrcGateway/TwitterIrcGatewayCLI/Program.cs

@@ -57 +57 @@
             _server.DisableUserList = options.DisableUserlist;
             _server.BroadcastUpdate = options.BroadcastUpdate;
+            _server.ClientMessageWait = options.ClientMessageWait;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
 
@@ -75 +76 @@
             Console.WriteLine("[Configuration] DisableUserList: {0}", _server.DisableUserList);
             Console.WriteLine("[Configuration] BroadcastUpdate: {0}", _server.BroadcastUpdate);
+            Console.WriteLine("[Configuration] ClientMessageWait: {0}", _server.ClientMessageWait);
 
             _server.Start(bindAddress, options.Port);
@@ -160 +162 @@
         [Description("broadcast status message on updated")]
         public Boolean BroadcastUpdate { get; set; }
+
+        [DefaultValue(0)]
+        [Description("wait of send messages to client (milliseconds)")]
+        public Int32 ClientMessageWait { get; set; }
     }
 }

TwitterIrcGateway/TwitterIrcGatewayCore/Server.cs

@@ -78 +78 @@
         /// </summary>
         public Boolean BroadcastUpdate = false;
+
+        /// <summary>
+        /// �N���C�A���g�Ƀ��b�Z�[�W�𑗐M�������̃E�F�C�g
+        /// </summary>
+        public Int32 ClientMessageWait = 0;
 
         public const String ServerName = "localhost";

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -1135 +1135 @@
                 if (_isFirstTime)
                 {
-                    NoticeMessage noticeMsg = new NoticeMessage();
-                    noticeMsg.SenderNick = status.User.ScreenName;
-                    noticeMsg.SenderHost = "twitter@" + Server.ServerName;
-                    noticeMsg.Receiver = _server.ChannelName;
-                    noticeMsg.Content = String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line);
-                    Send(noticeMsg);
+                    Send(new NoticeMessage()
+                    {
+                        SenderNick = status.User.ScreenName,
+                        SenderHost = "twitter@" + Server.ServerName,
+                        Receiver   = _server.ChannelName,
+                        Content    = String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line)
+                    });
                 }
                 else
                 {
-                    IRCMessage msg;
-                    switch (filterArgs.IRCMessageType.ToUpperInvariant())
-                    {
-                        case "NOTICE":
-                            msg = new NoticeMessage(_server.ChannelName, line);
-                            break;
-                        case "PRIVMSG":
-                        default:
-                            msg = new PrivMsgMessage(_server.ChannelName, line);
-                            break;
-                    }
-                    msg.SenderNick = status.User.ScreenName;
-                    msg.SenderHost = "twitter@" + Server.ServerName;
-                    Send(msg);
-
-                    // グループにも投げる
-                    foreach (Group group in _groups.Values)
-                    {
-                        if (!group.IsJoined)
-                            continue;
-
-                        Boolean isMatched = String.IsNullOrEmpty(group.Topic) ? true : Regex.IsMatch(line, group.Topic);
-                        
-                        // 1: member exists in channel && match regex
-                        // 2: no members in channel(self only) && match regex
-                        if ((group.Exists(status.User.ScreenName) || group.Members.Count == 0) && isMatched)
+                    Send(CreateIRCMessageFromStatusAndType(status, filterArgs.IRCMessageType, _server.ChannelName, line));
+                }
+
+                // グループにも投げる
+                foreach (Group group in _groups.Values)
+                {
+                    if (!group.IsJoined)
+                        continue;
+
+                    Boolean isMatched = String.IsNullOrEmpty(group.Topic) ? true : Regex.IsMatch(line, group.Topic);
+                    
+                    // 1: member exists in channel && match regex
+                    // 2: no members in channel(self only) && match regex
+                    if ((group.Exists(status.User.ScreenName) || group.Members.Count == 0) && isMatched)
+                    {
+                        if (_isFirstTime)
                         {
-                            switch (filterArgs.IRCMessageType.ToUpperInvariant())
-                            {
-                                case "NOTICE":
-                                    msg = new NoticeMessage(group.Name, line);
-                                    break;
-                                case "PRIVMSG":
-                                default:
-                                    msg = new PrivMsgMessage(group.Name, line);
-                                    break;
-                            } 
-                            msg.SenderNick = status.User.ScreenName;
-                            msg.SenderHost = "twitter@" + Server.ServerName;
-                            Send(msg);
+                            // 初回はNOTICE
+                            Send(CreateIRCMessageFromStatusAndType(status, "NOTICE", group.Name, String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line)));
+                        }
+                        else
+                        {
+                            Send(CreateIRCMessageFromStatusAndType(status, filterArgs.IRCMessageType, group.Name, line));
                         }
                     }
@@ -1205 +1189 @@
                 }
             }
+
+            // ウェイト
+            if (_server.ClientMessageWait > 0)
+                Thread.Sleep(_server.ClientMessageWait);
+        }
+
+        // XXX: IRCクライアントライブラリのアップデートで対応できるけどとりあえず...
+        private IRCMessage CreateIRCMessageFromStatusAndType(Status status, String type, String receiver, String line)
+        {
+            IRCMessage msg;
+            switch (type.ToUpperInvariant())
+            {
+                case "NOTICE":
+                    msg = new NoticeMessage(receiver, line);
+                    break;
+                case "PRIVMSG":
+                default:
+                    msg = new PrivMsgMessage(receiver, line);
+                    break;
+            } 
+            msg.SenderNick = status.User.ScreenName;
+            msg.SenderHost = "twitter@" + Server.ServerName;
+
+            return msg;
         }