psy2

Sleeping

App Files Files Community

DmitrMakeev commited on Jul 9, 2024

Commit

49f77e6

verified ·

1 Parent(s): 70843e7

Update app.py

Browse files

Files changed (1) hide show

app.py +33 -36

app.py CHANGED Viewed

@@ -28,7 +28,6 @@ if not os.path.exists(UPLOAD_FOLDER):
 # Создание базы данных и таблицы
 def init_db():
     try:
@@ -109,19 +108,19 @@ def online():
 @app.route('/upload', methods=['POST'])
 def upload_file():
     if 'photo' not in request.files:
-        return jsonify({'error': 'No file part'}), 400
     file = request.files['photo']
     if file.filename == '':
-        return jsonify({'error': 'No selected file'}), 400
     save_path = os.path.join(UPLOAD_FOLDER, IMAGE_FILENAME)
     file.save(save_path)
-    return jsonify({'message': 'File uploaded successfully', 'file_url': f'/image', 'file_name': file.filename}), 200
 @app.route('/image', methods=['GET'])
 def get_image():
     return send_from_directory(UPLOAD_FOLDER, IMAGE_FILENAME)
-@app.route('/se_mes_im2')
 def index():
     html = '''
     <!DOCTYPE html>
@@ -129,7 +128,7 @@ def index():
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Send Messages</title>
         <style>
             body {
                 font-family: Arial, sans-serif;
@@ -194,34 +193,27 @@ def index():
         </style>
     </head>
     <body>
-        <h1>Отправка сообщения(текст)</h1>
         <div class="input-row">
             <input type="text" id="apiKeyInput" placeholder="Введите API ключ">
             <input type="number" id="minDelayInput" placeholder="Min Delay (ms)" value="500">
             <input type="number" id="maxDelayInput" placeholder="Max Delay (ms)" value="1000">
-            <label>
-                Показывать превью:
-                <input type="checkbox" id="linkPreviewCheckbox" checked>
-            </label>
         </div>
-        <textarea id="messageInput" placeholder="Введите текст сообщения, превью ссылки отображается в зависимости от настроек."></textarea>
         <div id="progressBarContainer">
             <div id="progressBar">
                 <div id="progress">0%</div>
             </div>
         </div>
-        <input type="file" id="fileInput" accept=".txt">
-        <button id="sendButton">Запустить рассылку</button>
-        <h1>Upload Image</h1>
         <form id="uploadForm" enctype="multipart/form-data" method="post" action="/upload">
             <input type="file" name="photo" id="photoInput">
-            <button type="submit">Upload Image</button>
         </form>
-        <div id="uploadMessage"></div>
-        <h1>Uploaded Image</h1>
-        <img id="cameraImage" src="" alt="No image uploaded" style="width:100%;">
         <script>
             document.getElementById('uploadForm').addEventListener('submit', function(event) {
                 event.preventDefault();
@@ -232,16 +224,14 @@ def index():
                 })
                 .then(response => response.json())
                 .then(data => {
-                    if (data.error) {
-                        document.getElementById('uploadMessage').innerText = data.error;
-                    } else {
-                        document.getElementById('uploadMessage').innerText = data.message;
-                        document.getElementById('cameraImage').src = data.file_url + '?' + new Date().getTime();
-                        document.getElementById('uploadedFileName').innerText = data.file_name;
-                    }
                 })
                 .catch(error => {
-                    document.getElementById('uploadMessage').innerText = 'Error: ' + error.message;
                 });
             });
@@ -250,7 +240,9 @@ def index():
                 const message = document.getElementById('messageInput').value;
                 const minDelay = parseInt(document.getElementById('minDelayInput').value) || 500;
                 const maxDelay = parseInt(document.getElementById('maxDelayInput').value) || 10000;
-                const linkPreview = document.getElementById('linkPreviewCheckbox').checked;
                 if (!apiKey) {
                     alert('Please enter your API key.');
                     return;
@@ -263,6 +255,11 @@ def index():
                     alert('Min delay must be less than max delay.');
                     return;
                 }
                 const fileInput = document.getElementById('fileInput');
                 const file = fileInput.files[0];
                 if (!file) {
@@ -273,26 +270,27 @@ def index():
                 reader.onload = function(event) {
                     const text = event.target.result;
                     const phones = text.split('\n').map(phone => phone.trim()).filter(phone => phone);
-                    sendMessages(phones, apiKey, message, minDelay, maxDelay, linkPreview);
                 };
                 reader.readAsText(file);
             });
-            async function sendMessages(phones, apiKey, message, minDelay, maxDelay, linkPreview) {
                 const totalPhones = phones.length;
                 const progressBar = document.getElementById('progress');
                 for (let i = 0; i < totalPhones; i++) {
                     const phone = phones[i];
                     try {
-                        const response = await fetch(`https://api.green-api.com/waInstance1101952913/sendMessage/${apiKey}`, {
                             method: 'POST',
                             headers: {
                                 'Content-Type': 'application/json'
                             },
                             body: JSON.stringify({
                                 chatId: `${phone}@c.us`,
-                                message: message,
-                                linkPreview: linkPreview
                             })
                         });
                         if (!response.ok) {
@@ -331,7 +329,6 @@ def index():
 # Маршрут для обработки GET-запроса
 @app.route('/add_contact', methods=['GET'])
 def add_contact():

 # Создание базы данных и таблицы
 def init_db():
     try:
 @app.route('/upload', methods=['POST'])
 def upload_file():
     if 'photo' not in request.files:
+        return jsonify({"message": "No file part"}), 400
     file = request.files['photo']
     if file.filename == '':
+        return jsonify({"message": "No selected file"}), 400
     save_path = os.path.join(UPLOAD_FOLDER, IMAGE_FILENAME)
     file.save(save_path)
+    return jsonify({"message": "File uploaded successfully", "file_url": "/image", "file_name": file.filename}), 200
 @app.route('/image', methods=['GET'])
 def get_image():
     return send_from_directory(UPLOAD_FOLDER, IMAGE_FILENAME)
+@app.route('/')
 def index():
     html = '''
     <!DOCTYPE html>
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Send Messages with Image</title>
         <style>
             body {
                 font-family: Arial, sans-serif;
         </style>
     </head>
     <body>
+        <h1>Отправка сообщения с изображением</h1>
         <div class="input-row">
             <input type="text" id="apiKeyInput" placeholder="Введите API ключ">
             <input type="number" id="minDelayInput" placeholder="Min Delay (ms)" value="500">
             <input type="number" id="maxDelayInput" placeholder="Max Delay (ms)" value="1000">
         </div>
+        <textarea id="messageInput" placeholder="Введите текст сообщения"></textarea>
+        <input type="file" id="fileInput" accept=".txt">
+        <button id="sendButton">Запустить рассылку</button>
         <div id="progressBarContainer">
             <div id="progressBar">
                 <div id="progress">0%</div>
             </div>
         </div>
         <form id="uploadForm" enctype="multipart/form-data" method="post" action="/upload">
             <input type="file" name="photo" id="photoInput">
+            <button type="submit">Загрузить изображение</button>
         </form>
+        <div id="message"></div>
+        <h1>Загруженное изображение</h1>
+        <img id="cameraImage" src="/image" alt="Image" style="width:100%;">
         <script>
             document.getElementById('uploadForm').addEventListener('submit', function(event) {
                 event.preventDefault();
                 })
                 .then(response => response.json())
                 .then(data => {
+                    document.getElementById('message').innerText = data.message;
+                    var image = document.getElementById("cameraImage");
+                    image.src = "/image?" + new Date().getTime();
+                    document.getElementById('fileUrlInput').value = data.file_url;
+                    document.getElementById('fileNameInput').value = data.file_name;
                 })
                 .catch(error => {
+                    document.getElementById('message').innerText = 'Error: ' + error.message;
                 });
             });
                 const message = document.getElementById('messageInput').value;
                 const minDelay = parseInt(document.getElementById('minDelayInput').value) || 500;
                 const maxDelay = parseInt(document.getElementById('maxDelayInput').value) || 10000;
