Compare commits

..

No commits in common. "f94b99d357022881e602b7b351b54538889175ae" and "d12078b0926108ec0ee4dc7de66622daa7ac0fca" have entirely different histories.

4 changed files with 22 additions and 43 deletions

View file

@ -1,22 +1,22 @@
type ChatMessage = {
name: string;
messages: any;
message: any;
timestamp: number;
};
let chatHistory: ChatMessage[] = [];
function addMessageHistory(name: string, message: any): void {
function addMessage(name: string, message: any): void {
const newMessage: ChatMessage = {
name: name,
messages: message,
message: message,
timestamp: Date.now()
};
chatHistory.push(newMessage);
console.log(`Added message from ${name}: ${message}`);
}
function removeMessageHistory(timestamp: number): void {
function removeMessage(timestamp: number): void {
const index = chatHistory.findIndex((msg) => msg.timestamp === timestamp);
if (index > -1) {
chatHistory.splice(index, 1);

View file

@ -68,7 +68,7 @@ export const changePassword = async (usernameOrEmail: string, password: string,
export const getData = async (usernameOrEmail: string, password: string) => {
const data = {
action: "get_settings",
action: "get_data",
username: usernameOrEmail.includes('@') ? undefined : usernameOrEmail,
email: usernameOrEmail.includes('@') ? usernameOrEmail : undefined,
password,
@ -98,7 +98,7 @@ export const getName = async (usernameOrEmail: string, password: string): Promis
export const changeData = async (usernameOrEmail: string, password: string, newData: any) => {
const data = {
action: "change_settings",
action: "change_data",
username: usernameOrEmail.includes('@') ? undefined : usernameOrEmail,
email: usernameOrEmail.includes('@') ? usernameOrEmail : undefined,
password,

View file

@ -103,14 +103,10 @@ class API:
return jsonify({'status': 200, 'response': self.db.add_user(sent_data)})
elif action == "change_password":
return jsonify({'status': 200, 'response': self.db.update_password(sent_data)})
elif action == "get_settings":
return jsonify({'status': 200, 'response': self.db.get_settings(sent_data)})
elif action == "change_settings":
return jsonify({'status': 200, 'response': self.db.change_settings(sent_data)})
elif action == "get_history":
return jsonify({'status': 200, 'response': self.db.get_history(sent_data)})
elif action == "change_history":
return jsonify({'status': 200, 'response': self.db.change_history(sent_data)})
elif action == "get_data":
return jsonify({'status': 200, 'response': self.db.get_data(sent_data)})
elif action == "change_data":
return jsonify({'status': 200, 'response': self.db.change_data(sent_data)})
elif action == "check_credentials":
return jsonify({'status': 200, 'response': self.db.check_credentials(sent_data)})
elif action == "delete_account":

View file

@ -27,7 +27,7 @@ class DB:
password = data.get('password')
email = data.get('email')
hashed_password = self.hash_password(password)
user_data = {"hashed_password": hashed_password, "email": email, "settings": None, "history": None}
user_data = {"hashed_password": hashed_password, "email": email, "data": None}
if username not in self.database:
self.database[username] = user_data
self.save_database()
@ -43,6 +43,15 @@ class DB:
self.save_database()
return True
def change_data(self, data):
username = self.ensure_username(data)
if not self.check_credentials(data):
return False
self.database[username]['data'] = data.get('data')
self.save_database()
return True
def update_password(self, data):
username = self.ensure_username(data)
new_password = data.get('new_password')
@ -65,38 +74,12 @@ class DB:
print(stored_hashed_password == entered_hashed_password)
return stored_hashed_password == entered_hashed_password
def change_settings(self, data):
username = self.ensure_username(data)
if not self.check_credentials(data):
return False
self.database[username]['settings'] = data.get('data')
self.save_database()
return True
def get_settings(self, data):
def get_data(self, data):
username = self.ensure_username(data)
if not self.check_credentials(data):
return None
send_back = self.database[username].get('settings')
return send_back
def change_history(self, data):
username = self.ensure_username(data)
if not self.check_credentials(data):
return False
self.database[username]['history'] = data.get('data')
self.save_database()
return True
def get_history(self, data):
username = self.ensure_username(data)
if not self.check_credentials(data):
return None
send_back = self.database[username].get('history')
send_back = self.database[username].get('data')
return send_back
def get_email(self, data):