Revert "added time check for alert sending. cleanup. set sitemap"

This reverts commit 661d6c7.

hasjob/jobs/job_alerts.py

@@ -24,9 +24,6 @@ def send_email_alerts():
             # Alert was sent recently, break out of loop
             break
 
-        if not subscription.is_right_time_to_send_alert():
-            break
-
         unseen_posts = get_unseen_posts(subscription)
         if not unseen_posts:
             # Nothing new to see, break out of loop

hasjob/views/admin_filterset.py

@@ -26,7 +26,7 @@ def new(self):
 
         form = FiltersetForm(parent=g.board)
         if form.validate_on_submit():
-            filterset = Filterset(board=g.board, title=form.title.data, sitemap=True)
+            filterset = Filterset(board=g.board, title=form.title.data)
             form.populate_obj(filterset)
             try:
                 db.session.add(filterset)

hasjob/views/job_alerts.py

@@ -65,12 +65,12 @@ def subscribe_to_job_alerts():
 @app.route('/confirm_subscription_to_job_alerts', subdomain='<subdomain>')
 @app.route('/confirm_subscription_to_job_alerts')
 def confirm_subscription_to_job_alerts():
-    subscription = JobPostSubscription.query.filter_by(email_verify_key=request.args.get('token')).one_or_none()
-    if not subscription:
+    sub = JobPostSubscription.query.filter_by(email_verify_key=request.args.get('token')).one_or_none()
+    if not sub:
         abort(404)
-    if subscription.email_verified_at:
+    if sub.email_verified_at:
         abort(400)
-    subscription.verify_email()
+    sub.verify_email()
     db.session.commit()
     flash(_(u"You've just subscribed to receive alerts from us! We'll keep you posted."), 'success')
     return redirect(url_for('index'), code=302)
@@ -79,12 +79,12 @@ def confirm_subscription_to_job_alerts():
 @app.route('/unsubscribe_from_job_alerts', subdomain='<subdomain>')
 @app.route('/unsubscribe_from_job_alerts')
 def unsubscribe_from_job_alerts():
-    subscription = JobPostSubscription.query.filter_by(unsubscribe_key=request.args.get('token')).one_or_none()
-    if not subscription:
+    sub = JobPostSubscription.query.filter_by(unsubscribe_key=request.args.get('token')).one_or_none()
+    if not sub:
         abort(404)
-    if not subscription.email_verified_at:
+    if not sub.email_verified_at:
         abort(400)
-    subscription.unsubscribe()
+    sub.unsubscribe()
     db.session.commit()
     flash(_(u"You've just unsubscribed from receiving alerts! Hope they were useful."), 'success')
     return redirect(url_for('index'), code=302)