Merge branch 'master' of https://github.com/stealthbot/StealthBot.git into RenameProfile

Author: MisterVector

Installer/StealthbotInstaller.wip

@@ -127,7 +127,7 @@ Description="StealthBot"
 CompatibleMode="0"
 MajorVer=2
 MinorVer=7
-RevisionVer=492
+RevisionVer=493
 AutoIncrementVer=0
 ServerSupportFiles=0
 VersionCompanyName="Andy T (Stealth@USEast)"

trunk/Bot.vbp

@@ -33,6 +33,7 @@ Private m_NumKicks       As Long
 Private m_JoinDate       As Date
 Private m_Users          As Collection
 Private m_Banlist        As Collection
+Private m_HasPhantoms    As Boolean     ' TRUE if a phantom user has been seen in the channel.
 
 Public Property Get sType() As String
 
@@ -181,6 +182,15 @@ Public Property Let KickCount(ByVal lng As Long)
 
 End Property
 
+Public Property Get HasPhantomUsers() As Boolean
+    HasPhantomUsers = m_HasPhantoms
+End Property
+
+Public Property Let HasPhantomUsers(ByVal bln As Boolean)
+    m_HasPhantoms = bln
+End Property
+
+
 Public Property Get Users() As Collection
 
     Set Users = m_Users
@@ -240,7 +250,7 @@ Public Property Get Self() As clsUserObj
     Set Self = New clsUserObj
 
     For i = Users.Count To 1 Step -1
-        If (StrComp(Users(i).Name, CleanUsername(CurrentUsername), vbTextCompare) = 0) And (Users(i).IsPhantom = False) Then
+        If (StrComp(Users(i).Name, CleanUsername(CurrentUsername), vbTextCompare) = 0) Then
             Set Self = Users(i)
             Exit Property
         End If
