Merge branch 'foolproof_file_redirection_branch' into 'nightly'

[quix0rs-gnu-social.git] / lib / nickname.php

diff --git a/lib/nickname.php b/lib/nickname.php
index c49ce20f5eff28ae0e5bb4d1534c55cf37764190..5a5b515b4dfceec44f70c3f4b63c7e7b7285ef98 100644 (file)
--- a/lib/nickname.php
+++ b/lib/nickname.php
@@ -76,6 +76,16 @@ class Nickname
      */
     const MAX_LEN = 64;
 
+    /**
+     * Regex with non-capturing group that matches whitespace and some
+     * characters which are allowed right before an @ or ! when mentioning
+     * other users. Like: 'This goes out to:@mmn (@chimo too) (!awwyiss).'
+     *
+     * FIXME: Make this so you can have multiple whitespace but not multiple
+     * parenthesis or something. '(((@n_n@)))' might as well be a smiley.
+     */
+    const BEFORE_MENTIONS = '(?:^|[\s\.\,\:\;\[\(]+)';
+
     /**
      * Nice simple check of whether the given string is a valid input nickname,
      * which can be normalized into an internally canonical form.
@@ -191,6 +201,12 @@ class Nickname
                 $paths[$matches[1]] = true;
             }
         }
+
+        // FIXME: this assumes the 'path' is in the first-level directory, though common it's not certain
+        foreach (['avatar', 'attachments'] as $cat) {
+            $paths[basename(common_config($cat, 'path'))] = true;
+        }
+
         return in_array($str, array_keys($paths));
     }