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

Merge pull request #74 from royal-games/examples

Browse source 
Merge completely random stuff
This commit is contained in:
Steffo 2019-07-17 14:11:23 +02:00 committed by GitHub
commit 58b0d9f3b5
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 292 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
requirements.txt
View file

@ -1,3 +1,4 @@
bcrypt
python-telegram-bot>=11.1.0
websockets>=7.0
pytest>=4.3.1

5
royalnet/database/tables/wikipages.py
View file

@ -3,6 +3,7 @@ from sqlalchemy import Column, \
String
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.ext.declarative import declared_attr
from royalnet.web.shortcuts import to_urluuid
class WikiPage:
@ -31,3 +32,7 @@ class WikiPage:
@declared_attr
def css(self):
return Column(String)
@property
def page_short_id(self):
return to_urluuid(self.page_id)

2
royalnet/royalgames.py
View file

@ -1,3 +1,5 @@
"""The production Royalnet, active at @royalgamesbot on Telegram and Royalbot on Discord."""
import os
import asyncio
import logging

5
royalnet/royalgamesweb.py
View file

@ -1,3 +1,5 @@
"""The production Royalnet available at ryg.steffo.eu ."""
import os
from royalnet.web import create_app
from royalnet.web.royalprints import *
@ -6,10 +8,11 @@ from royalnet.web.royalprints import *
class TestConfig:
DB_PATH = os.environ["DB_PATH"]
TG_AK = os.environ["TG_AK"]
SITE_NAME = "Royalnet"
app = create_app(TestConfig, [rp_home, rp_wikiview, rp_tglogin, rp_docs, rp_wikiedit, rp_mcstatus, rp_diarioview,
rp_profile])
rp_profile, rp_login, rp_newaccount])
if __name__ == "__main__":

2
royalnet/web/flaskserver.py
View file

@ -14,7 +14,7 @@ def create_app(config_obj: typing.Type, blueprints: typing.List[Royalprint]):
Also requires a ``DB_PATH`` key in ``config_obj`` to initialize the database connection.
Warning:
The code for this class was written at 1 AM, and I have no clue of how and why it works or even of if it really does work.
The code for this class was written at 1 AM, and I have no clue of how and why it works or even if it really does work.
Use with caution?
Args:

32
royalnet/web/royalprints/__init__.py
View file

@ -1,12 +1,26 @@
"""Some Royalprints that can be used with the Royalnet Flask server."""
from .home import rp as rp_home
from .wikiview import rp as rp_wikiview
from .tglogin import rp as rp_tglogin
from .docs import rp as rp_docs
from .wikiedit import rp as rp_wikiedit
from .mcstatus import rp as rp_mcstatus
from .diarioview import rp as rp_diarioview
from .profile import rp as rp_profile
from . import home
from . import wikiview
from . import tglogin
from . import docs
from . import wikiedit
from . import mcstatus
from . import diarioview
from . import profile
from . import login
from . import newaccount
__all__ = ["rp_home", "rp_wikiview", "rp_tglogin", "rp_docs", "rp_wikiedit", "rp_mcstatus", "rp_diarioview", "rp_profile"]
rp_home = home.rp
rp_wikiview = wikiview.rp
rp_tglogin = tglogin.rp
rp_docs = docs.rp
rp_wikiedit = wikiedit.rp
rp_mcstatus = mcstatus.rp
rp_diarioview = diarioview.rp
rp_profile = profile.rp
rp_login = login.rp
rp_newaccount = newaccount.rp
__all__ = ["rp_home", "rp_wikiview", "rp_tglogin", "rp_docs", "rp_wikiedit", "rp_mcstatus", "rp_diarioview",
"rp_profile", "rp_login", "rp_newaccount"]

2
royalnet/web/royalprints/diarioview/templates/diarioview_page.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}
Pagina {{ page }} - Diario RYG
Diario: Pagina {{ page }}
{% endblock %}
{% block content %}

42
royalnet/web/royalprints/login/__init__.py Normal file
View file

@ -0,0 +1,42 @@
"""A Royalnet password-based login :py:class:`royalnet.web.Royalprint`."""
import flask as f
import os
import datetime
import bcrypt
from ...royalprint import Royalprint
from ...shortcuts import error
from ....database.tables import Royal
tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
rp = Royalprint("login", __name__, url_prefix="/login/password", required_tables={Royal},
template_folder=tmpl_dir)
@rp.route("/")
def login_index():
f.session.pop("royal", None)
return f.render_template("login_index.html")
@rp.route("/done", methods=["POST"])
def login_done():
alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
fd = f.request.form
if "username" not in fd:
return error(400, "Nessun username inserito.")
royal_user = alchemy_session.query(alchemy.Royal).filter_by(username=fd["username"]).one_or_none()
if royal_user is None:
return error(404, "L'username inserito non corrisponde a nessun account registrato.")
if "password" not in fd:
return error(400, "Nessuna password inserita.")
if not bcrypt.checkpw(bytes(fd["password"], encoding="utf8"), royal_user.password):
return error(400, "La password inserita non è valida.")
f.session["royal"] = {
"uid": royal_user.uid,
"username": royal_user.username,
"avatar": royal_user.avatar,
"role": royal_user.role
}
f.session["login_date"] = datetime.datetime.now()
return f.render_template("login_success.html")

49
royalnet/web/royalprints/login/templates/login_index.html Normal file
View file

@ -0,0 +1,49 @@
{% extends "base.html" %}
{% block title %}
Password Login
{% endblock %}
{% block content %}
<div class="login">
<div class="doublebox">
<div class="top">
<span class="left">
Password Login
</span>
</div>
<div class="bot">
<p>
Non hai una password? Prova il <a href="{{ url_for("tglogin.tglogin_index") }}">Login con Telegram</a>!
</p>
<p>
Facendo il login su questo sito, acconsenti a ricevere due <abbr title="cookie">biscottini</abbr> che memorizzino l'account con cui hai fatto il login.<br>
</p>
<p>
Essi avranno il seguente formato:
</p>
<pre><code>session["royal"] = {
"uid": [il tuo id Royalnet]
"username": [il tuo username Royalnet],
"avatar": [il tuo avatar Royalnet],
"role": [il tuo ruolo Royalnet]
}
session["login_date"] = [la data e l'ora di adesso]</code></pre>
<form action="{{ url_for("login.login_done") }}" method="post" class="login-form fullsize">
<label for="login-username">
<span class="label-text">Username</span>
<input id="login-username" type="text" name="username">
</label>
<label for="login-password">
<span class="label-text">Password</span>
<input id="login-password" type="password" name="password">
</label>
<label for="login-submit">
<input id="login-submit" type="submit" value="Login">
</label>
</form>
</div>
</div>
</div>
{% endblock %}

18
royalnet/web/royalprints/login/templates/login_success.html Normal file
View file

@ -0,0 +1,18 @@
{% extends "base.html" %}
{% block title %}
Password Login riuscito
{% endblock %}
{% block content %}
<div class="doublebox">
<div class="top">
<span class="left">
Password Login
</span>
</div>
<div class="bot">
Login riuscito! Sei connesso come <b>{{ session["royal"]["username"] }}</b>!
</div>
</div>
{% endblock %}

2
royalnet/web/royalprints/mcstatus/templates/mcstatus.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}
{{ server_str }} - RYG MCstatus
Minecraft {{ server_str }}
{% endblock %}
{% block content %}

40
royalnet/web/royalprints/newaccount/__init__.py Normal file
View file

