Merge branch 'develop' into Sidebar-Menu
# Conflicts: # src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java # src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java # src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
This commit is contained in:
@@ -313,6 +313,8 @@ public class userDatabase {
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public List<User> searchUsers(String keyword, UUID currentUserId) {
|
||||
String query = """
|
||||
SELECT * FROM users
|
||||
|
||||
Reference in New Issue
Block a user