User generated local paths

2020-12-30 17:36:35 -08:00
parent d821a08cff
commit dc68fdd53e
14 changed files with 50 additions and 38 deletions
--- a/bookwyrm/utils/regex.py
+++ b/bookwyrm/utils/regex.py
@ -1,5 +1,6 @@
 ''' defining regexes for regularly used concepts '''

 domain = r'[a-z-A-Z0-9_\-]+\.[a-z]+'
-username = r'@[a-zA-Z_\-\.0-9]+(@%s)?' % domain
-full_username = r'@?[a-zA-Z_\-\.0-9]+@%s' % domain
+localname = r'@?[a-zA-Z_\-\.0-9]+'
+username = r'%s(@%s)?' % (localname, domain)
+full_username = r'%s@%s' % (localname, domain)