Changeset 369

Timestamp:

03/17/08 00:41:12 (10 months ago)

Author:

tomoyo

Message:

自分で発言したメッセージを他のチャンネルに投げる場合にNOTICEにするオプションを追加した。

Location:

TwitterIrcGateway

Files:

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

TwitterIrcGateway/TwitterIrcGateway/App.config

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

TwitterIrcGateway/TwitterIrcGateway/Program.cs

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

TwitterIrcGateway/TwitterIrcGateway/Settings.Designer.cs

@@ -227 +227 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool BroadcastUpdateMessageIsNotice {
+            get {
+                return ((bool)(this["BroadcastUpdateMessageIsNotice"]));
+            }
+            set {
+                this["BroadcastUpdateMessageIsNotice"] = value;
+            }
+        }
     }
 }

TwitterIrcGateway/TwitterIrcGateway/Settings.settings

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

TwitterIrcGateway/TwitterIrcGatewayCLI/Program.cs

@@ -58 +58 @@
             _server.BroadcastUpdate = options.BroadcastUpdate;
             _server.ClientMessageWait = options.ClientMessageWait;
+            _server.BroadcastUpdateMessageIsNotice = options.BroadcastUpdateMessageIsNotice;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
 
@@ -77 +78 @@
             Console.WriteLine("[Configuration] BroadcastUpdate: {0}", _server.BroadcastUpdate);
             Console.WriteLine("[Configuration] ClientMessageWait: {0}", _server.ClientMessageWait);
+            Console.WriteLine("[Configuration] BroadcatUpdateMessageIsNotice: {0}", _server.BroadcastUpdateMessageIsNotice);
 
             _server.Start(bindAddress, options.Port);
@@ -166 +168 @@
         [Description("wait of send messages to client (milliseconds)")]
         public Int32 ClientMessageWait { get; set; }
+
+        [DefaultValue(false)]
+        [Description("broadcast status message type is NOTICE")]
+        public Boolean BroadcastUpdateMessageIsNotice { get; set; }
     }
 }

TwitterIrcGateway/TwitterIrcGatewayCore/Server.cs

@@ -84 +84 @@
         public Int32 ClientMessageWait = 0;
 
+        /// <summary>
+        /// �A�b�v�f�[�g��ׂẴ`�����l���ɓ�������NOTICE�ɂ��邩�ǂ���
+        /// </summary>
+        public Boolean BroadcastUpdateMessageIsNotice = false;
+
         public const String ServerName = "localhost";
         public const String ServerNick = "$TwitterIrcGatewayServer$";

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -712 +712 @@
                         if (String.Compare(message.Receiver, _server.ChannelName, true) != 0)
                         {
-                            Send(new PrivMsgMessage()
+                            // XXX: 例によってIRCライブラリのバージョンアップでどうにかしたい
+                            if (_server.BroadcastUpdateMessageIsNotice)
                             {
-                                Sender = _clientHost,
-                                Receiver = _server.ChannelName,
-                                Content = message.Content
-                            });
+                                Send(new NoticeMessage()
+                                {
+                                    Sender = _clientHost,
+                                    Receiver = _server.ChannelName,
+                                    Content = message.Content
+                                });
+                            }
+                            else
+                            {
+                                Send(new PrivMsgMessage()
+                                {
+                                    Sender = _clientHost,
+                                    Receiver = _server.ChannelName,
+                                    Content = message.Content
+                                });
+                            }
                         }
                         
@@ -725 +738 @@
                             if (group.IsJoined && String.Compare(message.Receiver, group.Name, true) != 0)
                             {
-                                Send(new PrivMsgMessage()
+                                if (_server.BroadcastUpdateMessageIsNotice)
                                 {
-                                    Sender = _clientHost,
-                                    Receiver = group.Name,
-                                    Content = message.Content
-                                });
+                                    Send(new NoticeMessage()
+                                    {
+                                        Sender = _clientHost,
+                                        Receiver = group.Name,
+                                        Content = message.Content
+                                    });
+                                }
+                                else
+                                {
+                                    Send(new PrivMsgMessage()
+                                    {
+                                        Sender = _clientHost,
+                                        Receiver = group.Name,
+                                        Content = message.Content
+                                    });
+                                }
                             }
                         }
@@ -1215 +1240 @@
         }
 
-
         /// <summary>
         ///