README.md

@@ -1,9 +1,12 @@
 # ClickAt
 
-[Shaarli](https://github.com/shaarli/Shaarli/) plugin to make 𝕏 and Fediverse addresses clickable.
+[Shaarli](https://github.com/shaarli/Shaarli/) plugin to make microblogging 
+social networks (Twitter/𝕏 and Fediverse) addresses clickable. 
 
 ## Manual
 
 1. Clone repository in plugin directory.
 2. Activate plugin.
-3. Quote users from Twitter/𝕏 with their `@nic`, and users from the Fediverse with `@nic@server`.
+3. Quote users from:
+    - Twitter/𝕏 with their `@nic`, 
+    - Fediverse with `@nic@instance`.

clickat.meta

@@ -1 +1 @@
-description="Make Twitter and Fediverse addresses clickable."
+description="Make microblogging social networks (Twitter/𝕏 and Fediverse) addresses clickable."

clickat.php

@@ -2,7 +2,7 @@
 /**
  * ClickAt
  *
- * This plugin makes Twitter and Fediverse addresses clickable.
+ * This plugin makes microblogging social networks (Twitter/𝕏 and Fediverse) addresses clickable.
  */
 
 use Shaarli\Config\ConfigManager;
@@ -13,8 +13,16 @@ function hook_clickat_render_linklist($data)
 {
    
     foreach ($data['links'] as &$value) {
-        $value['description'] = preg_replace('/\ @([\w\d]+)@([\w\d_\-\.]+)/',' <a href="https://\2/@\1">&commat;\1</a>',$value['description']);
+        $value['description'] = preg_replace(
-        $value['description'] = preg_replace('/\ @([\w\d]+)/',' <a href="https://twitter.com/\1">&commat;\1</a>',$value['description']);
+            '/\ @([\w\d]+)@([\w\d_\-\.]+)/',
+            ' <a href="https://\2/@\1">&commat;\1</a>',
+            $value['description']
+        );
+        $value['description'] = preg_replace(
+            '/\ @([\w\d]+)/',
+            ' <a href="https://twitter.com/\1">&commat;\1</a>',
+            $value['description']
+        );
     }
     return $data;
 }