JavaScriptSolidServer
diff --git a/‎src/utils/label.ts‎
Lines changed: 12 additions & 5 deletions b/‎src/utils/label.ts‎
Lines changed: 12 additions & 5 deletions
diff --git a/‎test/unit/utils/label.test.ts‎
Lines changed: 5 additions & 14 deletions b/‎test/unit/utils/label.test.ts‎
Lines changed: 5 additions & 14 deletions
@@ -76,22 +76,29 @@ export function label (thing, initialCap = false): string {
       }
     }
   }
-  if (s.slice(-5) === '#this') s = s.slice(0, -5)
-  else if (s.slice(-3) === '#me') s = s.slice(0, -3)
+
+  s = slice(s, '/profile/card#me')
+  s = slice(s, '#this')
+  s = slice(s, '#me')
 
   const hash = s.indexOf('#')
   if (hash >= 0) return cleanUp(s.slice(hash + 1))
 
-  if (s.slice(-9) === '/foaf.rdf') s = s.slice(0, -9)
-  else if (s.slice(-5) === '/foaf') s = s.slice(0, -5)
-
   // Eh? Why not do this? e.g. dc:title needs it only trim URIs, not rdfs:labels
   const slash = s.lastIndexOf('/', s.length - 2) // (len-2) excludes trailing slash
   if (slash >= 0 && slash < thing.uri.length) return cleanUp(s.slice(slash + 1))
 
   return doCap(decodeURIComponent(thing.uri))
 }
 
+function slice (s: string, suffix: string) {
+  const length = suffix.length * -1
+  if (s.slice(length) === suffix) {
+    return s.slice(0, length)
+  }
+  return s
+}
+
 // Hard coded known label predicates
 //  @@ TBD: Add subproperties of rdfs:label
 function getWellKnownLabel (thing) {
 
@@ -65,22 +65,13 @@ describe('label', () => {
     })
     it('the last part of the path is used if fragment is #me', () => {
       const result = label(
-        sym('https://resource.example/profile/card#me')
+        sym('https://resource.example/path/to/folder/#me')
       )
-      expect(result).toEqual('card')
-    })
-    it('the last part of the path before foaf.rdf is used', () => {
-      const result = label(
-        sym('https://resource.example/profile/foaf.rdf')
-      )
-      expect(result).toEqual('profile')
+      expect(result).toEqual('folder')
     })
-
-    it('the last part of the path before foaf is used', () => {
-      const result = label(
-        sym('https://resource.example/profile/foaf')
-      )
-      expect(result).toEqual('profile')
+    it('the hostname is used for common WebID URI pattern', () => {
+      const result = label(sym('https://alice.solid.example/profile/card#me'))
+      expect(result).toEqual('alice.solid.example')
     })
   })