@ -0,0 +1,40 @@
"""A :py:class:`royalnet.web.Royalprint` to create new Royals."""
import flask as f
import os
import datetime
import bcrypt
from ...royalprint import Royalprint
from ...shortcuts import error
from ....database.tables import Royal, Alias
tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
rp = Royalprint("newaccount", __name__, url_prefix="/newaccount", required_tables={Royal, Alias},
template_folder=tmpl_dir)
@rp.route("/", methods=["GET", "POST"])
def login_index():
if f.request.method == "GET":
return f.render_template("newaccount_index.html")
elif f.request.method == "POST":
alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
fd = f.request.form
if "username" not in fd:
return error(400, "Non è stato inserito nessun username.")
if "password" not in fd:
return error(400, "Non è stata inserita nessuna password.")
royal = alchemy_session.query(alchemy.Royal).filter_by(username=fd["username"]).one_or_none()
if royal is not None:
return error(403, "Esiste già un utente con quell'username.")
alias = alchemy_session.query(alchemy.Alias).filter_by(alias=fd["username"]).one_or_none()
if alias is not None:
return error(403, "Esiste già un utente con quell'alias.")
royal = alchemy.Royal(username=fd["username"],
password=bcrypt.hashpw(bytes(fd["password"], encoding="utf8"), bcrypt.gensalt()),
role="Guest")
alchemy_session.add(royal)
alias = alchemy.Alias(royal=royal, alias=royal.username.lower())
alchemy_session.add(alias)
alchemy_session.commit()
return f.redirect(f.url_for("login.login_index"))

36
royalnet/web/royalprints/newaccount/templates/newaccount_index.html Normal file
View file

@ -0,0 +1,36 @@
{% extends "base.html" %}
{% block title %}
Nuovo account
{% endblock %}
{% block content %}
<div class="login">
<div class="doublebox">
<div class="top">
<span class="left">
Nuovo account
</span>
</div>
<div class="bot">
<form method="post" class="newaccount-form fullsize">
<label for="newaccount-username">
<span class="label-text">Username</span>
<input id="newaccount-username" type="text" name="username">
</label>
<label for="newaccount-password">
<span class="label-text">Password</span>
<input id="newaccount-password" type="password" name="password">
</label>
<label for="newaccount-role">
<span class="label-text">Ruolo</span>
<input id="newaccount-role" type="text" name="role" disabled value="Guest">
</label>
<label for="newaccount-submit">
<input id="newaccount-submit" type="submit" value="Login">
</label>
</form>
</div>
</div>
</div>
{% endblock %}

4
royalnet/web/royalprints/profile/templates/profile_index.html
View file

@ -1,14 +1,14 @@
{% extends "base.html" %}
{% block title %}
Indice RYGwiki
Elenco profili
{% endblock %}
{% block content %}
<div class="doublebox">
<div class="top">
<span class="left">
Elenco Membri
Elenco profili
</span>
</div>
<div class="bot">

2
royalnet/web/royalprints/profile/templates/profile_page.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}
{{ royal.username }} - Profilo RYG
Profilo: {{ royal.username }}
{% endblock %}
{% block content %}

2
royalnet/web/royalprints/tglogin/__init__.py
View file

@ -47,4 +47,4 @@ def tglogin_done():
"role": royal_user.role
}
f.session["login_date"] = datetime.datetime.now()
return f.render_template("tglogin_success.html")
return f.render_template("login_success.html")

2
royalnet/web/royalprints/tglogin/templates/tglogin_index.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}
Login with Telegram
Telegram Login
{% endblock %}
{% block content %}

4
royalnet/web/royalprints/tglogin/templates/tglogin_success.html
View file

@ -1,14 +1,14 @@
{% extends "base.html" %}
{% block title %}
Login with Telegram
Telegram Login riuscito
{% endblock %}
{% block content %}
<div class="doublebox">
<div class="top">
<span class="left">
Telegram login
Telegram Login
</span>
</div>
<div class="bot">

15
royalnet/web/royalprints/wikiedit/__init__.py
View file

