asd

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

4 files changed, 71 insertions, 84 deletions

diff --git a/megahal_bot.py b/megahal_bot.py
index 9e70505..c5a0f64 100644
--- a/megahal_bot.py
+++ b/megahal_bot.py
@@ -108,7 +108,6 @@ Argumente:
                          AND NOT ( message ILIKE '%www.%'
                              OR message ILIKE '%http%'
                              OR message ILIKE '%@%.%')
-                       ORDER BY from_ident||to_ident, send_time;
                      ;""",
 	       "offensive":
                    """SELECT message FROM omegle_messages 
@@ -125,8 +124,7 @@ Argumente:
                         AND LENGTH(message) < 35
                         AND NOT ( message ILIKE '%www.%'
                             OR message ILIKE '%http%'
-                            OR message ILIKE '%@%.%')
-                       ORDER BY from_ident||to_ident, send_time;""",
+                            OR message ILIKE '%@%.%');""",
 	       "offensive-large":
                    """SELECT message FROM omegle_messages WHERE from_ident in (
               SELECT from_ident FROM omegle_messages 
@@ -144,7 +142,19 @@ Argumente:
                         AND NOT ( message ILIKE '%www.%'
                             OR message ILIKE '%http%'
                             OR message ILIKE '%@%.%')    );""",
-
+		"serious":
+                    """SELECT message
+                         FROM omegle_messages om1
+                        WHERE (  SELECT COUNT(*) 
+                                   FROM omegle_messages om2 
+                                  WHERE ( om1.from_ident = om2.from_ident 
+                                       OR om1.to_ident = om2.from_ident) 
+                                    AND (om1.send_time - om2.send_time > interval '-2 hours' 
+                                     AND om1.send_time - om2.send_time < interval '2 hours')) > 25
+                          AND LENGTH(message) < 30
+                          AND NOT ( message ILIKE '%www.%'
+                            OR message ILIKE '%http%'
+                            OR message ILIKE '%@%.%');""",
 	       }
 	sqlKey = "standard"
 	dbname = "omegle"
@@ -205,7 +215,7 @@ Argumente:
 		       while True:
 			       event.wait(0.5)
 			       if event.isSet():
-				       print "partner"
+				       print "disconnect_event set"
 				       break
 		except KeyboardInterrupt:
 			print "CTRL-C pressed, exiting"
diff --git a/omegle.py b/omegle.py
index 5520f3f..395bf4b 100644
--- a/omegle.py
+++ b/omegle.py
@@ -177,6 +177,8 @@ class OmegleChat(RESTClient):
 				self.on_idle()
 				return
 			for data in data_set:
+				if not self.is_connected: #in case of disconnect
+					break #stop dispatching messages
 				if data[0] == "typing":
 					self.on_typing()
 				elif data[0] == "gotMessage" and data.__len__() == 2:
diff --git a/slides/slides.pdf b/slides/slides.pdf
index 3b39835..a270641 100644
--- a/slides/slides.pdf
+++ b/slides/slides.pdf
diff --git a/slides/slides.tex b/slides/slides.tex
index 2f40171..b8f5e77 100644
--- a/slides/slides.tex
+++ b/slides/slides.tex
@@ -46,14 +46,15 @@ DHBW Stuttgart Aussenstelle Horb}
 \frame{\titlepage}
 
 \section{Was ist Omegle}
