From 1ed8a11f973fbf91b04bca0eea569caa672e38ec Mon Sep 17 00:00:00 2001 From: elmo-space Date: Sat, 1 Sep 2018 21:41:18 +0200 Subject: [PATCH] update --- README.md | 1 - bert.py | 26 +------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/README.md b/README.md index d494268..c003e38 100644 --- a/README.md +++ b/README.md @@ -26,5 +26,4 @@ But overall it is a pretty fun thing and is heavily used on the IRC server that - All http links are parsed and the html title is printed out if one is found - The bot automatically parses all twitter links and prints out the full tweet and account name. - The blog of the german blogger "fefe" (Felix von Leitner - blog.fefe.de) is crawled every five mins. and new Posts are automatically printed out with a link to the post -- eFukt is crawled every 10 mins. and a message is generated on new videos (it also triggers another bot in our network) diff --git a/bert.py b/bert.py index 77b3e8d..30e27b5 100755 --- a/bert.py +++ b/bert.py @@ -23,7 +23,6 @@ import random from flask import Flask, request from nslookup import nslookup import rss -import efukt version = "v0.8" @@ -564,18 +563,6 @@ def fefe_check(): sleep(300) -def efukt_check(): - while True: - try: - data = efukt.check() - if not data == None: - say(chan, y+data[0]+g+" - "+r+data[1]) - say(chan, data[2]+" !f0ck") - except Exception as err: - print("Error in efukt checker! - "+str(err)) - sleep(600) - - def gc_cycle(): while True: try: @@ -603,14 +590,6 @@ class fefe_thread(threading.Thread): print("Starting fefe thread...") fefe_check() -class efukt_thread(threading.Thread): - def __init__(self, threadID): - threading.Thread.__init__(self) - self.threadID = threadID - def run(self): - print("Starting efukt thread...") - efukt_check() - class gc_thread(threading.Thread): def __init__(self, threadID): threading.Thread.__init__(self) @@ -627,14 +606,11 @@ def main(): api = tweepy.API(auth) thread_command = command_thread(1) thread_fefe = fefe_thread(2) - thread_efukt = efukt_thread(3) - thread_gc = gc_thread(4) + thread_gc = gc_thread(3) thread_command.start() sleep(2) thread_fefe.start() sleep(2) - thread_efukt.start() - sleep(2) thread_gc.start()