ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

New profile stuff

Browse source
This commit is contained in:
Steffo 2018-06-05 10:34:59 +02:00
parent 117d2404df
commit 629317996b
9 changed files with 249 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
db.py
View file

@ -92,9 +92,10 @@ class Steam(Base):
royal = relationship("Royal", lazy="joined")
steam_id = Column(String, primary_key=True)
persona_name = Column(String, nullable=False)
avatar_hex = Column(String, nullable=False)
persona_name = Column(String)
avatar_hex = Column(String)
trade_token = Column(String)
most_played_game_id = Column(BigInteger)
def __repr__(self):
return f"<Steam {self.steam_id}>"
@ -105,6 +106,9 @@ class Steam(Base):
else:
return self.steam_id
def most_played_game_url(self):
return f"https://steamcdn-a.akamaihd.net/steam/apps/{self.most_played_game_id}/header.jpg"
def avatar_url(self):
return f"https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/{self.avatar_hex[0:2]}/{self.avatar_hex}.jpg"
@ -151,7 +155,15 @@ class Steam(Base):
j = r.json()
self.persona_name = j["response"]["players"][0]["personaname"]
self.avatar_hex = re.search(r"https://steamcdn-a\.akamaihd\.net/steamcommunity/public/images/avatars/../(.+).jpg", j["response"]["players"][0]["avatar"]).group(1)
r = requests.get(f"http://api.steampowered.com/IPlayerService/GetRecentlyPlayedGames/v0001/?key={config['Steam']['api_key']}&steamid={self.steam_id}&format=json")
if r.status_code != 200:
raise RequestError(f"Steam returned {r.status_code}")
j = r.json()
if "response" not in j \
or "games" not in j["response"] \
or len(j["response"]["games"]) < 1:
raise RequestError(f"Game data is private")
self.most_played_game_id = j["response"]["games"][0]["appid"]
class RocketLeague(Base):
__tablename__ = "rocketleague"

150
static/nryg.less
View file

