Add cited tweets to user feeds

app/routes.py

@@ -553,7 +553,7 @@ def getFeed(urls):
                     for post in userFeed[:-1]:
                         date_time_str = post.find('span', attrs={'class':'tweet-date'}).find('a')['title'].replace(",","")
                         time = datetime.datetime.now() - datetime.datetime.strptime(date_time_str, '%d/%m/%Y %H:%M:%S')
-                        if time.days >= 11:
+                        if time.days >=8:
                             continue
 
                         if post.find('div', attrs={'class':'pinned'}):
@@ -596,41 +596,59 @@ def getFeed(urls):
     return feedPosts
 
 def getPosts(account):
-    avatarPath = "img/avatars/{}.png".format(str(random.randint(1,12)))
+    feedPosts = []
-    posts = []
         
     #Gather profile info.
-    rssFeed = feedparser.parse('{instance}{user}/rss'.format(instance=NITTERINSTANCE, user=account))
+    rssFeed = urllib.request.urlopen('{instance}{user}'.format(instance=NITTERINSTANCE, user=account)).read()
-    #Gather posts
+    #Gather feedPosts
-    if rssFeed.entries != []:
+    res = rssFeed.decode('utf-8')
-        for post in rssFeed.entries:
+    html = BeautifulSoup(res, "html.parser")
-            newPost = twitterPost()
+    userFeed = html.find_all('div', attrs={'class':'timeline-item'})
-            newPost.username = rssFeed.feed.title.split("/")[1].replace(" ", "")
+    if userFeed != []:
-            newPost.twitterName = rssFeed.feed.title.split("/")[0]
+            for post in userFeed[:-1]:
-            newPost.date = getTimeDiff(post.published_parsed)
+                date_time_str = post.find('span', attrs={'class':'tweet-date'}).find('a')['title'].replace(",","")
-            newPost.timeStamp = datetime.datetime(*post.published_parsed[:6])
+                time = datetime.datetime.now() - datetime.datetime.strptime(date_time_str, '%d/%m/%Y %H:%M:%S')
-            newPost.op = post.author
+                if time.days >=8:
-            try:
+                    continue
-                newPost.userProfilePic = rssFeed.channel.image.url
-            except:
-                newPost.profilePicture = ""
-            newPost.url = post.link
-            newPost.content = Markup(post.description)
-            
-            if "Pinned" in post.title.split(":")[0]:
-                newPost.isPinned = True
 
-            if "RT by" in post.title:
+                if post.find('div', attrs={'class':'pinned'}):
-                newPost.isRT = True
+                    if post.find('div', attrs={'class':'pinned'}).find('span', attrs={'icon-pin'}):
-                newPost.profilePic = ""
+                        continue
-            else:
+
-                newPost.isRT = False
+                newPost = twitterPost()
-                try:
+                newPost.op = post.find('a', attrs={'class':'username'}).text
-                    newPost.profilePic = rssFeed.channel.image.url
+                newPost.twitterName = post.find('a', attrs={'class':'fullname'}).text
-                except:
+                newPost.timeStamp = datetime.datetime.strptime(date_time_str, '%d/%m/%Y %H:%M:%S')
-                    newPost.profilePic = avatarPath
+                newPost.date = post.find('span', attrs={'class':'tweet-date'}).find('a').text
-            posts.append(newPost)
+                newPost.content = Markup(post.find('div',  attrs={'class':'tweet-content'}))
-    return posts
+                
+                if post.find('div', attrs={'class':'retweet-header'}):
+                    newPost.username = post.find('div', attrs={'class':'retweet-header'}).find('div', attrs={'class':'icon-container'}).text
+                    newPost.isRT = True
+                else:
+                    newPost.username = newPost.op
+                    newPost.isRT = False
+                
+                newPost.profilePic = NITTERINSTANCE+post.find('a', attrs={'class':'tweet-avatar'}).find('img')['src'][1:]
+                newPost.url = NITTERINSTANCE + post.find('a', attrs={'class':'tweet-link'})['href'][1:]
+                if post.find('div', attrs={'class':'quote'}):
+                    newPost.isReply = True
+                    quote = post.find('div', attrs={'class':'quote'})
+                    if quote.find('div',  attrs={'class':'quote-text'}):
+                        newPost.replyingTweetContent = Markup(quote.find('div',  attrs={'class':'quote-text'}))
+                        
+                    if quote.find('a', attrs={'class':'still-image'}):
+                        newPost.replyAttachedImg = NITTERINSTANCE+quote.find('a', attrs={'class':'still-image'})['href'][1:]
+                    
+                    newPost.replyingUser=quote.find('a',  attrs={'class':'username'}).text
+                    post.find('div', attrs={'class':'quote'}).decompose()
+
+                if post.find('div',  attrs={'class':'attachments'}):
+                    if not post.find(class_='quote'):
+                        if  post.find('div',  attrs={'class':'attachments'}).find('a', attrs={'class':'still-image'}):
+                            newPost.attachedImg = NITTERINSTANCE + post.find('div',  attrs={'class':'attachments'}).find('a')['href'][1:]
+                feedPosts.append(newPost)
+    return feedPosts
 
 def getYoutubePosts(ids):
     videos = []
