Reorganized account and commenting functions into different files

3 files changed, 6 insertions, 190 deletions

diff --git a/youtube/account_functions_.py b/youtube/accounts.py
index da53f99..a1865c0 100644
--- a/youtube/account_functions_.py
+++ b/youtube/accounts.py
@@ -1,10 +1,9 @@
-# Contains functions having to do with logging in or requiring that one is logged in
+# Contains functions having to do with logging in
 
 import urllib
 import json
-from youtube import common, proto, comments
+from youtube import common
 import re
-import traceback
 import settings
 import http.cookiejar
 
@@ -16,189 +15,6 @@ except FileNotFoundError:
     # global var for temporary storage of account info
     accounts = []
 
-def _post_comment(text, video_id, session_token, cookie):
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1',
-        'Accept': '*/*',
-        'Accept-Language': 'en-US,en;q=0.5',
-        'Accept-Encoding': 'gzip, deflate, br',
-        'X-YouTube-Client-Name': '2',
-        'X-YouTube-Client-Version': '2.20180823',
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Cookie': cookie,
-    }
-
-    comment_params = proto.string(2, video_id) + proto.nested(5, proto.uint(1, 0)) + proto.uint(10, 1)
-    comment_params = proto.percent_b64encode(comment_params).decode('ascii')
-
-    sej = json.dumps({"clickTrackingParams":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "commandMetadata":{"webCommandMetadata":{"url":"/service_ajax","sendPost":True}},"createCommentEndpoint":{"createCommentParams": comment_params}})
-
-    data_dict = {
-        'comment_text': text,
-        'sej': sej,
-        'session_token': session_token,
-    }
-    data = urllib.parse.urlencode(data_dict).encode()
-
-    req = urllib.request.Request("https://m.youtube.com/service_ajax?name=createCommentEndpoint", headers=headers, data=data)
-    response = urllib.request.urlopen(req, timeout = 5)
-    content = response.read()
-    content = common.decode_content(content, response.getheader('Content-Encoding', default='identity'))
-    code = json.loads(content)['code']
-    print("Comment posting code: " + code)
-    return code
-    '''with open('debug/post_comment_response', 'wb') as f:
-        f.write(content)'''
-
-
-def _post_comment_reply(text, video_id, parent_comment_id, session_token, cookie):
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1',
-        'Accept': '*/*',
-        'Accept-Language': 'en-US,en;q=0.5',
-        'Accept-Encoding': 'gzip, deflate, br',
-        'X-YouTube-Client-Name': '2',
-        'X-YouTube-Client-Version': '2.20180823',
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Cookie': cookie,
-    }
-
-    comment_params = proto.string(2, video_id) + proto.string(4, parent_comment_id) + proto.nested(5, proto.uint(1, 0)) + proto.uint(6,0) + proto.uint(10, 1)
-    comment_params = proto.percent_b64encode(comment_params).decode('ascii')
-
-    sej = json.dumps({"clickTrackingParams":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "commandMetadata":{"webCommandMetadata":{"url":"/service_ajax","sendPost":True}},"createCommentReplyEndpoint":{"createReplyParams": comment_params}})
-
-    data_dict = {
-        'comment_text': text,
-        'sej': sej,
-        'session_token': session_token,
-    }
-    data = urllib.parse.urlencode(data_dict).encode()
-
-    req = urllib.request.Request("https://m.youtube.com/service_ajax?name=createCommentReplyEndpoint", headers=headers, data=data)
-    response = urllib.request.urlopen(req, timeout = 5)
-    content = response.read()
-    content = common.decode_content(content, response.getheader('Content-Encoding', default='identity'))
-    code = json.loads(content)['code']
-    print("Comment posting code: " + code)
-    return code
-    '''with open('debug/post_comment_response', 'wb') as f:
-        f.write(content)'''
-
-def delete_comment(video_id, comment_id, author_id, session_token, cookie):
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1',
-        'Accept': '*/*',
-        'Accept-Language': 'en-US,en;q=0.5',
-        'Accept-Encoding': 'gzip, deflate, br',
-        'X-YouTube-Client-Name': '2',
-        'X-YouTube-Client-Version': '2.20180823',
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Cookie': cookie,
-    }
-    action = proto.uint(1,6) + proto.string(3, comment_id) + proto.string(5, video_id) + proto.string(9, author_id)
-    action = proto.percent_b64encode(action).decode('ascii')
-
-    sej = json.dumps({"clickTrackingParams":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=","commandMetadata":{"webCommandMetadata":{"url":"/service_ajax","sendPost":True}},"performCommentActionEndpoint":{"action":action}})
-
-    data_dict = {
-        'sej': sej,
-        'session_token': session_token,
-    }
-    data = urllib.parse.urlencode(data_dict).encode()
-
-    req = urllib.request.Request("https://m.youtube.com/service_ajax?name=performCommentActionEndpoint", headers=headers, data=data)
-    response = urllib.request.urlopen(req, timeout = 5)
-    content = response.read()
-
-xsrf_token_regex = re.compile(r'''XSRF_TOKEN"\s*:\s*"([\w-]*(?:=|%3D){0,2})"''')
-def post_comment(query_string, fields):
-    with open(os.path.join(settings.data_dir, 'cookie.txt'), 'r', encoding='utf-8') as f:
-        cookie_data = f.read()
-
-    parameters = urllib.parse.parse_qs(query_string)
-    try:
-        video_id = fields['video_id'][0]
-    except KeyError:
-        video_id = parameters['video_id'][0]
-
-    # Get session token for mobile
-    # youtube-dl uses disable_polymer=1 which uses a different request format which has an obfuscated javascript algorithm to generate a parameter called "bgr"
-    # Tokens retrieved from disable_polymer pages only work with that format. Tokens retrieved on mobile only work using mobile requests
-    # Additionally, tokens retrieved without sending the same cookie won't work. So this is necessary even if the bgr and stuff was reverse engineered.
-    headers = {'User-Agent': common.mobile_user_agent,
-    'Cookie': cookie_data,}
-    mobile_page = common.fetch_url('https://m.youtube.com/watch?v=' + video_id, headers, report_text="Retrieved session token for comment").decode()
-    match = xsrf_token_regex.search(mobile_page)
-    if match:
-        token = match.group(1).replace("%3D", "=")
-    else:
-        raise Exception("Couldn't find xsrf_token")
-
-    if 'parent_id' in parameters:
-        code = _post_comment_reply(fields['comment_text'][0], parameters['video_id'][0], parameters['parent_id'][0], token, cookie_data)
-        try:
-            response = comments.get_comments_page(query_string)
-        except socket.error as e:
-            traceback.print_tb(e.__traceback__)
-            return b'Refreshing comment page yielded error 502 Bad Gateway.\nPost comment status code: ' + code.encode('ascii')
-        except Exception as e:
-            traceback.print_tb(e.__traceback__)
-            return b'Refreshing comment page yielded error 500 Internal Server Error.\nPost comment status code: ' + code.encode('ascii')
-        return response
-    else:
-        code = _post_comment(fields['comment_text'][0], fields['video_id'][0], token, cookie_data)
-        try:
-            response = comments.get_comments_page('ctoken=' + comments.make_comment_ctoken(video_id, sort=1))
-        except socket.error as e:
-            traceback.print_tb(e.__traceback__)
-            return b'Refreshing comment page yielded error 502 Bad Gateway.\nPost comment status code: ' + code.encode('ascii')
-        except Exception as e:
-            traceback.print_tb(e.__traceback__)
-            return b'Refreshing comment page yielded error 500 Internal Server Error.\nPost comment status code: ' + code.encode('ascii')
-        return response
-
-def get_post_comment_page(query_string):
-    parameters = urllib.parse.parse_qs(query_string)
-    video_id = parameters['video_id'][0]
-    parent_id = common.default_multi_get(parameters, 'parent_id', 0, default='')
-    
-    style = ''' main{
-    display: grid;
-    grid-template-columns: 3fr 2fr;
-}
-.left{
-    display:grid;
-    grid-template-columns: 1fr 640px;
-}
-textarea{
-    width: 460px;
-    height: 85px;
-}
-.comment-form{
-    grid-column:2;
-}'''
-    if parent_id:   # comment reply
-        comment_box = comments.comment_box_template.substitute(
-            form_action = common.URL_ORIGIN + '/comments?parent_id=' + parent_id + "&video_id=" + video_id,
-            video_id_input = '',
-            post_text = "Post reply",
-        )
-    else:
-        comment_box = comments.comment_box_template.substitute(
-            form_action = common.URL_ORIGIN + '/comments?ctoken=' + comments.make_comment_ctoken(video_id, sort=1).replace("=", "%3D"),
-            video_id_input = '''<input type="hidden" name="video_id" value="''' + video_id + '''">''',
-            post_text = "Post comment",
-        )
-        
-    page = '''<div class="left">\n''' + comment_box + '''</div>\n'''
-    return common.yt_basic_template.substitute(
-        page_title = "Post comment reply" if parent_id else "Post a comment",
-        style = style,
-        header = common.get_header(),
-        page = page,
-    )
-
 def save_accounts():
     to_save = list(account for account in accounts if account['save'])
     with open(os.path.join(settings.data_dir, 'accounts.txt'), 'w', encoding='utf-8') as f:
diff --git a/youtube/account_functions.py b/youtube/post_comment.py
index 22346e4..35b1e43 100644
--- a/youtube/account_functions.py
+++ b/youtube/post_comment.py
@@ -1,4 +1,4 @@
-# Contains functions having to do with logging in or requiring that one is logged in
+# Contains functions having to do with posting/editing/deleting comments
 
 import urllib
 import json
diff --git a/youtube/youtube.py b/youtube/youtube.py
index eb319e1..f49e6cf 100644
--- a/youtube/youtube.py
+++ b/youtube/youtube.py
@@ -1,7 +1,7 @@
 import mimetypes
 import urllib.parse
 import os
-from youtube import local_playlist, watch, search, playlist, channel, comments, common, account_functions
+from youtube import local_playlist, watch, search, playlist, channel, comments, common, post_comment
 import settings
 YOUTUBE_FILES = (
     "/shared.css",
@@ -66,7 +66,7 @@ def youtube(env, start_response):
 
         elif path == "/post_comment":
             start_response('200 OK',  () )
-            return account_functions.get_post_comment_page(query_string).encode()
+            return post_comment.get_post_comment_page(query_string).encode()
 
         elif path == "/opensearch.xml":
             with open("youtube" + path, 'rb') as f:
@@ -101,7 +101,7 @@ def youtube(env, start_response):
 
         elif path in ("/post_comment", "/comments"):
             parameters = urllib.parse.parse_qs(query_string)
-            account_functions.post_comment(parameters, fields)
+            post_comment.post_comment(parameters, fields)
             if 'parent_id' in parameters:
                 start_response('303 See Other',  (('Location', common.URL_ORIGIN + '/comments?' + query_string),) )
             else: