Compare commits
6 Commits
8d2e0381a7
...
cdc3d10df5
| Author | SHA1 | Date | |
|---|---|---|---|
| cdc3d10df5 | |||
| 1b150e3e64 | |||
| 27dccc324a | |||
| 1bb68ab33b | |||
| 3c6ea15d47 | |||
| 36e663e1ed |
@ -51,7 +51,17 @@ class ChannelMessageService(BaseService):
|
|||||||
}
|
}
|
||||||
|
|
||||||
async def save(self, model):
|
async def save(self, model):
|
||||||
context = model.record
|
context = {}
|
||||||
|
content.update(model.record)
|
||||||
|
user = await self.app.services.user.get(model['user_uid'])
|
||||||
|
context.update(
|
||||||
|
{
|
||||||
|
"user_uid": user["uid"],
|
||||||
|
"username": user["username"],
|
||||||
|
"user_nick": user["nick"],
|
||||||
|
"color": user["color"],
|
||||||
|
}
|
||||||
|
)
|
||||||
template = self.app.jinja2_env.get_template("message.html")
|
template = self.app.jinja2_env.get_template("message.html")
|
||||||
model["html"] = template.render(**context)
|
model["html"] = template.render(**context)
|
||||||
return await super().save(model)
|
return await super().save(model)
|
||||||
|
|||||||
@ -18,6 +18,26 @@ class MessageList extends HTMLElement {
|
|||||||
|
|
||||||
this.items = [];
|
this.items = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
connectedCallback() {
|
||||||
|
const messagesContainer = this
|
||||||
|
messagesContainer.addEventListener('click', (e) => {
|
||||||
|
if (e.target.tagName !== 'IMG' || e.target.classList.contains('avatar-img')) return;
|
||||||
|
const img = e.target;
|
||||||
|
const overlay = document.createElement('div');
|
||||||
|
overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.9);display:flex;justify-content:center;align-items:center;z-index:9999;'
|
||||||
|
const fullImg = document.createElement('img');
|
||||||
|
const urlObj = new URL(img.src); urlObj.search = '';
|
||||||
|
fullImg.src = urlObj.toString();
|
||||||
|
fullImg.alt = img.alt;
|
||||||
|
fullImg.style.maxWidth = '90%';
|
||||||
|
fullImg.style.maxHeight = '90%';
|
||||||
|
overlay.appendChild(fullImg);
|
||||||
|
document.body.appendChild(overlay);
|
||||||
|
overlay.addEventListener('click', () => document.body.removeChild(overlay));
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
scrollToBottom(force) {
|
scrollToBottom(force) {
|
||||||
console.info("Scrolling down")
|
console.info("Scrolling down")
|
||||||
// if (force) {
|
// if (force) {
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" class="message"><a class="avatar" style="background-color: {{color}}; color: black;" href="/user/{{user_uid}}.html"><img width="40px" height="40px" src="/avatar/{{user_uid}}.svg" /></a><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>
|
<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" class="message"><a class="avatar" style="background-color: {{color}}; color: black;" href="/user/{{user_uid}}.html"><img class="avatar-img" width="40px" height="40px" src="/avatar/{{user_uid}}.svg" /></a><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>
|
||||||
|
|||||||
@ -221,22 +221,6 @@ document.addEventListener('keydown', function(event) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// --- Image click-to-zoom (delegated) ---
|
// --- Image click-to-zoom (delegated) ---
|
||||||
messagesContainer.addEventListener('click', (e) => {
|
|
||||||
if (e.target.tagName !== 'IMG' || e.target.classList.contains('avatar')) return;
|
|
||||||
const img = e.target;
|
|
||||||
const overlay = document.createElement('div');
|
|
||||||
overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.9);display:flex;justify-content:center;align-items:center;z-index:9999;'
|
|
||||||
const fullImg = document.createElement('img');
|
|
||||||
const urlObj = new URL(img.src); urlObj.search = '';
|
|
||||||
fullImg.src = urlObj.toString();
|
|
||||||
fullImg.alt = img.alt;
|
|
||||||
fullImg.style.maxWidth = '90%';
|
|
||||||
fullImg.style.maxHeight = '90%';
|
|
||||||
overlay.appendChild(fullImg);
|
|
||||||
document.body.appendChild(overlay);
|
|
||||||
overlay.addEventListener('click', () => document.body.removeChild(overlay));
|
|
||||||
});
|
|
||||||
|
|
||||||
// --- Layout update ---
|
// --- Layout update ---
|
||||||
let lastMessage;
|
let lastMessage;
|
||||||
function updateLayout(doScrollDown) {
|
function updateLayout(doScrollDown) {
|
||||||
|
|||||||
67
src/snek/view/avatar_animal_view.py
Normal file
67
src/snek/view/avatar_animal_view.py
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
# Written by retoor@molodetz.nl
|
||||||
|
|
||||||
|
# This code defines a WebView class that inherits from BaseView and includes a method for rendering a web template, requiring login access for its usage.
|
||||||
|
|
||||||
|
# The code imports the BaseView class from the `snek.system.view` module.
|
||||||
|
|
||||||
|
# MIT License
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
from aiohttp import web
|
||||||
|
from multiavatar import multiavatar
|
||||||
|
|
||||||
|
from snek.system.view import BaseView
|
||||||
|
from snek.view.avatar_animal import generate_avatar_with_options
|
||||||
|
|
||||||
|
import functools
|
||||||
|
|
||||||
|
class AvatarView(BaseView):
|
||||||
|
login_required = False
|
||||||
|
|
||||||
|
def __init__(self, *args,**kwargs):
|
||||||
|
super().__init__(*args,**kwargs)
|
||||||
|
self.avatars = {}
|
||||||
|
|
||||||
|
async def get(self):
|
||||||
|
uid = self.request.match_info.get("uid")
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
return web.Response(text=self._get(uid), content_type="image/svg+xml")
|
||||||
|
except Exception as e:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def _get(self, uid):
|
||||||
|
if uid in self.avatars:
|
||||||
|
return self.avatars[uid]
|
||||||
|
|
||||||
|
avatar = generate_avatar_with_options(self.request.query)
|
||||||
|
self.avatars[uid] = avatar
|
||||||
|
return avatar
|
||||||
|
|
||||||
|
async def get2(self):
|
||||||
|
uid = self.request.match_info.get("uid")
|
||||||
|
if uid == "unique":
|
||||||
|
uid = str(uuid.uuid4())
|
||||||
|
avatar = multiavatar.multiavatar(uid, True, None)
|
||||||
|
response = web.Response(text=avatar, content_type="image/svg+xml")
|
||||||
|
response.headers["Cache-Control"] = f"public, max-age={1337*42}"
|
||||||
|
return response
|
||||||
@ -55,6 +55,16 @@ class WebView(BaseView):
|
|||||||
user_uid=self.session.get("uid"), channel_uid=channel["uid"]
|
user_uid=self.session.get("uid"), channel_uid=channel["uid"]
|
||||||
)
|
)
|
||||||
if not channel_member:
|
if not channel_member:
|
||||||
|
if not channel["is_private"]:
|
||||||
|
channel_member = await self.app.services.channel_member.create(
|
||||||
|
channel_uid=channel["uid"],
|
||||||
|
user_uid=self.session.get("uid"),
|
||||||
|
is_moderator=False,
|
||||||
|
is_read_only=False,
|
||||||
|
is_muted=False,
|
||||||
|
is_banned=False,
|
||||||
|
)
|
||||||
|
|
||||||
return web.HTTPNotFound()
|
return web.HTTPNotFound()
|
||||||
|
|
||||||
channel_member["new_count"] = 0
|
channel_member["new_count"] = 0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user