@@ -642,7 +660,7 @@ def getYoutubePosts(ids):
             for vid in rssFeed.entries:
                 time = datetime.datetime.now() - datetime.datetime(*vid.published_parsed[:6])
 
-                if time.days >= 15:
+                if time.days >=8:
                     continue
                 
                 video = ytPost()

app/static/favicons/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

app/static/semantic/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Semantic Org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

app/static/semantic/README.md

@@ -1,7 +0,0 @@
-# CSS  Distribution
-
-This repository is automatically synced with the main [Semantic UI](https://github.com/Semantic-Org/Semantic-UI) repository to provide lightweight CSS only version of Semantic UI.
-
-This package **does not support theming** and includes generated CSS files of the default theme only.
-
-You can view more on Semantic UI at [LearnSemantic.com](http://www.learnsemantic.com) and [Semantic-UI.com](http://www.semantic-ui.com)

app/static/semantic/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "semantic-ui-css",
-  "version": "2.4.1",
-  "title": "Semantic UI",
-  "description": "CSS Only distribution of Semantic UI",
-  "homepage": "http://www.semantic-ui.com",
-  "author": "Jack Lukic <jack@semantic-ui.com>",
-  "license": "MIT",
-  "main": "semantic.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/Semantic-Org/Semantic-UI-CSS.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Semantic-Org/Semantic-UI/issues"
-  },
-  "dependencies": {
-    "jquery": "x.*"
-  }
-}

app/templates/404.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div style="margin-top: 2em;" class="ui one column centered grid">
-        <img class="ui medium circular image" src="{{ url_for('static',filename='img/404.png') }}">
+        <img alt="Error 404 Image" class="ui medium circular image" src="{{ url_for('static',filename='img/404.png') }}">
     </div>
     <div style="margin: 1.5em;" class="ui one column centered grid">
         <h2 class="ui header">This page is not on the map.</h2>

app/templates/405.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div style="margin-top: 2em;" class="ui one column centered grid">
-        <img class="ui medium circular image" src="{{ url_for('static',filename='img/405.png') }}">
+        <img alt="Error 405 Image" class="ui medium circular image" src="{{ url_for('static',filename='img/405.png') }}">
     </div>
     <div style="margin: 1.5em;" class="ui one column centered grid">
         <h2 class="ui header">You are not allowed to do this!</h2>

app/templates/500.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div style="margin-top: 2em;" class="ui one column centered grid">
-        <img class="ui medium circular image" src="{{ url_for('static',filename='img/500.png') }}">
+        <img alt="Error 500 Image" class="ui medium circular image" src="{{ url_for('static',filename='img/500.png') }}">
     </div>
     <div style="margin: 1.5em;" class="ui one column centered grid">
         <h2 class="ui header">Something went wrong... But it's not your fault!</h2>

app/templates/_closed_registrations.html

@@ -1,6 +1,6 @@
 <div class="ui center aligned text container">
     <div class="ui row">
