Honk style users path

epicyon.py

@@ -1379,6 +1379,10 @@ if args.actor:
             nickname = args.actor.split('/accounts/')[1]
             nickname = nickname.replace('\n', '').replace('\r', '')
             domain = args.actor.split('/accounts/')[0]
+        elif '/u/' in args.actor:
+            nickname = args.actor.split('/u/')[1]
+            nickname = nickname.replace('\n', '').replace('\r', '')
+            domain = args.actor.split('/u/')[0]
     else:
         # format: @nick@domain
         if '@' not in args.actor:
@@ -1445,6 +1449,7 @@ if args.actor:
         personUrl = personUrl.replace('/accounts/', '/actor/')
         personUrl = personUrl.replace('/channel/', '/actor/')
         personUrl = personUrl.replace('/profile/', '/actor/')
+        personUrl = personUrl.replace('/u/', '/actor/')
     if not personUrl:
         # try single user instance
         personUrl = httpPrefix + '://' + domain
@@ -1508,6 +1513,10 @@ if args.followers:
             nickname = args.followers.split('/accounts/')[1]
             nickname = nickname.replace('\n', '').replace('\r', '')
             domain = args.followers.split('/accounts/')[0]
+        elif '/u/' in args.followers:
+            nickname = args.followers.split('/u/')[1]
+            nickname = nickname.replace('\n', '').replace('\r', '')
+            domain = args.followers.split('/u/')[0]
     else:
         # format: @nick@domain
         if '@' not in args.followers:
@@ -1572,6 +1581,7 @@ if args.followers:
         personUrl = personUrl.replace('/accounts/', '/actor/')
         personUrl = personUrl.replace('/channel/', '/actor/')
         personUrl = personUrl.replace('/profile/', '/actor/')
+        personUrl = personUrl.replace('/u/', '/actor/')
     if not personUrl:
         # try single user instance
         personUrl = httpPrefix + '://' + domain

follow.py

@@ -204,6 +204,9 @@ def isFollowerOfPerson(baseDir: str, nickname: str, domain: str,
     elif '://' + followerDomain + \
          '/accounts/' + followerNickname in followersStr:
         alreadyFollowing = True
+    elif '://' + followerDomain + \
+         '/u/' + followerNickname in followersStr:
+        alreadyFollowing = True
 
     return alreadyFollowing
 
@@ -542,6 +545,8 @@ def _storeFollowRequest(baseDir: str,
             alreadyFollowing = True
         elif '://' + domainFull + '/accounts/' + nickname in followersStr:
             alreadyFollowing = True
+        elif '://' + domainFull + '/u/' + nickname in followersStr:
+            alreadyFollowing = True
 
         if alreadyFollowing:
             if debug:

manualapprove.py

@@ -120,6 +120,9 @@ def manualApproveFollowRequest(session, baseDir: str,
         elif reqPrefix + '/accounts/' + reqNick in approveFollowsStr:
             exists = True
             approveHandleFull = reqPrefix + '/accounts/' + reqNick
+        elif reqPrefix + '/u/' + reqNick in approveFollowsStr:
+            exists = True
+            approveHandleFull = reqPrefix + '/u/' + reqNick
     if not exists:
         print('Manual follow accept: ' + approveHandleFull +
               ' not in requests file "' +

utils.py

@@ -656,6 +656,12 @@ def getNicknameFromActor(actor: str) -> str:
                 return nickStr
             else:
                 return nickStr.split('/')[0]
+        elif '/u/' in actor:
+            nickStr = actor.split('/u/')[1].replace('@', '')
+            if '/' not in nickStr:
+                return nickStr
+            else:
+                return nickStr.split('/')[0]
         elif '/@' in actor:
             # https://domain/@nick
             nickStr = actor.split('/@')[1]
@@ -696,6 +702,10 @@ def getDomainFromActor(actor: str) -> (str, int):
         domain = actor.split('/users/')[0]
         for prefix in prefixes:
             domain = domain.replace(prefix, '')
+    elif '/u/' in actor:
+        domain = actor.split('/u/')[0]
+        for prefix in prefixes:
+            domain = domain.replace(prefix, '')
     elif '/@' in actor:
         domain = actor.split('/@')[0]
         for prefix in prefixes: