kavin/Yotter
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add cited tweets to user feeds

Browse Source
This commit is contained in:
pluja 2020-09-01 21:03:51 +02:00
parent 12895b2eb0
commit 38746cc0d3
32 changed files with 139 additions and 60111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

78
app/routes.py
View File

@ -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)))
posts = []
feedPosts = []
#Gather profile info.
rssFeed = feedparser.parse('{instance}{user}/rss'.format(instance=NITTERINSTANCE, user=account))
#Gather posts
if rssFeed.entries != []:
for post in rssFeed.entries:
rssFeed = urllib.request.urlopen('{instance}{user}'.format(instance=NITTERINSTANCE, user=account)).read()
#Gather feedPosts
res = rssFeed.decode('utf-8')
html = BeautifulSoup(res, "html.parser")
userFeed = html.find_all('div', attrs={'class':'timeline-item'})
if userFeed != []:
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 >=8:
continue
if post.find('div', attrs={'class':'pinned'}):
if post.find('div', attrs={'class':'pinned'}).find('span', attrs={'icon-pin'}):
continue
newPost = twitterPost()
newPost.username = rssFeed.feed.title.split("/")[1].replace(" ", "")
newPost.twitterName = rssFeed.feed.title.split("/")[0]
newPost.date = getTimeDiff(post.published_parsed)
newPost.timeStamp = datetime.datetime(*post.published_parsed[:6])
newPost.op = post.author
try:
newPost.userProfilePic = rssFeed.channel.image.url
except:
newPost.profilePicture = ""
newPost.url = post.link
newPost.content = Markup(post.description)
newPost.op = post.find('a', attrs={'class':'username'}).text
newPost.twitterName = post.find('a', attrs={'class':'fullname'}).text
newPost.timeStamp = datetime.datetime.strptime(date_time_str, '%d/%m/%Y %H:%M:%S')
newPost.date = post.find('span', attrs={'class':'tweet-date'}).find('a').text
newPost.content = Markup(post.find('div', attrs={'class':'tweet-content'}))
if "Pinned" in post.title.split(":")[0]:
newPost.isPinned = True
if "RT by" in post.title:
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
newPost.profilePic = ""
else:
newPost.username = newPost.op
newPost.isRT = False
try:
newPost.profilePic = rssFeed.channel.image.url
except:
newPost.profilePic = avatarPath
posts.append(newPost)
return posts
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()

BIN
app/static/favicon_io.zip Normal file
View File

Binary file not shown.

BIN
app/static/favicons/android-chrome-192x192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/static/favicons/android-chrome-512x512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
app/static/favicons/apple-touch-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/static/favicons/favicon-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 746 B

BIN
app/static/favicons/favicon-32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/static/favicons/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

1
app/static/favicons/site.webmanifest Normal file
View File

@ -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"}

22
app/static/semantic/LICENSE
View File

@ -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.

7
app/static/semantic/README.md
View File

@ -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)

20
app/static/semantic/package.json
View File

@ -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.*"
}
}

1
app/static/video-js.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

27
app/static/video.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1663
app/static/videojs.css
View File

File diff suppressed because one or more lines are too long

58346
app/static/videojs.js
View File

File diff suppressed because it is too large Load Diff

2
app/templates/404.html
View File

@ -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>

2
app/templates/405.html
View File

@ -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>

2
app/templates/500.html
View File

@ -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>

2
app/templates/_closed_registrations.html
View File

@ -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">

2
app/templates/_empty_feed.html
View File

@ -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">

2
app/templates/_post_saved.html
View File

@ -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">

6
app/templates/_twitter_post.html
View File

@ -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>

2
app/templates/_video_item.html
View File

@ -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>

9
app/templates/base.html
View File

@ -8,14 +8,17 @@
{% else %}
<title>Yotter</title>
{% endif %}
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='semantic/semantic.min.css') }}">
<meta name="viewport" content="width=device-width">
<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>

2
app/templates/channel.html
View File

@ -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">

36
app/templates/home.html
View File

@ -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">

2
app/templates/search.html
View File

@ -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>

2
app/templates/user.html
View File

@ -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%}

4
app/templates/video.html
View File

@ -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 %}

2
app/templates/ytsearch.html
View File

@ -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">