-        <img class="ui image" src="{{ url_for('static',filename='img/closed.png') }}">
+        <img alt="Closed registrations image" class="ui image" src="{{ url_for('static',filename='img/closed.png') }}">
     </div>
 
     <div class="ui row">

app/templates/_empty_feed.html

@@ -1,6 +1,6 @@
 <div class="ui center aligned text container">
     <div class="ui row">
-        <img class="ui image" src="{{ url_for('static',filename='img/empty.png') }}">
+        <img alt="Empty feed image" class="ui image" src="{{ url_for('static',filename='img/empty.png') }}">
     </div>
 
     <div class="ui row">

app/templates/_post_saved.html

@@ -3,7 +3,7 @@
         <div class="content">
             <div class="extra content">
                 <div class="left floated author">
-                    <img class="ui avatar image" src="{{ url_for('static',filename='img/avatars/')}}{{range(1, 12) | random}}.png">
+                    <img alt="Avatar random" class="ui avatar image" src="{{ url_for('static',filename='img/avatars/')}}{{range(1, 12) | random}}.png">
                 </div>
 
                 <a href="{{post.url}}"><span class="right floated star">

app/templates/_twitter_post.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="extra content">
             <div class="left floated author">
-                <img class="ui avatar image" src="{{ post.profilePic }}">
+                <img alt="Avatar" class="ui avatar image" src="{{ post.profilePic }}">
             </div>
             
             <a href="{{post.url}}"><span class="right floated star">
@@ -24,7 +24,7 @@
         </div>
         <div class="extra content">
             {% if post.attachedImg != "" %}
-                <img class="ui centered medium image" src="{{post.attachedImg}}">
+                <img alt="Image attachment" class="ui centered medium image" src="{{post.attachedImg}}">
             {% endif %}
             {% if post.isReply %}
                 <div class="ui card">
@@ -34,7 +34,7 @@
                         <div class="description break-word">
                         {{post.replyingTweetContent}}
                         {% if post.replyAttachedImg != "" %}
-                            <img class="ui centered medium image" src="{{post.replyAttachedImg}}">
+                            <img alt="Image attachment" class="ui centered medium image" src="{{post.replyAttachedImg}}">
                         {% endif %}
                         </div>
                     </div>

app/templates/_video_item.html

@@ -1,6 +1,6 @@
 <div class="card">
     <div class="image">
-        <img src="{{video.videoThumb}}">
+        <img alt="Thumbnail" src="{{video.videoThumb}}">
     </div>
     <div class="content">
         <a class="video-title break-word" href="{{url_for('watch', v=video.id, _method='GET')}}">{{video.videoTitle}}</a>

app/templates/base.html

@@ -8,14 +8,17 @@
         {% else %}
         <title>Yotter</title>
         {% endif %}
-        <meta name="viewport" content="width=device-width, user-scalable=no">
+        <meta name="viewport" content="width=device-width">
-        <link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='semantic/semantic.min.css') }}">
+        <link rel="preload" as= "style" type= "text/css" href= "{{ url_for('static',filename='semantic/semantic.min.css') }}">
         <link rel="stylesheet" type= "text/css" href="{{ url_for('static',filename='styles.css') }}">
+        <link rel="icon" href="{{ url_for('static',filename='favicons/favicon.ico') }}">
+
+        <link rel="stylesheet"href= "{{ url_for('static',filename='semantic/semantic.min.css') }}">
     </head>
     <body>
         <div class="ui icon menu overflow-auto">
             <a href="{{ url_for('index') }}"><div class="item">
-                <img src="{{ url_for('static',filename='img/logo_simple.png') }}">
+                <img alt="Yotter simple logo" src="{{ url_for('static',filename='img/logo_simple.png') }}">
             </div></a>
             {% if current_user.is_anonymous %}
             <a href="{{ url_for('login') }}" class="item">Login</a>

app/templates/channel.html

@@ -4,7 +4,7 @@
     <div class="blue ui centered card">
         <div class="content">
             <div class="center aligned author">
-                <img class="ui avatar image" src="{{channel.avatar}}">
+                <img alt="Avatar" class="ui avatar image" src="{{channel.avatar}}">
             </div>
             <div class="center aligned header"><a href="">{{channel.name}}</a></div>
             <div class="center aligned description">

