r
/
hugvey
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitlab.com:hugvey/hugvey

This commit is contained in:
Ruben van de Ven 2020-02-22 01:42:19 +03:00
parent f6aeeec3d3 c59a07b333
commit 7d23e4a478
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -273,3 +273,10 @@ alias.url = ("/local/" => "/home/hugvey/hugvey/local/")
``` ```
## When Telegram is blocked
In Russia, Telegram is blocked, to circumvent this, we set it to run over a SOCKS proxy:
`autossh -M 0 -o "ServerAliveInterval 30" -o "ServerAliveCountMax 3" -N -D 9090 rubenvandeven.com`

1
hugvey/story.py
View File

@ -1090,6 +1090,7 @@ class Diversion(object):
""" """
(1) last spoken at all (1) last spoken at all
(2) or duration for this last reply only (2) or duration for this last reply only
Only can kick in if there's no 'timeout' condition set.
""" """
if story.currentDiversion: if story.currentDiversion:
return return