Makefile, some fixes

Makefile

@@ -0,0 +1,35 @@
+LINT_FILES=maigret wizard.py tests
+
+test:
+	coverage run --source=./maigret -m pytest tests
+	coverage report -m
+	coverage html
+
+rerun-tests:
+	pytest --lf
+
+lint:
+	@echo 'syntax errors or undefined names'
+	flake8 --count --select=E9,F63,F7,F82 --show-source --statistics ${LINT_FILES} maigret.py
+
+	@echo 'warning'
+	flake8 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --ignore=E731,W503 ${LINT_FILES} maigret.py
+
+	@echo 'mypy'
+	mypy ${LINT_FILES}
+
+format:
+	@echo 'black'
+	black --skip-string-normalization ${LINT_FILES}
+
+pull:
+	git stash
+	git checkout main
+	git pull origin head
+	git stash pop
+
+clean:
+	rm -rf reports htmcov dist
+
+install:
+	pip3 install .

format.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-FILES="maigret wizard.py maigret.py tests"
-
-echo 'black'
-black --skip-string-normalization $FILES

lint.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-FILES="maigret wizard.py maigret.py tests"
-
-echo 'syntax errors or undefined names'
-flake8 --count --select=E9,F63,F7,F82 --show-source --statistics $FILES
-
-echo 'warning'
-flake8 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --ignore=E731,W503 $FILES
-
-echo 'mypy'
-mypy ./maigret ./wizard.py ./tests

maigret/checking.py

@@ -1,6 +1,11 @@
 import asyncio
 import logging
+
+try:
     from mock import Mock
+except ImportError:
+    from unittest.mock import Mock
+
 import re
 import ssl
 import sys

maigret/resources/data.json

@@ -7883,11 +7883,14 @@
             ],
             "checkType": "message",
             "absenceStrs": [
-                "@context\": \"https://schema.org"
+                "https://likee.video/@/"
             ],
-            "alexaRank": 1072749,
-            "urlMain": "https://likee.com",
-            "url": "https://likee.com/user/@{username}/",
+            "presenseStrs": [
+                "user_name"
+            ],
+            "alexaRank": 38032,
+            "url": "https://likee.video/@{username}",
+            "urlMain": "https://likee.video",
             "usernameClaimed": "adam",
             "usernameUnclaimed": "noonewouldeverusethis7"
         },

test.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-coverage run --source=./maigret -m pytest tests
-coverage report -m
-coverage html