Merge branch 'j94/substr-to-substring' of https://github.com/jaller94/matrix-appservice-discord into develop