@ -48,6 +48,30 @@ input[type="text"], input[type="password"] {
border-radius: 10px;
margin: 4px;
position: relative;
.game-title {
grid-row: 2;
font-size: smaller;
}
.game-score {
grid-row: 3;
}
.player {
grid-row: 1;
font-size: large;
a {
text-decoration: none;
}
.player-image {
width: 32px;
height: 32px;
vertical-align: middle;
}
}
}
.osu {
@ -82,17 +106,9 @@ input[type="text"], input[type="password"] {
grid-row: 1;
grid-column-start: 1;
grid-column-end: 4;
font-size: large;
a {
text-decoration: none;
}
.player-image {
width: 32px;
height: 32px;
border-radius: 16px;
vertical-align: middle;
}
.player-name {
@ -101,15 +117,9 @@ input[type="text"], input[type="password"] {
}
.game-title {
grid-row: 2;
font-size: smaller;
font-style: normal;
}
.game-score {
grid-row: 3;
}
.standard {
grid-column: 1;
}
@ -145,40 +155,22 @@ input[type="text"], input[type="password"] {
grid-row: 1;
grid-column-start: 1;
grid-column-end: 4;
font-size: large;
a {
text-decoration: none;
}
.player-image {
width: 32px;
height: 32px;
vertical-align: middle;
}
.player-name {
vertical-align: middle;
color: #ffffff;
}
}
.game-title {
grid-row: 2;
font-size: smaller;
text-align: center;
color: #41abfa;
}
.game-score {
grid-row: 3;
img {
.game-score img {
height: 36px;
display: block;
margin: auto;
}
}
.duel {
grid-column: 1;
@ -210,30 +202,13 @@ input[type="text"], input[type="password"] {
grid-row: 1;
grid-column-start: 1;
grid-column-end: 3;
font-size: large;
a {
text-decoration: none;
}
.player-image {
width: 32px;
height: 32px;
vertical-align: middle;
}
.player-name {
color: #ffffff;
}
}
.title {
grid-row: 2;
font-size: x-small;
}
.number {
grid-row: 3;
.game-score.wins {
font-size: x-large;
}
@ -242,10 +217,6 @@ input[type="text"], input[type="password"] {
text-align: center;
}
.wins.number {
color: #ffb600;
}
.rank {
grid-column: 2;
grid-row-start: 2;
@ -283,22 +254,17 @@ input[type="text"], input[type="password"] {
grid-row: 1;
grid-column-start: 1;
grid-column-end: 4;
font-size: large;
a {
text-decoration: none;
}
.player-image {
width: 32px;
height: 32px;
vertical-align: middle;
border-radius: 16px;
}
}
.level {
grid-column: 1;
}
.game-score.level {
font-size: x-large;
}
@ -314,14 +280,11 @@ input[type="text"], input[type="password"] {
grid-column: 4;
}
.title {
grid-row: 2;
font-size: x-small;
.game-title {
text-align: center;
}
.value {
grid-row: 3;
.game-score {
text-align: center;
margin: auto;
}
@ -330,3 +293,54 @@ input[type="text"], input[type="password"] {
height: 40px;
}
}
.steam {
font-family: "Motiva Sans", sans-serif;
padding: 18px;
background: url("https://steamstore-a.akamaihd.net/public/images/v6/colored_body_top2.png?v=2") center;
.player .player-name {
grid-row: 1;
grid-column: 1;
color: #ffffff;
}
.buttons {
grid-row: 2;
grid-column-start: 1;
grid-column-end: 3;
}
.game-banner {
grid-row: 1;
grid-column: 2;
text-align: right;
img {
height: 58px;
border-radius: 4px;
}
}
a {
text-decoration: none;
display: inline-block;
}
.button {
background-color: rgba(0,0,0,0.4);
color: #9e9d9b;
width: 32px;
height: 32px;
border-radius: 4px;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
}
.button:hover, .button:active {
background-color: rgba(102,192,244,0.4);
color: #ffffff;
}
}

6
templates/minis/dota.html
View file

@ -1,15 +1,15 @@
<div class="game-panel">
<div class="game-grid dota">
<div class="player">
<a href="http://steamcommunity.com/profiles/{{ dota.steam.steam_id }}">
<a href="https://www.opendota.com/players/{{ dota.steam.to_steam_id_3(dota.steam.steam_id) }}">
<img src="{{ dota.steam.avatar_url() }}" class="player-image">
<span class="player-name">{{ dota.steam.persona_name }}</span>
</a>
</div>
<div class="title wins">
<div class="game-title wins">
Vittorie
</div>
<div class="number wins">
<div class="game-score wins">
<span>{{ dota.wins }}</span>
</div>
<div class="rank">

28
templates/minis/lol.html
View file

@ -10,40 +10,40 @@
<img src="http://avatar.leagueoflegends.com/EUW1/{{ lol.summoner_name }}.png" class="player-image">
<span class="player-name">{{ lol.summoner_name }}</span>
</div>
<div class="title level">
<div class="game-title level">
LIVELLO
</div>
<div class="value level">
<div class="game-score level">
<span>{{ lol.level }}</span>
</div>
<div class="title soloq">
<div class="game-title soloq">
SOLO/DUO
</div>
<div class="value soloq">
<div class="game-score soloq">
{% if lol.solo_division is none %}
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" title="Non classificato" class="rank">
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" game-title="Non classificato" class="rank">
{% else %}
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.solo_division.name|lower + "_" + lol.solo_rank.name|lower + ".png") }}" class="rank" title="{{ lol.solo_division.name|capitalize }} {{ lol.solo_rank.name }}">
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.solo_division.name|lower + "_" + lol.solo_rank.name|lower + ".png") }}" class="rank" game-title="{{ lol.solo_division.name|capitalize }} {{ lol.solo_rank.name }}">
{% endif %}
</div>
<div class="title flexq">
<div class="game-title flexq">
FLEX
</div>
<div class="value flexq">
<div class="game-score flexq">
{% if lol.flex_division is none %}
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" title="Non classificato" class="rank">
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" game-title="Non classificato" class="rank">
{% else %}
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.flex_division.name|lower + "_" + lol.flex_rank.name|lower + ".png") }}" class="rank" title="{{ lol.flex_division.name|capitalize }} {{ lol.flex_rank.name }}">
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.flex_division.name|lower + "_" + lol.flex_rank.name|lower + ".png") }}" class="rank" game-title="{{ lol.flex_division.name|capitalize }} {{ lol.flex_rank.name }}">
{% endif %}
</div>
<div class="title twtrq">
<div class="game-title twtrq">
3V3
</div>
<div class="value twtrq">
<div class="game-score twtrq">
{% if lol.twtr_division is none %}
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" title="Non classificato" class="rank">
<img src="{{ url_for('static', filename='lol-rank-icons/provisional.png') }}" game-title="Non classificato" class="rank">
{% else %}
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.twtr_division.name|lower + "_" + lol.twtr_rank.name|lower + ".png") }}" class="rank" title="{{ lol.twtr_division.name|capitalize }} {{ lol.twtr_rank.name }}">
<img src="{{ url_for('static', filename='lol-rank-icons/' + lol.twtr_division.name|lower + "_" + lol.twtr_rank.name|lower + ".png") }}" class="rank" game-title="{{ lol.twtr_division.name|capitalize }} {{ lol.twtr_rank.name }}">
{% endif %}
</div>
</div>

