Merge branch 'beta' into dev

route/api_topic_sub.py

@@ -32,6 +32,22 @@ def api_topic_sub_2(conn, topic_num):
         ip_a_2 = ip_pas([i[3] for i in data], 1)
         for i in data:
             data_v = i[1] if i[4] != 'O' or admin == 1 else ''
+            
+            data_r = render_set(data = data_v, num = 2, include = 'topic_' + i[0], acl = get_acl)
+            data_r_html = data_r[0]
+            data_r_js = data_r[1]
+            
+            data_r_html = re.sub(
+                r'<topic_a>((?:(?!<\/topic_a>).)+)<\/topic_a>', 
+                '<a href="\g<1>">\g<1></a>', 
+                data_r_html
+            )
+            data_r_html = re.sub(
+                r'&lt;topic_call&gt;@((?:(?!&lt;\/topic_call&gt;).)+)&lt;\/topic_call&gt;', 
+                '<a href="/w/user:\g<1>">@\g<1></a>', 
+                data_r_html
+            )
+            
             data_a[i[0]] = {
                 "data" : data_v,
                 "date" : i[2],