@ -5,7 +5,7 @@ import os
import datetime
import difflib
from ...royalprint import Royalprint
from ...shortcuts import error
from ...shortcuts import error, from_urluuid
from ....database.tables import Royal, WikiPage, WikiRevision
@ -41,17 +41,18 @@ def wikiedit_newpage():
alchemy_session.add(page)
alchemy_session.add(revision)
alchemy_session.commit()
return f.redirect(f.url_for("wikiview.wikiview_by_id", page_id=page.page_id, title=page.title))
return f.redirect(f.url_for("wikiview.wikiview_by_id", page_id=page.page_short_id, title=page.title))
@rp.route("/<uuid:page_id>", defaults={"title": ""}, methods=["GET", "POST"])
@rp.route("/<uuid:page_id>/<title>", methods=["GET", "POST"])
def wikiedit_by_id(page_id: uuid.UUID, title: str):
@rp.route("/<page_id>", defaults={"title": ""}, methods=["GET", "POST"])
@rp.route("/<page_id>/<title>", methods=["GET", "POST"])
def wikiedit_by_id(page_id: str, title: str):
page_uuid = from_urluuid(page_id)
if "royal" not in f.session:
return error(403, "Devi aver effettuato il login per modificare pagine wiki.")
alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_id).one_or_none()
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_uuid).one_or_none()
if page is None:
return error(404, "La pagina che stai cercando di modificare non esiste.")
@ -75,4 +76,4 @@ def wikiedit_by_id(page_id: uuid.UUID, title: str):
page.title = fd["title"]
page.css = fd["css"] if fd["css"] != "None" else None
alchemy_session.commit()
return f.redirect(f.url_for("wikiview.wikiview_by_id", page_id=page.page_id, title=page.title))
return f.redirect(f.url_for("wikiview.wikiview_by_id", page_id=page.page_short_id, title=page.title))

4
royalnet/web/royalprints/wikiedit/templates/wikiedit_page.html
View file

@ -17,14 +17,14 @@
</span>
</div>
<div class="bot">
<form method="POST" class="wikiedit-form">
<form method="POST" class="wikiedit-form fullsize">
<label for="wikiedit-title">
<span class="label-text">Titolo</span>
<input id="wikiedit-title" type="text" name="title" value="{{ page.title }}">
</label>
<label for="wikiedit-format">
<span class="label-text">Formato</span>
<input id="wikiedit-format" type="text" name="format" disabled value="{{ page.format }}">
<input id="wikiedit-format" type="text" name="format" disabled value="markdown">
</label>
<!--suppress HtmlFormInputWithoutLabel -->
<textarea id="wikiedit-content" name="content">{{ page.content }}</textarea>

11
royalnet/web/royalprints/wikiview/__init__.py
View file

@ -6,7 +6,7 @@ import re
import uuid
import os
from ...royalprint import Royalprint
from ...shortcuts import error
from ...shortcuts import error, from_urluuid
from ....database.tables import Royal, WikiPage, WikiRevision
@ -58,11 +58,12 @@ def wikiview_index():
return f.render_template("wikiview_index.html", pages=pages)
@rp.route("/<uuid:page_id>", defaults={"title": ""})
@rp.route("/<uuid:page_id>/<title>")
def wikiview_by_id(page_id: uuid.UUID, title: str):
@rp.route("/<page_id>", defaults={"title": ""})
@rp.route("/<page_id>/<title>")
def wikiview_by_id(page_id: str, title: str):
page_uuid = from_urluuid(page_id)
alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_id).one_or_none()
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_uuid).one_or_none()
if page is None:
return error(404, f"La pagina richiesta non esiste.")
return prepare_page(page)

6
royalnet/web/royalprints/wikiview/templates/wikiview_index.html
View file