+                const fileUrl = document.getElementById('fileUrlInput').value;
+                const fileName = document.getElementById('fileNameInput').value;
                 if (!apiKey) {
                     alert('Please enter your API key.');
                     return;
                     alert('Min delay must be less than max delay.');
                     return;
                 }
+                if (!fileUrl || !fileName) {
+                    alert('Please upload an image.');
+                    return;
+                }
                 const fileInput = document.getElementById('fileInput');
                 const file = fileInput.files[0];
                 if (!file) {
                 reader.onload = function(event) {
                     const text = event.target.result;
                     const phones = text.split('\n').map(phone => phone.trim()).filter(phone => phone);
+                    sendMessages(phones, apiKey, message, minDelay, maxDelay, fileUrl, fileName);
                 };
                 reader.readAsText(file);
             });
+            async function sendMessages(phones, apiKey, message, minDelay, maxDelay, fileUrl, fileName) {
                 const totalPhones = phones.length;
                 const progressBar = document.getElementById('progress');
                 for (let i = 0; i < totalPhones; i++) {
                     const phone = phones[i];
                     try {
+                        const response = await fetch(`https://api.green-api.com/waInstance1101952913/sendFileByUrl/${apiKey}`, {
                             method: 'POST',
                             headers: {
                                 'Content-Type': 'application/json'
                             },
                             body: JSON.stringify({
                                 chatId: `${phone}@c.us`,
+                                urlFile: fileUrl,
+                                fileName: fileName,
+                                caption: message
                             })
                         });
                         if (!response.ok) {
 # Маршрут для обработки GET-запроса
 @app.route('/add_contact', methods=['GET'])
 def add_contact():