clean

git-svn-id: http://xapek.org/svn/common/omegle@1484 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd

5 files changed, 18 insertions, 21 deletions

diff --git a/omegle/__init__.pyc b/omegle/__init__.pyc
deleted file mode 100644
index 7cf18a2..0000000
--- a/omegle/__init__.pyc
+++ /dev/null
diff --git a/omegle/icq.pyc b/omegle/icq.pyc
deleted file mode 100644
index 9377150..0000000
--- a/omegle/icq.pyc
+++ /dev/null
diff --git a/omegle/icqBuddy.py b/omegle/icqBuddy.py
index cd34cd4..c51419f 100644
--- a/omegle/icqBuddy.py
+++ b/omegle/icqBuddy.py
@@ -2,6 +2,7 @@
 # -*- vim: encoding: utf-8 -*-
 # Yves Fischer, xapek.org 2009
 import sys
+import random
 
 from twisted.words.protocols import oscar
 from twisted.internet import reactor
@@ -13,6 +14,15 @@ from icq import ExtendedBOSConnection, ReconnectOscarFactory
 ICQ_UIN = '446323989'
 ICQ_PASSWORD = 'gagaga'
 
+def random_greetings():
+        gr = (
+            "Sup dawg, we heard u need some stranger in ur chatroom, so we put a Stranger in ur chatroom so u can chat with him while u chat with others (until you type %disconnect% anywhere)",
+            "Connected with Omegle, be retarted with strangers!",
+            "Omegle ... its like pedo-roulette",
+            "Under law 153:276:935 section 864, Omegle is required to inform you that the person you are currently chatting with owns the IP address of a registered sex offender. Please be careful when chatting with this person, and remember never to give out your personal information. The person you are chatting with cannot see this message.",
+            )
+        return "==== %s" % gr[random.randint(0,len(gr)-1)]
+
 class OmegleICQChat(OmegleChat):
     def __init__(self,icqconn,user):
         self.user = user
@@ -45,7 +55,7 @@ class OmegleICQChat(OmegleChat):
 
     def on_connect(self):
         print "Omegle->%s: (connected)" % self.user
-        self.send_icqconn(  "== Sup dawg, we heard u need some stranger in ur chatroom, so we put a Stranger in ur chatroom so u can chat with him while u chat with others (until you type %disconnect% anywhere) ==" )
+        self.send_icqconn(  random_greetings() )
 
     def on_disconnect(self):
         print "Omegle->%s: (disconnected)" % self.user
diff --git a/omegle/icqChatroomBuddy.py b/omegle/icqChatroomBuddy.py
index 63689f1..a235334 100644
--- a/omegle/icqChatroomBuddy.py
+++ b/omegle/icqChatroomBuddy.py
@@ -7,20 +7,21 @@ from twisted.words.protocols import oscar
 from twisted.internet import reactor, protocol
 from twisted.python import log
 
-from omegle.icqBuddy import OmegleICQ
+from omegle.icqBuddy import ICQBuddy
 from icq import ReconnectOscarFactory
 
 ICQ_UIN = '446323989'
 ICQ_PASSWORD = 'gagaga'
 ICQ_CHATROOM_UID = '370496181'
 
-class OmegleICQChatroomBuddy( OmegleICQ ):
-    def gotBuddyList( self, buddylist ):
-        OmegleICQ.gotBuddyList( self, buddylist )
-        self.sendMessage(ICQ_CHATROOM_UID, "/join OMEGLE")
+class OmegleICQChatroomBuddy( ICQBuddy ):
+    def initDone( self ):
+        ICQBuddy.initDone(self)
+        reactor.callLater(5.0, self.sendMessage,ICQ_CHATROOM_UID, "/join OMEGLE")
+
     def shutdown( self ):
         self.sendMessage(ICQ_CHATROOM_UID, "/leave")
-        OmegleICQ.shutdown(self)
+        ICQBuddy.shutdown(self)
 
 
 if __name__ == '__main__':
diff --git a/omegle/icqRoombot.py b/omegle/icqRoombot.py
index cb6d730..3f463a5 100644
--- a/omegle/icqRoombot.py
+++ b/omegle/icqRoombot.py
@@ -4,7 +4,6 @@
 import sys
 from icq import ExtendedBOSConnection, ReconnectOscarFactory
 from random import randint
-from twisted.python import log
 from twisted.internet import reactor
 
 class Member(object):
@@ -105,16 +104,3 @@ class ICQRoombot( ExtendedBOSConnection ):
             self.sendAuthorizationResponse(user.name, True, '')
         except Exception,e:
             print "error: %s %s\n%s" % (user,multiparts,e)
-
-if __name__ == '__main__':
-    uin = '370496181'
-    password = 'megahal123'
-    host, port = ('login.oscar.aol.com', 5190)
-
-    import logging
-    logging.basicConfig(level=logging.INFO)
-    log.startLogging(sys.stdout)
-
-    fac = ReconnectOscarFactory(ICQRoombot, uin, password, icq=1)
-    reactor.connectTCP(host, port, fac)
-    reactor.run()