fix: format datetime incorrect.

qbcore-framework · Jan 17, 2024 · b354aeb · b354aeb
1 parent 204ca50
commit b354aeb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 45 deletions.
diff --git a/html/index.html b/html/index.html
@@ -29,6 +29,7 @@
     <link rel="stylesheet" href="./css/camera.css">
 
     <!-- CDN's -->
+
     <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> <!-- JQuery -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/emojionearea/3.4.2/emojionearea.min.js" integrity="sha512-hkvXFLlESjeYENO4CNi69z3A1puvONQV5Uh+G4TUDayZxSLyic5Kba9hhuiNLbHqdnKNMk2PxXKm0v7KDnWkYA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script> <!-- Bootstrap -->
@@ -1113,24 +1114,24 @@
         </div>
 
         <!-- JavaScript File's -->
-        <script src="./js/config.js"></script>
-        <script src="./js/app.js"></script>
-        <script src="./js/settings.js"></script>
-        <script src="./js/phone.js"></script>
-        <script src="./js/twitter.js"></script>
-        <script src="./js/bank.js"></script>
-        <script src="./js/whatsapp.js"></script>
-        <script src="./js/garage.js"></script>
-        <script src="./js/mail.js"></script>
-        <script src="./js/meos.js"></script>
-        <script src="./js/crypto.js"></script>
-        <script src="./js/racing.js"></script>
-        <script src="./js/houses.js"></script>
-        <script src="./js/lawyers.js"></script>
-        <script src="./js/qstore.js"></script>
-        <script src="./js/trucker.js"></script>
-        <script src="./js/gallery.js"></script>
-        <script src="./js/camera.js"></script>
+        <script src="./js/config.js" defer></script>
+        <script src="./js/app.js" defer></script>
+        <script src="./js/settings.js" defer></script>
+        <script src="./js/phone.js" defer></script>
+        <script src="./js/twitter.js" defer></script>
+        <script src="./js/bank.js" defer></script>
+        <script src="./js/whatsapp.js" defer></script>
+        <script src="./js/garage.js" defer></script>
+        <script src="./js/mail.js" defer></script>
+        <script src="./js/meos.js" defer></script>
+        <script src="./js/crypto.js" defer></script>
+        <script src="./js/racing.js" defer></script>
+        <script src="./js/houses.js" defer></script>
+        <script src="./js/lawyers.js" defer></script>
+        <script src="./js/qstore.js" defer></script>
+        <script src="./js/trucker.js" defer></script>
+        <script src="./js/gallery.js" defer></script>
+        <script src="./js/camera.js" defer></script>
         <script type="text/javascript">$('#whatsapp-openedchat-message').emojioneArea({inline: true, searchPosition: "bottom", shortnames: true})</script>
         <!-- <script type="text/javascript">$('#tweet-new-message').emojioneArea({pickerPostion: 'bottom' ,inline: true, shortnames: true})</script> -->
     </body>

diff --git a/html/js/twitter.js b/html/js/twitter.js
@@ -214,10 +214,10 @@ $(document).on('click', '#send-tweet', function(e){
     var TweetMessage = $("#tweet-new-message").val();
     var imageURL = $('#tweet-new-url').val()
     if (TweetMessage != "") {
-        var CurrentDate = new Date();
+        var CurrentDate = new Date()
         $.post('https://qb-phone/PostNewTweet', JSON.stringify({
             Message: TweetMessage,
-            Date: CurrentDate,
+            Date: CurrentDate.toISOString().slice(0, 19).replace('T', ' '),
             Picture: QB.Phone.Data.MetaData.profilepicture,
             url: imageURL
         }), function(Tweets){

diff --git a/server/main.lua b/server/main.lua
@@ -796,31 +796,17 @@ end)
 
 RegisterNetEvent('qb-phone:server:UpdateTweets', function(NewTweets, TweetData)
     local src = source
-    if Config.Linux then
-        MySQL.insert('INSERT INTO phone_tweets (citizenid, firstName, lastName, message, date, url, picture, tweetid) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', {
-            TweetData.citizenid,
-            TweetData.firstName,
-            TweetData.lastName,
-            TweetData.message,
-            TweetData.date,
-            TweetData.url:gsub('[%<>\"()\' $]', ''),
-            TweetData.picture:gsub('[%<>\"()\' $]', ''),
-            TweetData.tweetId
-        })
-        TriggerClientEvent('qb-phone:client:UpdateTweets', -1, src, NewTweets, TweetData, false)
-    else
-        MySQL.insert('INSERT INTO phone_tweets (citizenid, firstName, lastName, message, date, url, picture, tweetid) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', {
-            TweetData.citizenid,
-            TweetData.firstName,
-            TweetData.lastName,
-            TweetData.message,
-            TweetData.time,
-            TweetData.url:gsub('[%<>\"()\' $]', ''),
-            TweetData.picture:gsub('[%<>\"()\' $]', ''),
-            TweetData.tweetId
-        })
-        TriggerClientEvent('qb-phone:client:UpdateTweets', -1, src, NewTweets, TweetData, false)
-    end
+    MySQL.insert('INSERT INTO phone_tweets (citizenid, firstName, lastName, message, date, url, picture, tweetid) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', {
+        TweetData.citizenid,
+        TweetData.firstName,
+        TweetData.lastName,
+        TweetData.message,
+        TweetData.time,
+        TweetData.url:gsub('[%<>\"()\' $]', ''),
+        TweetData.picture:gsub('[%<>\"()\' $]', ''),
+        TweetData.tweetId
+    })
+    TriggerClientEvent('qb-phone:client:UpdateTweets', -1, src, NewTweets, TweetData, false)
 end)
 
 RegisterNetEvent('qb-phone:server:TransferMoney', function(iban, amount)