app/templates/home.html

@@ -1,6 +1,42 @@
 {% extends "base.html" %}
 {% block content %}
 
+<style>
+    .ui.button {
+        cursor: pointer;
+        display: inline-block;
+        min-height: 1em;
+        outline: none;
+        border: none;
+        vertical-align: baseline;
+        background: #E0E1E2 none;
+        color: rgba(0, 0, 0, 0.6);
+        font-family: 'Lato', 'Helvsetica Neue', Arial, Helvetica, sans-serif;
+        margin: 0em 0.25em 0em 0em;
+        padding: 0.78571429em 1.5em 0.78571429em;
+        text-transform: none;
+        text-shadow: none;
+        font-weight: bold;
+        line-height: 1em;
+        font-style: normal;
+        text-align: center;
+        text-decoration: none;
+        border-radius: 0.28571429rem;
+        -webkit-box-shadow: 0px 0px 0px 1px transparent inset, 0px 0em 0px 0px rgba(34, 36, 38, 0.15) inset;
+        box-shadow: 0px 0px 0px 1px transparent inset, 0px 0em 0px 0px rgba(34, 36, 38, 0.15) inset;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -webkit-transition: opacity 0.1s ease, background-color 0.1s ease, color 0.1s ease, background 0.1s ease, -webkit-box-shadow 0.1s ease;
+        transition: opacity 0.1s ease, background-color 0.1s ease, color 0.1s ease, background 0.1s ease, -webkit-box-shadow 0.1s ease;
+        transition: opacity 0.1s ease, background-color 0.1s ease, color 0.1s ease, box-shadow 0.1s ease, background 0.1s ease;
+        transition: opacity 0.1s ease, background-color 0.1s ease, color 0.1s ease, box-shadow 0.1s ease, background 0.1s ease, -webkit-box-shadow 0.1s ease;
+        will-change: '';
+        -webkit-tap-highlight-color: transparent;
+    }
+</style>
+
 <div style="margin: 2em" class="ui one column centered grid">
     <div class="row">
         <div class="column">

app/templates/search.html

@@ -18,7 +18,7 @@
         <div class="ui relaxed divided list">
             {% for res in results %}
             <div class="item">
-              <img class="ui avatar image" src="{{ res.avatar }}">
+              <img alt="Avatar" class="ui avatar image" src="{{ res.avatar }}">
               <div class="content">
                 {% if res.fullName|length > 20%}
                     <a class="header" href="/u/{{res.username}}">{{res.fullName[0:23]}}...</a>

app/templates/user.html

@@ -4,7 +4,7 @@
     <div class="blue ui centered card">
         <div class="content">
             <div class="center aligned author">
-                <img class="ui avatar image" src="{{user.profilePic}}">
+                <img alt="Profile picture" class="ui avatar image" src="{{user.profilePic}}">
             </div>
             <div class="center aligned header"><a href="https://nitter.net/{{ user.profileUsername.replace('@','') }}">
                 {%if user.profileFullName%}

app/templates/video.html

@@ -1,5 +1,5 @@
 <head>
-    <link rel="stylesheet" type= "text/css" href="{{ url_for('static',filename='videojs.css') }}">
+    <link rel="stylesheet" type= "text/css" href="{{ url_for('static',filename='video-js.min.css') }}">
 </head>
 {% extends "base.html" %}
 {% block content %}
@@ -46,5 +46,5 @@
           </div>
       </div>
 </div>
-<script src="{{ url_for('static',filename='videojs.js') }}"></script>
+<script src="{{ url_for('static',filename='video.min.js') }}"></script>
 {% endblock %}

app/templates/ytsearch.html

@@ -37,7 +37,7 @@
                                 </p>
                             {% endif %}
                         </div>
-                        <img class="ui avatar image" src="{{ res.thumbnail }}">
+                        <img alt="Avatar" class="ui avatar image" src="{{ res.thumbnail }}">
                         <div class="content">
                             <a class = "header" href="{{ url_for('channel', id=res.channelId)}}">{{res.username}}</a>
                             <div class="description"><div class="ui label">