-\begin{frame}
-\put(0,0){
-\parbox[b][\paperheight]{\paperwidth}{%
-\vfill
-\centering
-\includegraphics[width=\paperwidth,height=\paperheight,
-keepaspectratio]{img/omegle.png}%
-\vfill
+{\usebackgroundtemplate{\includegraphics[width=\paperwidth]{img/omegle.png}}
+\begin{frame}[fragile]
+%  \pos(0,0){\parbox[b][\paperheight]{\paperwidth}{%
+%    \vfill
+%hey
+%    \centering
+%    \includegraphics[width=\paperwidth,height=\paperheight,keepaspectratio]{img/omegle.png}%
+%    \vfill
+%  }}
 
   \textbf{Omegle}
   \begin{itemize}
@@ -64,7 +65,7 @@ keepaspectratio]{img/omegle.png}%
   \item Hat angeblich je nach Zeit zwischen 2500 und 4000 Benutzer
   \end{itemize}
 \end{frame}
-
+}
   % \begin{frame}\frametitle{Omegle technisch betrachtet}
   %   asd
   % \end{frame}
@@ -232,78 +233,51 @@ SELECT message
 \end{columns}
 \end{frame}
 
-\begin{frame}\frametitle{Dritter Chat}
+\begin{frame}\frametitle{Dritter Chat}\tiny
 \begin{columns}
 \begin{column}{6cm}
-Stranger: hey
- Megahal: Hey sexy sexy.
-Stranger: mmMMmmmmmm
- Megahal: Back, fucking internet sucks.
-Stranger: i know right
- Megahal: I'm so horny right now.
-Stranger: ever fuck the side of the house
- Megahal: Fuck the rest uk rule.
-Stranger: lol
- Megahal: 32 Male sexy hot :)lol.
-Stranger: your gay
- Megahal: Your ass is so tight.
-Stranger: tight as a china man 
- Megahal: Only if u are a man.
-Stranger: buddy
- Megahal: Dying for some sex.
-Stranger: you bet you like it up the but
- Megahal: And i wanna fuck you up the but.
-Stranger: t
- Megahal: N0t havin sex dahtz 4sure.
-Stranger: EWWWWW
- Megahal: Oh hey they do fucking mexicans.
-Stranger: man
- Megahal: L am sexy male man.
-Stranger: your a little homo
- Megahal: Ugh im a little homo.
-Stranger: haha
- Megahal: Watch out with 'cyber sex' haha.
-Stranger: HAHA
-Stranger: solid
- Megahal: 20 M fucking horny/cam.
-Stranger: more solid then a wood didlo that gives spliters
- Megahal: Fuck that i say what i am sexy.
-Stranger: buddy
- Megahal: Send me your naked pics.
-Stranger: you can do anything other then suck dick
- Megahal: Do you want to do sex with you.
-Stranger: with my dick
- Megahal: My hair just goes down to my boobs.
-Stranger: my dick goes down to lags
- Megahal: With my dick.
-Stranger: its a real problem
- Megahal: Let's have sexxxxx for real.
-Stranger: yeah i have a vegina it turns out
- Megahal: I have a penis.
-Stranger: in the dick
- Megahal: With my dick.
-Stranger: hahah!
- Megahal: Oh baby tell me something sexy.
-Stranger: i like eating cookies well watching elmo
- Megahal: Well i have a penis.
-Stranger: naked
- Megahal: Are you naked.
-Stranger: no..
- Megahal: No pants allowed.
-Stranger: i really naked!
- Megahal: I really want to see \emph{me} naked.
-Stranger: yeah i sold them to the naked club
-Stranger: naked
- Megahal: Yeah i sold them to the naked club.
-Stranger: nice...
- Megahal: Got a nice ass baby.
-Stranger: im sure your a guy with a harry bum
- Megahal: If your a guy u fuck.
-Stranger: im a girl so that would be weird
- Megahal: Im a guy with a girl.
-Idle count 1/8
-Megahal: Hey, horny girl.
-Megahal disconnect
+START
+\textcolor{red}{Stranger:} hey\\
+ \textcolor{green}{Megahal:} Hey sexy sexy.\\
+\textcolor{red}{Stranger:} mmMMmmmmmm\\
+ \textcolor{green}{Megahal:} Back, fucking internet sucks.\\
+\textcolor{red}{Stranger:} i know right\\
+ \textcolor{green}{Megahal:} I'm so horny right now.\\
+\textcolor{red}{Stranger:} ever fuck the side of the house\\
+ \textcolor{green}{Megahal:} Fuck the rest uk rule.\\
+\textcolor{red}{Stranger:} lol\\
+ \textcolor{green}{Megahal:} 32 Male sexy hot :)lol.\\
+\textcolor{red}{Stranger:} your gay\\
+ \textcolor{green}{Megahal:} Your ass is so tight.\\
+\textcolor{red}{Stranger:} tight as a china man \\
+ \textcolor{green}{Megahal:} Only if u are a man.\\
+\textcolor{red}{Stranger:} buddy\\
+ \textcolor{green}{Megahal:} Dying for some sex.\\
+\textcolor{red}{Stranger:} you bet you like it up the but\\
+ \textcolor{green}{Megahal:} And i wanna fuck you up the but.\\
+\textcolor{red}{Stranger:} t\\
+...
+\end{column}
+\begin{column}{6cm}
+START
+Stranger: hi\\
+ Megahal: Hi sex slave.\\
+Stranger: who ?\\
+ Megahal: Who like a bad sex.\\
+Stranger: i like\\
+ Megahal: U like sex.\\
+Stranger: but I have cock\\
+ Megahal: Can i have cock.\\
+Stranger: come on and get it\\
+ Megahal: And sex with you.\\
+Stranger: okay\\
+ Megahal: Horny 21 m here..interested.\\
+Stranger: im not a gay\\
+ Megahal: Not like sex.\\
+Stranger: thank you\\
+ Megahal: Do you want sex you have sex with you.\\
+Stranger: fuck you\\
+ENDE
 \end{column}
 \end{columns}
 \end{frame}
@@ -322,6 +296,7 @@ Megahal disconnect
 }
 \frame{\frametitle{Auswertung 2}
     \begin{itemize}
+    \item Megahal antwortet auf jede Nachricht mit genau einer Nachricht. Das ist unnatürlich aber fällt nicht auf.
     \item Megahal ist nicht in der Lage ein Gesprächsverlauf zu analysieren sondern betrachet jeweils nur die letzte Aussage seines Gesprächspartners. Daher kommt er leicht al vom Thema ab.
     \item Megahal ist nicht intelligent. Er weiss nicht, dass er nach ,,19M Holland'' nicht ,,19M Finnland'' sonder eher ,,19F'' sagen sollte.
     \item Manchmal fängt Megahal an sich nur zu wiederholen.