Update app.py
Browse files
app.py
CHANGED
|
@@ -1,10 +1,8 @@
|
|
| 1 |
-
from flask import Flask, request, render_template, redirect, url_for, flash, jsonify, abort
|
| 2 |
from flask_sqlalchemy import SQLAlchemy
|
| 3 |
from datetime import datetime, timedelta, timezone
|
| 4 |
from apscheduler.schedulers.background import BackgroundScheduler
|
| 5 |
import markdown
|
| 6 |
-
import uuid # Importation du module UUID
|
| 7 |
-
import random # Importation du module random
|
| 8 |
|
| 9 |
app = Flask(__name__)
|
| 10 |
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///forum.db'
|
|
@@ -42,36 +40,6 @@ class Message(db.Model):
|
|
| 42 |
vote_count = db.Column(db.Integer, default=0)
|
| 43 |
reports = db.Column(db.Integer, default=0)
|
| 44 |
removed = db.Column(db.Boolean, default=False)
|
| 45 |
-
user_id = db.Column(db.String(36), nullable=False) # Ajout de la colonne user_id
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
# -------------------------------
|
| 50 |
-
# Fonction pour obtenir ou créer l'ID utilisateur
|
| 51 |
-
# -------------------------------
|
| 52 |
-
def get_user_id():
|
| 53 |
-
user_id = request.cookies.get('user_id')
|
| 54 |
-
if not user_id:
|
| 55 |
-
user_id = str(uuid.uuid4()) # Génère un nouvel UUID
|
| 56 |
-
return user_id
|
| 57 |
-
|
| 58 |
-
# -------------------------------
|
| 59 |
-
# Fonction pour obtenir un nom d'utilisateur aléatoire
|
| 60 |
-
# -------------------------------
|
| 61 |
-
def generate_username(user_id):
|
| 62 |
-
# Liste de couleurs
|
| 63 |
-
colors = ["Red", "Green", "Blue", "Yellow", "Purple", "Orange", "Pink", "Brown", "Gray", "Cyan"]
|
| 64 |
-
# Liste d'animaux
|
| 65 |
-
animals = ["Lion", "Tiger", "Elephant", "Panda", "Monkey", "Giraffe", "Zebra", "Wolf", "Fox", "Bear"]
|
| 66 |
-
|
| 67 |
-
# Utilisation de l'UUID pour générer des index "aléatoires" mais constants pour un même utilisateur
|
| 68 |
-
random.seed(user_id)
|
| 69 |
-
color = random.choice(colors)
|
| 70 |
-
animal = random.choice(animals)
|
| 71 |
-
random.seed() # Reinitialiser le seed pour le reste
|
| 72 |
-
|
| 73 |
-
return f"{color} {animal}"
|
| 74 |
-
|
| 75 |
|
| 76 |
# -------------------------------
|
| 77 |
# Routes de base et fonctionnalités
|
|
@@ -81,18 +49,11 @@ def generate_username(user_id):
|
|
| 81 |
@app.route('/')
|
| 82 |
def index():
|
| 83 |
threads = Thread.query.order_by(Thread.timestamp.desc()).all()
|
| 84 |
-
|
| 85 |
-
username = generate_username(user_id) # Obtenir un nom d'utilisateur
|
| 86 |
-
resp = make_response(render_template('index.html', threads=threads, username=username)) # Créer une réponse
|
| 87 |
-
resp.set_cookie('user_id', user_id, max_age=60*60*24*365*2) # Définir le cookie, expire dans 2 ans
|
| 88 |
-
return resp
|
| 89 |
|
| 90 |
# Création d'un nouveau fil de discussion
|
| 91 |
@app.route('/new_thread', methods=['GET', 'POST'])
|
| 92 |
def new_thread():
|
| 93 |
-
user_id = get_user_id() # Obtenir l'ID utilisateur
|
| 94 |
-
username = generate_username(user_id) # Obtenir un nom d'utilisateur
|
| 95 |
-
|
| 96 |
if request.method == 'POST':
|
| 97 |
title = request.form.get('title', '').strip()
|
| 98 |
content = request.form.get('content', '').strip()
|
|
@@ -103,36 +64,28 @@ def new_thread():
|
|
| 103 |
thread = Thread(title=title)
|
| 104 |
db.session.add(thread)
|
| 105 |
db.session.commit()
|
| 106 |
-
# Message initial
|
| 107 |
-
message = Message(thread_id=thread.id, content=content
|
| 108 |
db.session.add(message)
|
| 109 |
db.session.commit()
|
| 110 |
flash("Fil de discussion créé.", "success")
|
| 111 |
return redirect(url_for('thread', thread_id=thread.id))
|
| 112 |
-
|
| 113 |
-
resp = make_response(render_template('new_thread.html', username=username)) # Créer une réponse
|
| 114 |
-
resp.set_cookie('user_id', user_id, max_age=60*60*24*365*2) # Définir le cookie
|
| 115 |
-
return resp
|
| 116 |
|
| 117 |
# Visualisation d'un fil et réponse
|
| 118 |
@app.route('/thread/<int:thread_id>', methods=['GET', 'POST'])
|
| 119 |
def thread(thread_id):
|
| 120 |
thread_obj = Thread.query.get_or_404(thread_id)
|
| 121 |
-
user_id = get_user_id() # Obtenir l'ID utilisateur
|
| 122 |
-
username = generate_username(user_id) # Obtenir un nom d'utilisateur
|
| 123 |
-
|
| 124 |
if request.method == 'POST':
|
| 125 |
content = request.form.get('content', '').strip()
|
| 126 |
if not content:
|
| 127 |
flash("Le contenu du message ne peut pas être vide.", "error")
|
| 128 |
return redirect(url_for('thread', thread_id=thread_id))
|
| 129 |
-
|
| 130 |
-
message = Message(thread_id=thread_id, content=content, user_id=user_id)
|
| 131 |
db.session.add(message)
|
| 132 |
db.session.commit()
|
| 133 |
flash("Réponse postée.", "success")
|
| 134 |
return redirect(url_for('thread', thread_id=thread_id))
|
| 135 |
-
|
| 136 |
# Afficher uniquement les messages de moins de 72h et non supprimés
|
| 137 |
expiration_threshold = datetime.now(timezone.utc) - timedelta(hours=72)
|
| 138 |
messages = Message.query.filter(
|
|
@@ -140,16 +93,7 @@ def thread(thread_id):
|
|
| 140 |
Message.timestamp >= expiration_threshold,
|
| 141 |
Message.removed == False
|
| 142 |
).order_by(Message.timestamp.asc()).all()
|
| 143 |
-
|
| 144 |
-
# Préparer un dictionnaire pour mapper les user_id aux noms d'utilisateur
|
| 145 |
-
user_id_to_username = {}
|
| 146 |
-
for msg in messages:
|
| 147 |
-
if msg.user_id not in user_id_to_username:
|
| 148 |
-
user_id_to_username[msg.user_id] = generate_username(msg.user_id)
|
| 149 |
-
|
| 150 |
-
resp = make_response(render_template('thread.html', thread=thread_obj, messages=messages, user_id_to_username=user_id_to_username, username=username)) # Créer une réponse avec le username
|
| 151 |
-
resp.set_cookie('user_id', user_id, max_age=60*60*24*365*2) # Définir le cookie
|
| 152 |
-
return resp
|
| 153 |
|
| 154 |
# Système de vote (upvote/downvote)
|
| 155 |
@app.route('/vote/<int:message_id>/<action>', methods=['POST'])
|
|
@@ -189,7 +133,6 @@ def search():
|
|
| 189 |
flash("Veuillez entrer un terme de recherche.", "error")
|
| 190 |
return redirect(url_for('index'))
|
| 191 |
threads = Thread.query.filter(Thread.title.ilike(f'%{query}%')).all()
|
| 192 |
-
# Modification pour inclure l'ID de l'utilisateur dans la recherche des messages
|
| 193 |
messages = Message.query.filter(Message.content.ilike(f'%{query}%')).all()
|
| 194 |
return render_template('search.html', query=query, threads=threads, messages=messages)
|
| 195 |
|
|
@@ -234,4 +177,4 @@ scheduler.start()
|
|
| 234 |
if __name__ == '__main__':
|
| 235 |
with app.app_context():
|
| 236 |
db.create_all()
|
| 237 |
-
app.run(debug=True)
|
|
|
|
| 1 |
+
from flask import Flask, request, render_template, redirect, url_for, flash, jsonify, abort
|
| 2 |
from flask_sqlalchemy import SQLAlchemy
|
| 3 |
from datetime import datetime, timedelta, timezone
|
| 4 |
from apscheduler.schedulers.background import BackgroundScheduler
|
| 5 |
import markdown
|
|
|
|
|
|
|
| 6 |
|
| 7 |
app = Flask(__name__)
|
| 8 |
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///forum.db'
|
|
|
|
| 40 |
vote_count = db.Column(db.Integer, default=0)
|
| 41 |
reports = db.Column(db.Integer, default=0)
|
| 42 |
removed = db.Column(db.Boolean, default=False)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
# -------------------------------
|
| 45 |
# Routes de base et fonctionnalités
|
|
|
|
| 49 |
@app.route('/')
|
| 50 |
def index():
|
| 51 |
threads = Thread.query.order_by(Thread.timestamp.desc()).all()
|
| 52 |
+
return render_template('index.html', threads=threads)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 53 |
|
| 54 |
# Création d'un nouveau fil de discussion
|
| 55 |
@app.route('/new_thread', methods=['GET', 'POST'])
|
| 56 |
def new_thread():
|
|
|
|
|
|
|
|
|
|
| 57 |
if request.method == 'POST':
|
| 58 |
title = request.form.get('title', '').strip()
|
| 59 |
content = request.form.get('content', '').strip()
|
|
|
|
| 64 |
thread = Thread(title=title)
|
| 65 |
db.session.add(thread)
|
| 66 |
db.session.commit()
|
| 67 |
+
# Message initial
|
| 68 |
+
message = Message(thread_id=thread.id, content=content)
|
| 69 |
db.session.add(message)
|
| 70 |
db.session.commit()
|
| 71 |
flash("Fil de discussion créé.", "success")
|
| 72 |
return redirect(url_for('thread', thread_id=thread.id))
|
| 73 |
+
return render_template('new_thread.html')
|
|
|
|
|
|
|
|
|
|
| 74 |
|
| 75 |
# Visualisation d'un fil et réponse
|
| 76 |
@app.route('/thread/<int:thread_id>', methods=['GET', 'POST'])
|
| 77 |
def thread(thread_id):
|
| 78 |
thread_obj = Thread.query.get_or_404(thread_id)
|
|
|
|
|
|
|
|
|
|
| 79 |
if request.method == 'POST':
|
| 80 |
content = request.form.get('content', '').strip()
|
| 81 |
if not content:
|
| 82 |
flash("Le contenu du message ne peut pas être vide.", "error")
|
| 83 |
return redirect(url_for('thread', thread_id=thread_id))
|
| 84 |
+
message = Message(thread_id=thread_id, content=content)
|
|
|
|
| 85 |
db.session.add(message)
|
| 86 |
db.session.commit()
|
| 87 |
flash("Réponse postée.", "success")
|
| 88 |
return redirect(url_for('thread', thread_id=thread_id))
|
|
|
|
| 89 |
# Afficher uniquement les messages de moins de 72h et non supprimés
|
| 90 |
expiration_threshold = datetime.now(timezone.utc) - timedelta(hours=72)
|
| 91 |
messages = Message.query.filter(
|
|
|
|
| 93 |
Message.timestamp >= expiration_threshold,
|
| 94 |
Message.removed == False
|
| 95 |
).order_by(Message.timestamp.asc()).all()
|
| 96 |
+
return render_template('thread.html', thread=thread_obj, messages=messages)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 97 |
|
| 98 |
# Système de vote (upvote/downvote)
|
| 99 |
@app.route('/vote/<int:message_id>/<action>', methods=['POST'])
|
|
|
|
| 133 |
flash("Veuillez entrer un terme de recherche.", "error")
|
| 134 |
return redirect(url_for('index'))
|
| 135 |
threads = Thread.query.filter(Thread.title.ilike(f'%{query}%')).all()
|
|
|
|
| 136 |
messages = Message.query.filter(Message.content.ilike(f'%{query}%')).all()
|
| 137 |
return render_template('search.html', query=query, threads=threads, messages=messages)
|
| 138 |
|
|
|
|
| 177 |
if __name__ == '__main__':
|
| 178 |
with app.app_context():
|
| 179 |
db.create_all()
|
| 180 |
+
app.run(debug=True)
|