Merge pull request #79 from paul999/33x2

Preparing for new release

README.md

@@ -6,7 +6,9 @@ Copy the extension to phpBB/ext/paul999/mention
 
 Go to "ACP" > "Customise" > "Extensions" and enable the "phpBB mentions" extension.
 
-**Please note that this extension requires phpBB 3.2!**
+**Please note that this extension requires phpBB 3.3 and at least php 7.1! 
+The extension has only been tested with PHP7.1, 7.2, 7.3 7,4 and 8.0.
+If you use phpBB 3.2, you should use 1.0.x instead.**
 
 ## Tests and Continuous Integration
 

composer.json

@@ -4,7 +4,7 @@
     "description": "Mention a user by using @USERNAME",
     "homepage": "https://www.phpbbextensions.io",
     "version": "2.0.0",
-    "time": "2019-06-10",
+    "time": "2023-03-04",
     "license": "GPL-2.0-only",
     "authors": [
         {
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "~7.1"
+        "php": "~7.1 || ~8.0"
     },
     "extra": {
         "display-name": "Simple mentions",

controller/main.php

@@ -70,9 +70,9 @@ public function __construct(user $user, driver_interface $db, auth $auth, reques
 	 * get a list of users matching on a username (Minimal 3 chars)
 	 *
 	 *
-	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 * @return JsonResponse A Symfony Response object
 	 */
-	public function handle()
+	public function handle() : JsonResponse
 	{
 		if ($this->user->data['user_id'] == ANONYMOUS || $this->user->data['is_bot'] || !$this->auth->acl_get('u_can_mention'))
 		{
@@ -89,18 +89,57 @@ public function handle()
 					FROM ' . USERS_TABLE . ' 
 					WHERE user_id <> ' . ANONYMOUS . ' 
 					AND ' . $this->db->sql_in_set('user_type', [USER_NORMAL, USER_FOUNDER]) .  '
-					AND username_clean ' . $this->db->sql_like_expression($name . $this->db->get_any_char());
-		$result = $this->db->sql_query($sql);
+					AND username_clean ' . $this->db->sql_like_expression($this->db->get_any_char() . $name . $this->db->get_any_char());
+		$result = $this->db->sql_query_limit($sql, max(5, (int) $this->config['simple_mention_maxresults']), 0);
 		$return = [];
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$return[] = [
-				'key'       =>$row['username'],
+				'key'       => $row['username'],
 				'value'     => $row['username'],
+				'user_id'	=> $row['user_id'],
+				'type'		=> 'user',
 			];
 		}
 		$this->db->sql_freeresult($result);
+
+		if ($this->auth->acl_get('u_can_mention_groups'))
+		{
+			// We can mention groups. So also add that to the list.
+
+			$sql = 'SELECT COUNT(ug.user_id) as cnt, g.group_name, g.group_id, g.group_type
+				FROM '. USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g
+				WHERE 
+						g.group_id = ug.group_id
+						AND g.group_type <> ' . GROUP_HIDDEN . '
+						AND ' . $this->db->sql_in_set('g.group_name', ['GUESTS', 'BOTS'], true) . '
+						AND (
+								LOWER(g.group_name) ' . $this->db->sql_like_expression($this->db->get_any_char() . strtolower($name) . $this->db->get_any_char()) . '
+								OR g.group_type = ' . GROUP_SPECIAL . ' 
+							) 
+				GROUP BY ug.group_id';
+
+			$result = $this->db->sql_query_limit($sql, max(5, (int) $this->config['simple_mention_maxresults']), 0);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if ($row['cnt'] > $this->config['simple_mention_large_groups'] && !$this->auth->acl_get('u_can_mention_large_groups'))
+				{
+					// User can't send mentions to large groups.
+					continue;
+				}
+				$return[] = [
+					'key'       => $row['group_type'] == GROUP_SPECIAL ? $this->user->lang('G_' . $row['group_name']) : $row['group_name'],
+					'value'     => $row['group_type'] == GROUP_SPECIAL ? $this->user->lang('G_' . $row['group_name']) : $row['group_name'],
+					'group_id'	=> $row['group_id'],
+					'cnt'		=> $row['cnt'],
+					'type'		=> 'group',
+				];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
 		return new JsonResponse($return);
 	}
 }