Fix DeviantArt tags.

src/description.py

@@ -221,6 +221,10 @@ def parse_description(description, uploading_to) -> str:
                     new_text = '<a href="https://{1}.tumblr.com/">{0}</a>'.format(
                         username, username.lower()
                     )
+                elif linking_to == 100:
+                    new_text = '<a href="https://twitter.com/{0}">{0}</a>'.format(username)
+                elif linking_to == 101:
+                    new_text = '<a href="{0}">{1}</a>'.format(masto_link, username)
 
         description = description[0:start] + new_text + description[end:]
 

src/routes/api.py

@@ -1,4 +1,5 @@
 from typing import List
+import json
 
 import requests
 from flask import Blueprint, Response, g, jsonify, request, session
@@ -7,7 +8,7 @@ import simplecrypt
 from cache import cache
 from constant import HEADERS, Sites
 from description import parse_description
-from models import Account, SavedTemplate, db
+from models import Account, SavedTemplate, SavedSubmission, User, db
 from simplecrypt import decrypt
 from sites.deviantart import DeviantArt
 from sites.known import known_list
@@ -27,9 +28,14 @@ def sites():
 
 
 @app.route('/whoami')
-@login_required
 def whoami():
-    return jsonify({'id': g.user.id, 'username': g.user.username})
+    session_id = session.get('id')
+    if session_id:
+        user: User = User.query.get(session['id'])
+        if user:
+            return jsonify({'id': user.id, 'username': user.username})
+
+    return jsonify({'id': None, 'username': None})
 
 
 @app.route('/accounts')
@@ -49,6 +55,28 @@ def accounts():
     return jsonify({'accounts': accts})
 
 
+@app.route('/submissions')
+@login_required
+def submissions():
+    subs = SavedSubmission.query.filter_by(user_id=g.user.id).all()
+
+    subs = list(map(lambda sub: {
+        'id': sub.id,
+        'title': sub.title,
+        'description': sub.description,
+        'tags': sub.tags,
+        'original_filename': sub.original_filename,
+        'image_filename': sub.image_filename,
+        'image_mimetype': sub.image_mimetype,
+        'account_ids': sub.account_ids,
+        'site_data': json.loads(sub.site_data),
+        'group_id': sub.group_id,
+        'master': sub.master,
+    }, subs))
+
+    return jsonify(subs)
+
+
 @app.route('/description', methods=['POST'])
 @login_required
 def description():

src/sites/deviantart.py

@@ -141,8 +141,6 @@ class DeviantArt(Site):
     def submit_artwork(self, submission: Submission, extra: Any = None) -> str:
         da = self.get_da()
 
-
-
         r = da.refresh_token(self.credentials)
         self.account.update_credentials(r['refresh_token'])
         db.session.commit()
@@ -150,6 +148,10 @@ class DeviantArt(Site):
         if r['status'] != 'success':
             raise BadCredentials()
 
+        tags = {}
+        for idx, tag in enumerate(submission.tags):
+            tags['tags[{idx}]'.format(idx=idx)] = tag
+
         sub = requests.post(
             'https://www.deviantart.com/api/v1/oauth2/stash/submit',
             headers=HEADERS,
@@ -157,7 +159,7 @@ class DeviantArt(Site):
                 'access_token': r['access_token'],
                 'title': submission.title,
                 'artist_comments': submission.description_for_site(self.SITE),
-                'tags': self.tag_str(submission.tags),
+                **tags,
             },
             files={'image': submission.get_image()},
         ).json()