@ -1,14 +1,14 @@
{% extends "base.html" %}
{% block title %}
Indice RYGwiki
Wiki
{% endblock %}
{% block content %}
<div class="doublebox">
<div class="top">
<span class="left">
Pagine Wiki
Wiki
</span>
</div>
<div class="bot">
@ -19,7 +19,7 @@
{% endif %}
<ul>
{% for page in pages %}
<li><a href="{{ url_for("wikiview.wikiview_by_id", page_id=page.page_id|string, title=page.title) }}">{{ page.title }}</a></li>
<li><a href="{{ url_for("wikiview.wikiview_by_id", page_id=page.page_short_id, title=page.title) }}">{{ page.title }}</a></li>
{% endfor %}
</ul>
</div>

6
royalnet/web/royalprints/wikiview/templates/wikiview_page.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}
{{ page.title }} - RYGwiki
Wiki: {{ page.title }}
{% endblock %}
{% block content %}
@ -12,12 +12,12 @@
</span>
<span class="right">
{% if session.royal %}
<a class="edit no-icon" href="{{ url_for("wikiedit.wikiedit_by_id", page_id=page.page_id|string, title=page.title) }}">Modifica</a>
<a class="edit no-icon" href="{{ url_for("wikiedit.wikiedit_by_id", page_id=page.page_short_id, title=page.title) }}">Modifica</a>
{% else %}
<a class="edit no-icon faded" title="Devi fare il login per modificare pagine!">Modifica</a>
{% endif %}
|
<a class="permalink no-icon" href="{{ url_for("wikiview.wikiview_by_id", page_id=page.page_id|string, title=page.title) }}">Permalink</a>
<a class="permalink no-icon" href="{{ url_for("wikiview.wikiview_by_id", page_id=page.page_short_id, title=page.title) }}">Permalink</a>
</span>
</div>
<div class="bot">

11
royalnet/web/shortcuts.py
View file

@ -1,5 +1,16 @@
import flask as f
import uuid as _uuid
import base64
def error(code, reason):
return f.render_template("error.html", title=f"Errore {code}", reason=reason), code
def to_urluuid(uuid: _uuid.UUID) -> str:
"""Return a base64 url-friendly short UUID."""
return str(base64.urlsafe_b64encode(uuid.bytes), encoding="ascii").rstrip("=")
def from_urluuid(b: str) -> _uuid.UUID:
return _uuid.UUID(bytes=base64.urlsafe_b64decode(bytes(b + "==", encoding="ascii")))

48
royalnet/web/static/ryg.css
View file

