diff --git a/assets/settings.js b/assets/settings.js index 1622ecc..3b400ec 100644 --- a/assets/settings.js +++ b/assets/settings.js @@ -1,5 +1,4 @@ import Banner from '../components/Banner.html'; -import ArchiveForm from '../components/ArchiveForm.html'; import {known_load, known_save} from './known_instances.js' (function settings_init(){ @@ -195,19 +194,6 @@ import {known_load, known_save} from './known_instances.js' }) } - let archive_form_el = document.querySelector('#archive-form'); - if(archive_form_el){ - let csrf_token = archive_form_el.querySelector('input[name=csrf-token]').value; - let archive_form = new ArchiveForm({ - target: archive_form_el, - hydrate: true, - data: { - action: archive_form_el.action, - csrf_token: csrf_token, - }, - }) - } - function bump_instance(instance_name){ let known_instances = known_load(); let found = false; diff --git a/components/ArchiveForm.html b/components/ArchiveForm.html deleted file mode 100644 index e4bd236..0000000 --- a/components/ArchiveForm.html +++ /dev/null @@ -1,38 +0,0 @@ -
- {#if file_too_big} - - {/if} - - - -
- - diff --git a/routes/__init__.py b/routes/__init__.py index 6323712..bfa2976 100644 --- a/routes/__init__.py +++ b/routes/__init__.py @@ -93,38 +93,9 @@ def twitter_login_step2(): url_for('about', twitter_login_error='', _anchor='log_in')) -class TweetArchiveEmptyException(Exception): - pass - - @app.route('/upload_tweet_archive', methods=('POST',)) -@require_auth def upload_tweet_archive(): - ta = TwitterArchive( - account=g.viewer.account, - body=request.files['file'].read()) - db.session.add(ta) - db.session.commit() - - try: - files = libforget.twitter.chunk_twitter_archive(ta.id) - - ta.chunks = len(files) - db.session.commit() - - if not ta.chunks > 0: - raise TweetArchiveEmptyException() - - for filename in files: - tasks.import_twitter_archive_month.s(ta.id, filename).apply_async() - - return redirect(url_for('index', _anchor='recent_archives')) - except (BadZipFile, TweetArchiveEmptyException): - if sentry: - sentry.captureException() - return redirect( - url_for('index', tweet_archive_failed='', - _anchor='tweet_archive_import')) + return 403, 'Tweet archive support is temporarily disabled, see banner on the front page.' @app.route('/settings', methods=('POST',)) diff --git a/templates/logged_in.html b/templates/logged_in.html index 616337f..8a3e948 100644 --- a/templates/logged_in.html +++ b/templates/logged_in.html @@ -148,8 +148,10 @@ {% endif %} + +
- +