Removed references to ingores instead to return error on comment/post

Meneame · Jun 26, 2018 · 765f3a5 · 765f3a5
1 parent 8e7d384
commit 765f3a5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/www/backend/comment_ajax.php b/www/backend/comment_ajax.php
@@ -171,13 +171,8 @@ function check_and_save($comment, $link)
             return _('comentario no insertado, enlace a sitio deshabilitado (y usuario reciente)');
         }
 
-        if ($error = User::checkReferencesToIgnores($comment->content)) {
-            return $error;
-        }
-
-        if ($error = User::checkReferencesToLinkCommentsIgnores($link, $comment->content)) {
-            return $error;
-        }
+        $comment->content = User::removeReferencesToIgnores($comment->content);
+        $comment->content = User::removeReferencesToLinkCommentsIgnores($link, $comment->content);
 
         if (mb_strlen($comment->content) > 0) {
             $comment->store();

diff --git a/www/backend/post_edit.php b/www/backend/post_edit.php
@@ -88,9 +88,7 @@ function save_post($post_id)
             $poll->read('post_id', $post->id);
             $poll->post_id = $post->id;
 
-            if ($error = User::checkReferencesToIgnores($post->content)) {
-                die('ERROR: '.$error);
-            }
+            $post->content = User::removeReferencesToIgnores($post->content);
 
             $db->transaction();
 
@@ -139,9 +137,7 @@ function save_post($post_id)
             die('ERROR: '._('comentario grabado previamente'));
         }
 
-        if ($error = User::checkReferencesToIgnores($post->content)) {
-            die('ERROR: '.$error);
-        }
+        $post->content = User::removeReferencesToIgnores($post->content);
 
         $poll = new Poll;
 

diff --git a/www/libs/comment.php b/www/libs/comment.php
@@ -721,13 +721,8 @@ public static function save_from_post($link, $redirect = true)
             return _('comentario duplicado');
         }
 
-        if ($error = User::checkReferencesToIgnores($comment->content)) {
-            return $error;
-        }
-
-        if ($error = User::checkReferencesToLinkCommentsIgnores($link, $comment->content)) {
-            return $error;
-        }
+        $comment->content = User::removeReferencesToIgnores($comment->content);
+        $comment->content = User::removeReferencesToLinkCommentsIgnores($link, $comment->content);
 
         if ($karma_penalty > 0) {
             $db->rollback();

diff --git a/www/libs/user.php b/www/libs/user.php
@@ -1122,9 +1122,20 @@ public static function checkReferencesToIgnores($message)
             );
         ';
 
-        if ($ignored = $db->get_col($query)) {
-            return sprintf(_('No es posible hacer referencias a usuarios que te tienen ignorado (%s).'), implode(', ', $ignored));
+        return $db->get_col($query);
+    }
+
+    public static function removeReferencesToIgnores($message)
+    {
+        if (!($ignores = static::checkReferencesToIgnores($message))) {
+            return $message;
         }
+
+        foreach ($ignores as $user) {
+            $message = preg_replace('/@'.preg_quote($user, '/').'(,[0-9]+)?/', '', $message);
+        }
+
+        return $message;
     }
 
     public static function checkReferencesToLinkCommentsIgnores($link, $message)
@@ -1142,7 +1153,7 @@ public static function checkReferencesToLinkCommentsIgnores($link, $message)
         }
 
         $query = '
-            SELECT SQL_CACHE `users`.`user_login`
+            SELECT SQL_CACHE `comments`.`comment_order`
             FROM `comments`, `friends`, `users`
             WHERE (
                 `comments`.`comment_link_id` = "'.(int)$link->id.'"
@@ -1155,8 +1166,19 @@ public static function checkReferencesToLinkCommentsIgnores($link, $message)
             );
         ';
 
-        if ($ignored = $db->get_col($query)) {
-            return sprintf(_('No es posible hacer referencias a usuarios que te tienen ignorado (%s).'), implode(', ', $ignored));
+        return $db->get_col($query);
+    }
+
+    public static function removeReferencesToLinkCommentsIgnores($link, $message)
+    {
+        if (!($ignores = static::checkReferencesToLinkCommentsIgnores($link, $message))) {
+            return $message;
         }
+
+        foreach ($ignores as $order) {
+            $message = preg_replace('/#'.$order.'([^0-9]|$)/', '$1', $message);
+        }
+
+        return $message;
     }
 }