@ -504,52 +504,52 @@ input[disabled=""],
button[disabled=""] {
opacity: 0.3;
}
.wikiedit-form label {
form.fullsize label {
margin-top: 4px;
margin-bottom: 4px;
display: flex;
}
.wikiedit-form label .label-text {
form.fullsize label .label-text {
margin-right: 12px;
min-width: 60px;
}
.wikiedit-form label input {
form.fullsize label input {
flex-grow: 1;
}
.wikiedit-form label[for="wikiedit-title"] {
form.fullsize label[for="wikiedit-title"] {
font-size: x-large;
}
.wikiedit-form label[for="wikiedit-title"] * {
form.fullsize label[for="wikiedit-title"] * {
font-size: x-large;
}
.wikiedit-form .editor-toolbar,
.wikiedit-form .editor-statusbar {
form.fullsize .editor-toolbar,
form.fullsize .editor-statusbar {
background-color: #0e1c47;
color: #a0ccff !important;
border: 0;
opacity: 1 !important;
}
.wikiedit-form .editor-toolbar a,
.wikiedit-form .editor-statusbar a {
form.fullsize .editor-toolbar a,
form.fullsize .editor-statusbar a {
color: #a0ccff !important;
border: 0;
}
.wikiedit-form .editor-toolbar a:hover,
.wikiedit-form .editor-statusbar a:hover {
form.fullsize .editor-toolbar a:hover,
form.fullsize .editor-statusbar a:hover {
background-color: rgba(160, 204, 255, 0.2);
color: #ffffff !important;
}
.wikiedit-form .editor-toolbar a.active,
.wikiedit-form .editor-statusbar a.active {
form.fullsize .editor-toolbar a.active,
form.fullsize .editor-statusbar a.active {
background-color: rgba(160, 204, 255, 0.3);
color: white !important;
}
.wikiedit-form .editor-toolbar a.active:hover,
.wikiedit-form .editor-statusbar a.active:hover {
form.fullsize .editor-toolbar a.active:hover,
form.fullsize .editor-statusbar a.active:hover {
background-color: rgba(160, 204, 255, 0.2);
color: #ffffff !important;
}
.wikiedit-form .CodeMirror {
form.fullsize .CodeMirror {
font-family: "Consolas", monospace !important;
background-color: transparent;
color: #a0ccff;
@ -559,28 +559,28 @@ button[disabled=""] {
border-right: 1px solid rgba(160, 204, 255, 0.2);
border-radius: 0;
}
.wikiedit-form .CodeMirror .cm-link {
form.fullsize .CodeMirror .cm-link {
color: #7dffff !important;
}
.wikiedit-form .CodeMirror .cm-url {
form.fullsize .CodeMirror .cm-url {
color: #00caca !important;
}
.wikiedit-form .CodeMirror .cm-tag {
form.fullsize .CodeMirror .cm-tag {
color: #ff7dff !important;
}
.wikiedit-form .CodeMirror .cm-strong {
form.fullsize .CodeMirror .cm-strong {
color: #ffff7d !important;
}
.wikiedit-form .CodeMirror .cm-em {
form.fullsize .CodeMirror .cm-em {
color: #ffbb7d !important;
}
.wikiedit-form .CodeMirror .cm-quote {
form.fullsize .CodeMirror .cm-quote {
color: #7dff7d !important;
}
.wikiedit-form .CodeMirror .cm-comment {
form.fullsize .CodeMirror .cm-comment {
color: lightgray !important;
}
.wikiedit-form .CodeMirror .cm-header {
form.fullsize .CodeMirror .cm-header {
color: #ffffff !important;
}
.mcstatus-grid {

2
royalnet/web/static/ryg.less
View file

@ -622,7 +622,7 @@ table {
opacity: 0.3;
}
.wikiedit-form {
form.fullsize {
label {
margin-top: 4px;

8
royalnet/web/templates/base.html
View file

@ -8,7 +8,7 @@
<meta name="keywords" content="Royal Games,RYG,Gaming,Videogames,Community">
<meta name="description" content="Royal Games Community">
<meta property="og:site_name" content="Royal Games">
<title>{% block title %}{% endblock %}</title>
<title>{% block title %}{% endblock %} - {{ config["SITE_NAME"] }}</title>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css">
{% if css %}
<link rel="stylesheet" href="{{ url_for("static", filename=css) }}">
@ -23,12 +23,12 @@
<div class="nav-left">
<a class="nav-site no-icon" href="{{ url_for("home.home_index") }}">
<img class="nav-image" alt="" src="{{ url_for("static", filename="logo.svg") }}">
<span class="nav-sitename">Royal Games</span>
<span class="nav-sitename">{{ config["SITE_NAME"] }}</span>
</a>
<span class="nav-modules">
<a class="no-icon" href="{{ url_for("wikiview.wikiview_index") }}">Wiki</a>
<a class="no-icon" href="{{ url_for("diarioview.diarioview_page", page=1) }}">Diario</a>
<a class="no-icon" href="{{ url_for("profile.profile_index") }}">Membri</a>
<a class="no-icon" href="{{ url_for("profile.profile_index") }}">Profili</a>
</span>
</div>
<div class="nav-center">
@ -46,7 +46,7 @@
</a>
{% else %}
<span class="nav-login">
<a class="no-icon" href="{{ url_for("tglogin.tglogin_index") }}">
<a class="no-icon" href="{{ url_for("login.login_index") }}">
Login
<img class="nav-image faded" alt="" src="{{ url_for("static", filename="generic.png") }}">
</a>