@@ -279,7 +289,7 @@ Public Function GetUserIndexEx(ByVal AccountName As String, Optional ByVal Searc
             End If
         End If
 
-        If (StrComp(Users(i).Name, AccountName, vbTextCompare) = 0) And (Users(i).IsPhantom = False) Then
+        If (StrComp(Users(i).Name, AccountName, vbTextCompare) = 0) Then
             GetUserIndexEx = i
             Exit Function
         End If
@@ -321,7 +331,7 @@ Public Function GetUserIndex(ByVal Username As String, Optional ByVal SearchLimi
             End If
         End If
 
-        If (StrComp(m_Users(i).DisplayName, Username, vbTextCompare) = 0) And (Users(i).IsPhantom = False) Then
+        If (StrComp(m_Users(i).DisplayName, Username, vbTextCompare) = 0) Then
             GetUserIndex = i
             Exit Function
         End If
@@ -348,7 +358,7 @@ Public Function GetUserIndexByPriority(ByVal Username As String, Optional ByVal
                 End If
             End If
 
-            If (StrComp(PUser.Name, Username, vbTextCompare) = 0) And (PUser.IsPhantom = False) Then
+            If (StrComp(PUser.Name, Username, vbTextCompare) = 0) Then
                 GetUserIndexByPriority = pos
                 Exit Function
             End If
@@ -661,7 +671,7 @@ Public Function CheckUsers() As Integer
             For i = Users.Count To 1 Step -1
                 Set CurrentUser = Users(i)
 
-                If (CurrentUser.IsOperator = False) And (CurrentUser.IsPhantom = False) Then
+                If (CurrentUser.IsOperator = False) Then
                     DBEntry = _
                         Database.GetUserAccess(CurrentUser.DisplayName)
 
@@ -683,7 +693,7 @@ Public Function CheckUsers() As Integer
         For i = Users.Count To 1 Step -1
             Set CurrentUser = Users(i)
 
-            If (CurrentUser.IsOperator = False) And (CurrentUser.IsPhantom = False) Then
+            If (CurrentUser.IsOperator = False) Then
                 If (CheckUser(CurrentUser.DisplayName, CurrentUser)) Then
                     Count = (Count + 1)
                 End If
@@ -702,7 +712,7 @@ Public Function CheckQueue(ByVal Username As String) As Boolean
 
     For i = Users.Count To 1 Step -1
         Set CurrentUser = Users(i)
-        If (StrComp(CurrentUser.DisplayName, Username, vbTextCompare) = 0) And (CurrentUser.IsPhantom = False) Then
+        If (StrComp(CurrentUser.DisplayName, Username, vbTextCompare) = 0) Then
             If (CurrentUser.Queue.Count) Then
                 CheckQueue = True
             End If
@@ -725,6 +735,7 @@ Public Function Clone() As clsChannelObj
     Clone.KickCount = KickCount
     Clone.JoinCount = JoinCount
     Clone.OperatorHeir = OperatorHeir
+    Clone.HasPhantomUsers = HasPhantomUsers
 
     For i = 1 To Users.Count
         Clone.Users.Add Users(i).Clone()

trunk/Warden.dll

@@ -290,7 +290,12 @@ Public Function Clone() As clsClanObj
     Set Clone = New clsClanObj
 
     Clone.Name = Name
+    Clone.FullName = FullName
     Clone.MOTD = MOTD
+    Clone.InClan = InClan
+    Clone.PendingInvitation = PendingInvitation
+    Clone.PendingInvitationCookie = PendingInvitationCookie
+    Clone.PendingClanMOTD = PendingClanMOTD
 
     For i = 1 To Members.Count
         Clone.Members.Add Members(i).Clone()

trunk/clsChannelObj.cls

@@ -300,9 +300,6 @@ Public Sub RequestClanList(Optional ByVal eType As enuServerRequestHandlerType =
 
     Cookie = SaveServerRequest(oRequest)
 
-    g_Clan.Clear
-    frmChat.lvClanList.ListItems.Clear
-
     Set pBuf = New clsDataBuffer
     With pBuf
         .InsertDWord Cookie

trunk/clsClanObj.cls

@@ -1975,7 +1975,7 @@ Private Sub LoadDefaults()
     m_EXPKey = vbNullString
     m_UseSpawn = False
     m_Game = PRODUCT_STAR
-    m_Server = "USEast"
+    m_Server = "useast.battle.net"
     m_HomeChannel = vbNullString
     m_AutoConnect = False
     m_UseD2Realms = False
@@ -2526,6 +2526,12 @@ Private Sub ConformValues()
 
     m_Game = GetProductInfo(m_Game).Code
 
+    ' Fix server values from a dumb patch.
+    If m_Server = "USEast" Then m_Server = "useast.battle.net"
+    If m_Server = "USWest" Then m_Server = "uswest.battle.net"
+    If m_Server = "Europe" Then m_Server = "europe.battle.net"
+    If m_Server = "Asia" Then m_Server = "asia.battle.net"
+    
     If m_AutoSafelistLevel < 1 Or m_AutoSafelistLevel > 200 Then m_AutoSafelistLevel = 20
     If m_NamespaceConvention < 0 Or m_NamespaceConvention > 3 Then m_NamespaceConvention = 0
     If m_SecondsToIdle > 1000000 Then m_SecondsToIdle = 600

trunk/clsClanPacketHandler.cls

@@ -1024,7 +1024,7 @@ End Function
 ' Determines the operation indicated by the specified string.
 '   This parses the +/- from flags and group arguments.
 '   Updates the provided string with the indicator removed.
-Private Function CheckOperation(ByVal sOpString As String) As enuDatabaseOperation
+Private Function CheckOperation(ByRef sOpString As String) As enuDatabaseOperation
     If Len(sOpString) = 0 Then
         CheckOperation = dbopNothing
         Exit Function

trunk/clsConfig.cls

@@ -545,7 +545,7 @@ End Function
 
 '// GETPOSITIONBYNAME
 '// Returns the channel list position of a user by their username
-'// Returns 0 if the user is not present or the only ones present are marked a duplicate/phantom user
+'// Returns 0 if the user is not present.
 Public Function GetPositionByName(ByVal sUser As String) As Integer
     GetPositionByName = g_Channel.GetUserIndexByPriority(sUser, , True)
 End Function
@@ -990,6 +990,12 @@ Public Function UtcNow() As Date
     UtcNow = modDateTime.UtcNow
 End Function
 
+'// UTCTOLOCAL
+'// Converts a UTC time and date to local time.
+Public Function UtcToLocal(ByVal UtcDate As Date) As Date
+    UtcToLocal = modDateTime.UtcToLocal(UtcDate)
+End Function
+
 '// LOGGER
 '// Returns the logger object
 Public Function Logger() As clsLogger
@@ -1446,14 +1452,16 @@ Public Function GetSettingsEntry(ByVal sEntryName As String, ByVal ScriptName As
     On Error Resume Next
 
     Dim Path As String
+    Dim iFile As Integer
 
     If ScriptName = vbNullString Then ScriptName = modScripting.GetScriptName
 
     Path = GetFilePath(FILE_SCRIPT_INI, GetFolderPath("Scripts"))
 
     If (LenB(Dir(Path)) = 0) Then
-        Open Path For Output As #1
-        Close #1
+        iFile = FreeFile
+        Open Path For Output As #iFile
+        Close #iFile
     End If
 
     GetSettingsEntry = ReadINI(ScriptName, sEntryName, Path)
@@ -1479,14 +1487,16 @@ Public Sub WriteSettingsEntry(ByVal sEntryName As String, ByVal sValue As String
     On Error GoTo ERROR_HANDLER
 
     Dim Path As String
+    Dim iFile As Integer
 
     If ScriptName = vbNullString Then ScriptName = modScripting.GetScriptName
 
     Path = GetFilePath(FILE_SCRIPT_INI, GetFolderPath("Scripts"))
 
     If (LenB(Dir(Path)) = 0) Then
-        Open Path For Output As #1
-        Close #1
+        iFile = FreeFile
+        Open Path For Output As #iFile
+        Close #iFile
     End If
 
     WriteINI ScriptName, sEntryName, sValue & _
@@ -1608,6 +1618,26 @@ Public Sub ForcePacketParse(ByVal PacketData As String, ByVal Protocol As String
     Set pBuff = Nothing
 End Sub
 
+'// CHECKCHATFILTER
+'// Checks if a message or user is filtered.
+'// Returns True even if filtering is disabled.
+Public Function CheckChatFilter(ByVal sMessage As String, Optional ByVal sUser As String = vbNullString) As Boolean
+    CheckChatFilter = False
+    
+    If Len(sUser) > 0 Then
+        If modOtherCode.CheckBlock(sUser) Then
+            CheckChatFilter = True
+            Exit Function
+        End If
+    End If
+    
+    If modOtherCode.CheckMsg(sMessage, sUser, -5) Then
+        CheckChatFilter = True
+        Exit Function
+    End If
+End Function
+
+
 '// GETUSERDATABASE
 '// Gets a collection of users in the database
 '// 10/10/2009 B#003 52 - Changed code to destroy the temp object after each use