2
templates/minis/rl.html
View file

@ -4,7 +4,7 @@
<div class="game-panel">
<div class="game-grid rl">
<div class="player">
<a href="http://steamcommunity.com/profiles/{{ rl.steam.steam_id }}">
<a href="https://rocketleaguestats.com/profile/steam/{{ rl.steam.steam_id }}">
<img src="{{ rl.steam.avatar_url() }}" class="player-image">
<span class="player-name">{{ rl.steam.persona_name }}</span>
</a>

45
templates/minis/steam.html Normal file
View file

@ -0,0 +1,45 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<style>
@font-face { font-family: "Motiva Sans"; src: url("https://steamcommunity-a.akamaihd.net/public/shared/fonts/MotivaSans-Regular.ttf") format("truetype"); font-style: normal; font-weight: normal; }
</style>
<div class="game-panel">
<div class="game-grid steam">
<div class="player">
<a href="http://steamcommunity.com/profiles/{{ steam.steam_id }}">
<img src="{{ steam.avatar_url() }}" class="player-image">
<span class="player-name">{{ steam.persona_name }}</span>
</a>
</div>
<div class="buttons">
<a href="steam://friends/add/{{ steam.steam_id }}">
<div class="button add-friend-button">
<i class="fas fa-user-plus"></i>
</div>
</a>
<a href="steam://friends/message/{{ steam.steam_id }}">
<div class="button message-button">
<i class="fas fa-comment-alt"></i>
</div>
</a>
<a href="https://steamdb.info/calculator/{{ steam.steam_id }}" target="_blank">
<div class="button calculator-button">
<i class="fas fa-calculator"></i>
</div>
</a>
{% if steam.trade_token %}
<a href="{{ steam.trade_token }}" target="_blank">
<div class="button trade-button">
<i class="fas fa-handshake"></i>
</div>
</a>
{% endif %}
</div>
{% if steam.most_played_game_id %}
<a href="https://store.steampowered.com/app/{{ steam.most_played_game_id }}/">
<div class="game-banner">
<img src="https://steamcdn-a.akamaihd.net/steam/apps/{{ steam.most_played_game_id }}/header.jpg">
</div>
</a>
{% endif %}
</div>
</div>

7
templates/profile.html
View file

@ -8,8 +8,8 @@
<h1>
Profilo di {{ royal.username }}
</h1>
{% if osu %}
{% include "minis/osu.html" %}
{% if steam %}
{% include "minis/steam.html" %}
{% endif %}
{% if rl %}
{% include "minis/rl.html" %}
@ -17,6 +17,9 @@
{% if dota %}
{% include "minis/dota.html" %}
{% endif %}
{% if osu %}
{% include "minis/osu.html" %}
{% endif %}
{% if lol %}
{% include "minis/lol.html" %}
{% endif %}

158
update.py
View file

