fixing import error

don't log Mastodon 502 errors.

README.md

@@ -32,15 +32,13 @@ Today, you can use a Twitter, Mastodon, Telegram, and Mail with the account.
 They will communicate with each other; if someone warns others via Mail,
 Telegram, Twitter and Mastodon users will also see the message. And vice versa.
 
-In version 3, this repository contains a web application. On this website,
+In version 2, this repository contains a web application. On this website,
 people can register an own bot for their city - the website manages multiple
-bots for multiple citys, which run in parallel. This way, you do not have to
-host it yourself, if you lack the know-how. But it is easily possible to do so
-with docker: http://github.com/ticketfrei/docker-ticketfrei/
+bots for multiple citys. This way, you do not have to host it yourself.
 
-In https://github.com/ticketfrei/promotion, you'll find some promotion material
-you can use to build up such a community in your city. Unfortunately it is in
-german - but it's editable, feel free to translate it!
+In the promotion folder, you'll find some promotion material you can use to
+build up such a community in your city. Unfortunately it is in german - but
+it's editable, feel free to translate it!
 
 Website (our flagship instance): https://ticketfrei.links-tech.org
 

active_bots/mastodonbot.py

@@ -2,7 +2,7 @@
 
 from bot import Bot
 import logging
-from mastodon import Mastodon, MastodonServerError
+import mastodon
 import re
 from report import Report
 
