diff --git a/src-tauri/src/api/servers.rs b/src-tauri/src/api/servers.rs index 17b0e9d..47a0add 100644 --- a/src-tauri/src/api/servers.rs +++ b/src-tauri/src/api/servers.rs @@ -9,7 +9,7 @@ pub(crate) async fn getservers(token: String, username: String) -> String { map.insert("token", token.clone()); map.insert("username", username.clone()); prelude::debug_only_print(&format!("getservers {}", token)); - let res = post_to_text("https://onlinedi.vision/api/get_user_servers", map, "Failed to get use servers.") + let res = post_to_text("https://api.onlinedi.vision/api/get_user_servers", map, "Failed to get use servers.") .await .expect("err"); prelude::debug_only_print(&res); @@ -18,7 +18,7 @@ pub(crate) async fn getservers(token: String, username: String) -> String { #[tauri::command(rename_all = "snake_case")] pub(crate) async fn get_server_info(server_id: String) -> String { - let res = get_to_text(&format!("https://onlinedi.vision/servers/{}/api/get_server_info",server_id), "Failed to get server info.") + let res = get_to_text(&format!("https://api.onlinedi.vision/servers/{}/api/get_server_info",server_id), "Failed to get server info.") .await .expect("err"); prelude::debug_only_print(&res); @@ -40,7 +40,7 @@ pub(crate) async fn create_server( map.insert("img_url", img_url.clone()); map.insert("token", token.clone()); prelude::debug_only_print(&map); - let res = post_to_text("https://onlinedi.vision/api/create_server", map, "Failed to create server.") + let res = post_to_text("https://api.onlinedi.vision/api/create_server", map, "Failed to create server.") .await .expect("err"); prelude::debug_only_print(&res); diff --git a/src-tauri/src/api/spell_caster.rs b/src-tauri/src/api/spell_caster.rs index 4e722fb..ffec96e 100644 --- a/src-tauri/src/api/spell_caster.rs +++ b/src-tauri/src/api/spell_caster.rs @@ -14,7 +14,7 @@ pub(crate) async fn spellcheck( map.insert("username", username.clone()); map.insert("key", key.clone()); - let res = post_to_text("https://onlinedi.vision/api/spell/check", map, "Spell Check Failed").await + let res = post_to_text("https://api.onlinedi.vision/api/spell/check", map, "Spell Check Failed").await .expect("err"); prelude::debug_only_print(&res); res diff --git a/src-tauri/src/api/users.rs b/src-tauri/src/api/users.rs index 9d96c6a..aa4308f 100644 --- a/src-tauri/src/api/users.rs +++ b/src-tauri/src/api/users.rs @@ -9,7 +9,7 @@ pub(crate) async fn login(password: String, username: String) -> String { map.insert("password", password.clone()); map.insert("username", username.clone()); prelude::debug_only_print(&username); - let res = post_to_text("https://onlinedi.vision/api/try_login", map, "Failed to Log in.") + let res = post_to_text("https://api.onlinedi.vision/api/try_login", map, "Failed to Log in.") .await .expect("err"); prelude::debug_only_print(&res); @@ -23,7 +23,7 @@ pub(crate) async fn signup(password: String, username: String, email: String) -> map.insert("username", username.clone()); map.insert("email", email.clone()); prelude::debug_only_print(&username); - let res = post_to_text("https://onlinedi.vision/api/new_user", map, "Failed to create new user.") + let res = post_to_text("https://api.onlinedi.vision/api/new_user", map, "Failed to create new user.") .await .expect("err"); prelude::debug_only_print(&res); @@ -38,7 +38,7 @@ pub(crate) async fn get_profile_pic( let mut map = std::collections::HashMap::new(); map.insert("username", username.clone()); map.insert("token", token.clone()); - let res = post_to_text("https://onlinedi.vision/api/get_user_pfp", map, "Failed to get PFP.") + let res = post_to_text("https://api.onlinedi.vision/api/get_user_pfp", map, "Failed to get PFP.") .await .expect("err"); prelude::debug_only_print(&res); @@ -55,7 +55,7 @@ pub(crate) async fn set_profile_pic( map.insert("username", username.clone()); map.insert("token", token.clone()); map.insert("img_url", img_url.clone()); - let res = post_to_text("https://onlinedi.vision/api/set_user_pfp", map, "Failed to set profile pic.") + let res = post_to_text("https://api.onlinedi.vision/api/set_user_pfp", map, "Failed to set profile pic.") .await .expect("err"); prelude::debug_only_print(&res); diff --git a/src/app.js b/src/app.js index 90962ca..221c309 100644 --- a/src/app.js +++ b/src/app.js @@ -30,11 +30,11 @@ export default { console.log(err); }) this.appState.push({ 'serverID': servers['s_list'][i], 'storedChannels': [], 'serverUsers': [] }); - invoke('getchannels', { host_url: 'https://onlinedi.vision/servers', token: token, server: servers['s_list'][i], username: this.username }) + invoke('getchannels', { host_url: 'https://api.onlinedi.vision/servers', token: token, server: servers['s_list'][i], username: this.username }) .then((res) => { let channels = JSON.parse(res)['c_list']; for (let j = 0; j < channels.length; j++) { - invoke('getmessages', { host_url: 'https://onlinedi.vision/servers', token: token, server: servers['s_list'][i], channel: channels[j]['channel_name'], username: this.username }) + invoke('getmessages', { host_url: 'https://api.onlinedi.vision/servers', token: token, server: servers['s_list'][i], channel: channels[j]['channel_name'], username: this.username }) .then((res) => { this.appState[this.appState.findIndex(obj => obj.serverID == servers['s_list'][i])].storedChannels.push({ 'channelTag': channels[j]['channel_name'], 'messages': JSON.parse(res)['m_list'] }); this.storedChannels.push({ 'serverID': servers['s_list'][i], 'channelTag': channels[j]['channel_name'], 'messages': JSON.parse(res)['m_list'] }) @@ -45,7 +45,7 @@ export default { }); } - invoke('get_server_users', { host_url: 'https://onlinedi.vision/servers', token: token, server: servers['s_list'][i], username: this.username }) + invoke('get_server_users', { host_url: 'https://api.onlinedi.vision/servers', token: token, server: servers['s_list'][i], username: this.username }) .then((res) => { let users = JSON.parse(res)['u_list']; for (let user_iter = 0; user_iter < users.length; user_iter++) { @@ -90,7 +90,7 @@ export default { userServers: [{ 'serverID': '1', 'name': 'Welcome', - 'img_url': 'https://onlinedi.vision/cdn/test/stest.jpeg', + 'img_url': '', 'desc': 'Welcome!' }], appState: [{ @@ -162,7 +162,7 @@ export default { if(this.ws !== null ) { this.ws.send(this.serverID + ':' + this.textChannel + ':' + this.username +':' + message); } - invoke('sendmessage', { host_url: 'https://onlinedi.vision/servers', token: this.token, channel: this.textChannel, server: this.serverID, m_content: message, username: this.username }) + invoke('sendmessage', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, channel: this.textChannel, server: this.serverID, m_content: message, username: this.username }) .then(() => { this.message = ''; this.clearSelectedFile(); @@ -186,7 +186,7 @@ export default { if(this.ws !== null ) { this.ws.send(this.serverID + ':' + this.textChannel + ':' + this.username +':' + message); } - invoke('sendmessage', { host_url: 'https://onlinedi.vision/servers', token: this.token, channel: this.textChannel, server: this.serverID, m_content: message, username: this.username }) + invoke('sendmessage', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, channel: this.textChannel, server: this.serverID, m_content: message, username: this.username }) .then(() => { this.message = ''; }).catch((err) => { @@ -215,11 +215,11 @@ export default { console.log(err); }) this.appState.push({ 'serverID': servers['s_list'][i], 'storedChannels': [] }); - invoke('getchannels', { host_url: 'https://onlinedi.vision/servers', token: this.token, server: servers['s_list'][i], username: this.username }) + invoke('getchannels', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, server: servers['s_list'][i], username: this.username }) .then((res) => { let channels = JSON.parse(res)['c_list']; for (let j = 0; j < channels.length; j++) { - invoke('getmessages', { host_url: 'https://onlinedi.vision/servers', token: this.token, server: servers['s_list'][i], channel: channels[j]['channel_name'], username: this.username }) + invoke('getmessages', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, server: servers['s_list'][i], channel: channels[j]['channel_name'], username: this.username }) .then((res) => { this.appState[this.appState.findIndex(obj => obj.serverID == servers['s_list'][i])].storedChannels.push({ 'channelTag': channels[j]['channel_name'], 'messages': JSON.parse(res)['m_list'] }); @@ -307,7 +307,7 @@ export default { this.settingsOpen = false; }, get_messages(channel, server, token) { - invoke('getmessages', { host_url: 'https://onlinedi.vision/servers', token: token, server: server, channel: channel }) + invoke('getmessages', { host_url: 'https://api.onlinedi.vision/servers', token: token, server: server, channel: channel }) .then((res) => { console.log(res); }) @@ -349,7 +349,7 @@ export default { }, createChannel() { if(this.nchn.length > 15) return; - invoke('create_channel', { host_url: 'https://onlinedi.vision/servers', "username": this.username, "server_id": this.serverID, "token": this.token, "channel_name": this.nchn }) + invoke('create_channel', { host_url: 'https://api.onlinedi.vision/servers', "username": this.username, "server_id": this.serverID, "token": this.token, "channel_name": this.nchn }) .then((res) => { this.token = JSON.parse(res)['token']; this.appState[this.appState.findIndex(obj => obj.serverID === this.serverID)].storedChannels.push({ 'channelTag': this.nchn, 'messages': [] }); @@ -364,7 +364,7 @@ export default { }); }, deleteChannel(sid, channelName) { - invoke("delete_channel", { host_url: 'https://onlinedi.vision/servers', "username": this.username, "server_id": sid, "token": this.token, "channel_name": channelName }) + invoke("delete_channel", { host_url: 'https://api.onlinedi.vision/servers', "username": this.username, "server_id": sid, "token": this.token, "channel_name": channelName }) .then((res) => { if(res == "Channel deleted successfully") { this.appState[this.appState.findIndex(obj => obj.serverID === sid)].storedChannels = @@ -394,7 +394,7 @@ export default { }) this.appState.push({ 'serverID': new_sid, 'storedChannels': [], 'serverUsers': [] }); - invoke('getchannels', { host_url: 'https://onlinedi.vision/servers', token: this.token, server: new_sid, username: this.username }) + invoke('getchannels', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, server: new_sid, username: this.username }) .then((res) => { let channels = JSON.parse(res)['c_list']; for (let j = 0; j < channels.length; j++) { @@ -402,7 +402,7 @@ export default { this.storedChannels.push({ 'serverID': new_sid, 'channelTag': channels[j]['channel_name'], 'messages': []}) } - invoke('get_server_users', { host_url: 'https://onlinedi.vision/servers', token: this.token, server: new_sid, username: this.username }) + invoke('get_server_users', { host_url: 'https://api.onlinedi.vision/servers', token: this.token, server: new_sid, username: this.username }) .then((res) => { let users = JSON.parse(res)['u_list']; for (let user_iter = 0; user_iter < users.length; user_iter++) { @@ -427,7 +427,7 @@ export default { this.showSIDvar = !this.showSIDvar; }, joinServer() { - invoke('join_server', { host_url: 'https://onlinedi.vision/servers', "username": this.username, "token": this.token, "server_id": this.joinserverID }) + invoke('join_server', { host_url: 'https://api.onlinedi.vision/servers', "username": this.username, "token": this.token, "server_id": this.joinserverID }) .then((res) => { this.token = JSON.parse(res)['token']; invoke('write_credentials', { creds: JSON.stringify({ 'username': this.username, 'token': this.token }) })