@ -22,85 +22,85 @@ try:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# Update Rocket League
print("ROCKET LEAGUE")
for user in session.query(db.RocketLeague).all():
t = time.clock()
print(f"Updating {user.steam.royal.username}", end="\t\t", flush=True)
try:
user.update()
except errors.RequestError:
print("Request Error")
except errors.NotFoundError:
print("Not Found Error (?)")
else:
print("OK")
finally:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# Update Dota 2
print("DOTA 2")
for user in session.query(db.Dota).all():
t = time.clock()
print(f"Updating {user.steam.royal.username}", end="\t\t", flush=True)
try:
user.update()
except errors.RequestError:
print("Request Error")
except errors.NotFoundError:
print("Not Found Error (?)")
else:
print("OK")
finally:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# Update League of Legends
print("LEAGUE OF LEGENDS")
for user in session.query(db.LeagueOfLegends).all():
t = time.clock()
print(f"Updating {user.royal.username}", end="\t\t", flush=True)
try:
user.update()
except errors.RequestError:
print("Request Error")
except errors.NotFoundError:
print("Not Found Error (?)")
else:
print("OK")
finally:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# Update Osu!
print("OSU!")
for user in session.query(db.Osu).all():
t = time.clock()
print(f"Updating {user.royal.username}", end="\t\t", flush=True)
try:
user.update()
except errors.RequestError:
print("Request Error")
except errors.NotFoundError:
print("Not Found Error (?)")
else:
print("OK")
finally:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# Update Overwatch
print("OVERWATCH")
for user in session.query(db.Overwatch).all():
t = time.clock()
print(f"Updating {user.royal.username}", end="\t\t", flush=True)
try:
user.update()
except errors.RequestError:
print("Request Error")
except errors.NotFoundError:
print("Not Found Error (?)")
else:
print("OK")
finally:
sleep_time = 1 - time.clock() + t
time.sleep(sleep_time if sleep_time > 0 else 0)
# print("ROCKET LEAGUE")
# for user in session.query(db.RocketLeague).all():
# t = time.clock()
# print(f"Updating {user.steam.royal.username}", end="\t\t", flush=True)
# try:
# user.update()
# except errors.RequestError:
# print("Request Error")
# except errors.NotFoundError:
# print("Not Found Error (?)")
# else:
# print("OK")
# finally:
# sleep_time = 1 - time.clock() + t
# time.sleep(sleep_time if sleep_time > 0 else 0)
# # Update Dota 2
# print("DOTA 2")
# for user in session.query(db.Dota).all():
# t = time.clock()
# print(f"Updating {user.steam.royal.username}", end="\t\t", flush=True)
# try:
# user.update()
# except errors.RequestError:
# print("Request Error")
# except errors.NotFoundError:
# print("Not Found Error (?)")
# else:
# print("OK")
# finally:
# sleep_time = 1 - time.clock() + t
# time.sleep(sleep_time if sleep_time > 0 else 0)
# # Update League of Legends
# print("LEAGUE OF LEGENDS")
# for user in session.query(db.LeagueOfLegends).all():
# t = time.clock()
# print(f"Updating {user.royal.username}", end="\t\t", flush=True)
# try:
# user.update()
# except errors.RequestError:
# print("Request Error")
# except errors.NotFoundError:
# print("Not Found Error (?)")
# else:
# print("OK")
# finally:
# sleep_time = 1 - time.clock() + t
# time.sleep(sleep_time if sleep_time > 0 else 0)
# # Update Osu!
# print("OSU!")
# for user in session.query(db.Osu).all():
# t = time.clock()
# print(f"Updating {user.royal.username}", end="\t\t", flush=True)
# try:
# user.update()
# except errors.RequestError:
# print("Request Error")
# except errors.NotFoundError:
# print("Not Found Error (?)")
# else:
# print("OK")
# finally:
# sleep_time = 1 - time.clock() + t
# time.sleep(sleep_time if sleep_time > 0 else 0)
# # Update Overwatch
# print("OVERWATCH")
# for user in session.query(db.Overwatch).all():
# t = time.clock()
# print(f"Updating {user.royal.username}", end="\t\t", flush=True)
# try:
# user.update()
# except errors.RequestError:
# print("Request Error")
# except errors.NotFoundError:
# print("Not Found Error (?)")
# else:
# print("OK")
# finally:
# sleep_time = 1 - time.clock() + t
# time.sleep(sleep_time if sleep_time > 0 else 0)
except KeyboardInterrupt:
pass
finally:

3
webserver.py
View file

@ -32,12 +32,13 @@ def page_profile(name: str):
db_session.close()
abort(404)
return
steam = db_session.query(db.Steam).filter_by(royal=user).one_or_none()
osu = db_session.query(db.Osu).filter_by(royal=user).one_or_none()
rl = db_session.query(db.RocketLeague).join(db.Steam).filter_by(royal=user).one_or_none()
dota = db_session.query(db.Dota).join(db.Steam).filter_by(royal=user).one_or_none()
lol = db_session.query(db.LeagueOfLegends).filter_by(royal=user).one_or_none()
db_session.close()
return render_template("profile.html", royal=user, osu=osu, rl=rl, dota=dota, lol=lol)
return render_template("profile.html", royal=user, osu=osu, rl=rl, dota=dota, lol=lol, steam=steam)
@app.route("/login")