@@ -19,13 +19,13 @@ class MastodonBot(Bot):
         """
         mentions = []
         try:
-            m = Mastodon(*user.get_masto_credentials())
+            m = mastodon.Mastodon(*user.get_masto_credentials())
         except TypeError:
             # logger.error("No Mastodon Credentials in database.", exc_info=True)
             return mentions
         try:
             notifications = m.notifications()
-        except MastodonServerError:
+        except mastodon.MastodonServerError:
             logger.error("Unknown Mastodon API Error: 502")
             return mentions
         for status in notifications:
@@ -54,7 +54,7 @@ class MastodonBot(Bot):
 
     def post(self, user, report):
         try:
-            m = Mastodon(*user.get_masto_credentials())
+            m = mastodon.Mastodon(*user.get_masto_credentials())
         except TypeError:
             return  # no mastodon account for this user.
         if report.source == self:

active_bots/twitterbot.py

@@ -73,7 +73,7 @@ class TwitterBot(Bot):
     def post(self, user, report):
         try:
             api = self.get_api(user)
-        except IndexError:
+        except TypeError:
             return  # no twitter account for this user.
         try:
             if report.source == self:

bots/mail/settings.tpl

@@ -1,19 +0,0 @@
-
-<div>
-    <h2>Edit your mail subscription page</h2>
-    <p>
-        There is also a page where users can subscribe to mail notifications:
-        <a href="/city/mail/{{city}}" target="_blank">Ticketfrei {{city}}</a>.
-        You can change what your users will read there, and adjust it to your
-        needs.
-    </p>
-    <p>
-        So this is the default text we suggest:
-    </p>
-    <form action="/settings/mail_md" method="post">
-        <textarea id="mail_md" rows="20" cols="70" name="mail_md" wrap="physical">{{mail_md}}</textarea>
-        <input name='csrf' value='{{csrf}}' type='hidden' />
-        <input name='confirm' value='Save' type='submit'/>
-    </form>
-</div>
-

bots/mastodon/settings.tpl

@@ -1,51 +0,0 @@
-
-<section>
-    <h2>Log in with Mastodon</h2>
-        <form action="/login/mastodon" method='post'>
-            <label for="email">E-Mail of your Mastodon-Account</label>
-            <input type="text" placeholder="Enter Email" name="email" id="email" required>
-
-            <label for="pass">Mastodon Password</label>
-            <input type="password" placeholder="Enter Password" name="pass" id="pass" required>
-
-            <label>Mastodon instance:
-                <input type='text' name='instance_url' list='instances' placeholder='social.example.net'/>
-            </label>
-            <datalist id='instances'>
-                <option value=''>
-                <option value='anticapitalist.party'>
-                <option value='awoo.space'>
-                <option value='cybre.space'>
-                <option value='mastodon.social'>
-                <option value='glitch.social'>
-                <option value='botsin.space'>
-                <option value='witches.town'>
-                <option value='social.wxcafe.net'>
-                <option value='monsterpit.net'>
-                <option value='mastodon.xyz'>
-                <option value='a.weirder.earth'>
-                <option value='chitter.xyz'>
-                <option value='sins.center'>
-                <option value='dev.glitch.social'>
-                <option value='computerfairi.es'>
-                <option value='niu.moe'>
-                <option value='icosahedron.website'>
-                <option value='hostux.social'>
-                <option value='hyenas.space'>
-                <option value='instance.business'>
-                <option value='mastodon.sdf.org'>
-                <option value='pawoo.net'>
-                <option value='pouet.it'>
-                <option value='scalie.business'>
-                <option value='sleeping.town'>
-                <option value='social.koyu.space'>
-                <option value='sunshinegardens.org'>
-                <option value='vcity.network'>
-                <option value='octodon.social'>
-                <option value='soc.ialis.me'>
-            </datalist>
-            <input name='csrf' value='{{csrf}}' type='hidden' />
-            <input name='confirm' value='Log in' type='submit'/>
-        </form>
-</section>
-

bots/telegram/settings.tpl

@@ -1,23 +0,0 @@
-
-<%
-# todo: hide this part, if there is already a telegram bot connected.
-%>
-<div>
-    <h2>Connect with Telegram</h2>
-    <p>
-        If you have a Telegram account, you can register a bot there. Just
-        write to @botfather. There are detailed instructions on
-        <a href="https://botsfortelegram.com/project/the-bot-father/" target="_blank">
-        Bots for Telegram</a>.
-    </p>
-    <p>
-        The botfather will give you an API key - with the API key, Ticketfrei
-        can use the Telegram bot. Enter it here:
-    </p>
-    <form action="/settings/telegram" method="post">
-        <input type="text" name="apikey" placeholder="Telegram bot API key" id="apikey">
-        <input name='csrf' value='{{csrf}}' type='hidden' />
-        <input name='confirm' value='Login with Telegram' type='submit'/>
-    </form>
-</div>
-

bots/twitter/settings.tpl

@@ -1,10 +0,0 @@
-
-<a class='button' style="padding: 1.5em;" href="/login/twitter">
-    <picture>
-        <source type='image/webp' sizes='20px' srcset="/static-cb/1517673283/twitter-20.webp 20w,/static-cb/1517673283/twitter-40.webp 40w,/static-cb/1517673283/twitter-80.webp 80w,"/>
-        <source type='image/png' sizes='20px' srcset="/static-cb/1517673283/twitter-20.png 20w,/static-cb/1517673283/twitter-40.png 40w,/static-cb/1517673283/twitter-80.png 80w,"/>
-        <img src="https://patriciaannbridewell.files.wordpress.com/2014/04/official-twitter-logo-tile.png" alt="" />
-    </picture>
-    Log in with Twitter
-</a>
-

frontend.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import bottle
-from os import listdir, path
 from bottle import get, post, redirect, request, response, view
 from config import config
 from db import db

template/settings.tpl

@@ -7,15 +7,86 @@
     <div id="enablebutton" style="float: right; padding: 2em;" color="red">Enable</div>
 % end
 
-<%
-# import all the settings templates from bots/*/settings.tpl
-import os
-bots = os.listdir('bots')
+<a class='button' style="padding: 1.5em;" href="/login/twitter">
+    <picture>
+        <source type='image/webp' sizes='20px' srcset="/static-cb/1517673283/twitter-20.webp 20w,/static-cb/1517673283/twitter-40.webp 40w,/static-cb/1517673283/twitter-80.webp 80w,"/>
+        <source type='image/png' sizes='20px' srcset="/static-cb/1517673283/twitter-20.png 20w,/static-cb/1517673283/twitter-40.png 40w,/static-cb/1517673283/twitter-80.png 80w,"/>
+        <img src="https://patriciaannbridewell.files.wordpress.com/2014/04/official-twitter-logo-tile.png" alt="" />
+    </picture>
+    Log in with Twitter
+</a>
 
-for bot in bots:
-    include('bots/' + bot + '/settings.tpl', csrf=csrf, city=city)
-end
+<section>
+    <h2>Log in with Mastodon</h2>
+        <form action="/login/mastodon" method='post'>
+            <label for="email">E-Mail of your Mastodon-Account</label>
+            <input type="text" placeholder="Enter Email" name="email" id="email" required>
+
+            <label for="pass">Mastodon Password</label>
+            <input type="password" placeholder="Enter Password" name="pass" id="pass" required>
+
+            <label>Mastodon instance:
+                <input type='text' name='instance_url' list='instances' placeholder='social.example.net'/>
+            </label>
+            <datalist id='instances'>
+                <option value=''>
+                <option value='anticapitalist.party'>
+                <option value='awoo.space'>
+                <option value='cybre.space'>
+                <option value='mastodon.social'>
+                <option value='glitch.social'>
+                <option value='botsin.space'>
+                <option value='witches.town'>
+                <option value='social.wxcafe.net'>
+                <option value='monsterpit.net'>
+                <option value='mastodon.xyz'>
+                <option value='a.weirder.earth'>
+                <option value='chitter.xyz'>
+                <option value='sins.center'>
+                <option value='dev.glitch.social'>
+                <option value='computerfairi.es'>
+                <option value='niu.moe'>
+                <option value='icosahedron.website'>
+                <option value='hostux.social'>
+                <option value='hyenas.space'>
+                <option value='instance.business'>
+                <option value='mastodon.sdf.org'>
+                <option value='pawoo.net'>
+                <option value='pouet.it'>
+                <option value='scalie.business'>
+                <option value='sleeping.town'>
+                <option value='social.koyu.space'>
+                <option value='sunshinegardens.org'>
+                <option value='vcity.network'>
+                <option value='octodon.social'>
+                <option value='soc.ialis.me'>
+            </datalist>
+            <input name='csrf' value='{{csrf}}' type='hidden' />
+            <input name='confirm' value='Log in' type='submit'/>
+        </form>
+</section>
+
+<%
+# todo: hide this part, if there is already a telegram bot connected.
 %>
+<div>
+    <h2>Connect with Telegram</h2>
+    <p>
+        If you have a Telegram account, you can register a bot there. Just
+        write to @botfather. There are detailed instructions on
+        <a href="https://botsfortelegram.com/project/the-bot-father/" target="_blank">
+        Bots for Telegram</a>.
+    </p>
+    <p>
+        The botfather will give you an API key - with the API key, Ticketfrei
+        can use the Telegram bot. Enter it here:
+    </p>
+    <form action="/settings/telegram" method="post">
+        <input type="text" name="apikey" placeholder="Telegram bot API key" id="apikey">
+        <input name='csrf' value='{{csrf}}' type='hidden' />
+        <input name='confirm' value='Login with Telegram' type='submit'/>
+    </form>
+</div>
 
 <div>
     <h2>Edit your city page</h2>
@@ -42,6 +113,24 @@ end
     </form>
 </div>
 
+<div>
+    <h2>Edit your mail subscription page</h2>
+    <p>
+        There is also a page where users can subscribe to mail notifications:
+        <a href="/city/mail/{{city}}" target="_blank">Ticketfrei {{city}}</a>.
+        You can change what your users will read there, and adjust it to your
+        needs.
+    </p>
+    <p>
+        So this is the default text we suggest:
+    </p>
+    <form action="/settings/mail_md" method="post">
+        <textarea id="mail_md" rows="20" cols="70" name="mail_md" wrap="physical">{{mail_md}}</textarea>
+        <input name='csrf' value='{{csrf}}' type='hidden' />
+        <input name='confirm' value='Save' type='submit'/>
+    </form>
+</div>
+
 <div>
     <h2>Edit your trigger patterns</h2>
     <p>