add user

Matrix

See merge request server/doorbot!1

.gitignore

@@ -1,3 +1,5 @@
 settings.json
 __pycache__/
 *.pyc
+*.png
+.venv/

Dockerfile

@@ -1,8 +1,11 @@
 FROM python:3.6-alpine3.7
 
-ADD [".", "/app"]
+ADD ["src", "requirements.txt", "/app/"]
 WORKDIR /app
-RUN apk add --update g++ gfortran openblas-dev libpng-dev musl-dev freetype-dev
-RUN pip install -r requirements.txt --no-cache-dir
+RUN apk add --update g++ gfortran openblas-dev libpng-dev musl-dev freetype-dev libpng openblas libstdc++ && \
+	pip install -r requirements.txt --no-cache-dir && \
+	apk del g++ gfortran openblas-dev libpng-dev musl-dev freetype-dev && \
+	useradd -D bot
+USER bot
 
 CMD ["python", "bot.py"]

docker-compose.yml

@@ -3,6 +3,6 @@ version: "2"
 services:
  doorbot:
   build: .
-  image: fswiai/doorbot:0.2
+  image: fswiai/doorbot:0.4
   volumes:
    - ./settings.json:/app/settings.json

src/sources.py

@@ -1,16 +1,19 @@
 import datetime
+from abc import ABCMeta, abstractmethod
+from collections import namedtuple
+
 import requests
 
-from collections import namedtuple
 
 Status = namedtuple("Status", ['doorstate', 'timestamp', 'text'])
 
-class Source:
+class Source(metaclass=ABCMeta):
+	@abstractmethod
 	def get_status(self):
-		raise NotImplementedError()
+		pass
 	
 	def is_recent(self, status, **kwargs):
-		raise NotImplementedError()
+		return status.timestamp + datetime.timedelta(days=1) < datetime.datetime.today()
 
 class IsFsWIAIopen(Source):
 	url = "https://isfswiaiopen.wiai.de?json"
@@ -29,7 +32,4 @@ class IsFsWIAIopen(Source):
 		return Status(
 			doorstate=str(status['doorstate']),
 			timestamp=self._parse_time(status['timestamp']),
-			text=self._get_text(str(status['doorstate'])))
-	
-	def is_recent(self, status, **kwargs):
-		return status.timestamp + datetime.timedelta(days=1) < datetime.datetime.today()
+			text=self._get_text(str(status['doorstate'])))

src/targets.py

@@ -1,4 +1,5 @@
 import logging
+from abc import ABCMeta, abstractmethod
 
 import requests
 
@@ -6,18 +7,21 @@ from matrix_client.client import MatrixClient as MatrixApiClient
 from matrix_client.errors import MatrixError
 
 
-class Client:
+class Client(metaclass=ABCMeta):
+	@abstractmethod
+	def __init__(self):
+		pass
+	
 	def post_image(self, file, name, content_type="image/png", targets=None):
 		"""Push to all targets"""
 		self.post_image(file, name, content_type, targets)
-		#raise NotImplementedError()
 	
 	def send_image(self, target, file, name, content_type="image/png"):
 		"""Send an image to a room
 	
 		Args:
 			target (str): The internal room id to post into
-			path (file): The image file object
+			file (file): The image file object
 			name (str): The name for the file in the room
 			content_type (str): Content-type of the image
 		"""
@@ -26,7 +30,6 @@ class Client:
 	def post_text(self, text, targets=None):
 		"""Push to all targets"""
 		self.post_text(text, targets)
-		#raise NotImplementedError()
 	
 	def send_text(self, target, text):
 		"""Send a text to a room