# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1702501548 -3600
# Node ID 7941444c167182d6481e9d2f3789f135ce4a7590
# Parent  93abef9a3548e0a97e9c6583e43c256eb6599ea4
pages: set `own_local_jid` to avoid confusion with `own_jid`:

- `own_jid` is the real JID of the user.
- `own_local_jid` is the JID used in chat, which can be real JID, or a room JID.

diff -r 93abef9a3548 -r 7941444c1671 libervia/web/pages/chat/_browser/__init__.py
--- a/libervia/web/pages/chat/_browser/__init__.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/pages/chat/_browser/__init__.py	Wed Dec 13 22:05:48 2023 +0100
@@ -15,7 +15,8 @@
 
 log.warning = log.warn
 profile = window.profile or ""
-own_jid = jid.JID(window.own_jid)
+# JID used in the local chat (real JID for one2one, room JID otherwise)
+own_local_jid = jid.JID(window.own_local_jid)
 target_jid = jid.JID(window.target_jid)
 chat_type = window.chat_type
 bridge = Bridge()
@@ -253,7 +254,8 @@
             from_jid = from_jid.bare
 
         return {
-            "own_jid": own_jid,
+            "own_local_jid": str(own_local_jid),
+            "chat_type": chat_type,
             "msg": {
                 "id": uid,
                 "timestamp": extra.get("updated", timestamp),
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/pages/chat/page_meta.py
--- a/libervia/web/pages/chat/page_meta.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/pages/chat/page_meta.py	Wed Dec 13 22:05:48 2023 +0100
@@ -67,14 +67,14 @@
          __) = join_ret
         template_data["subject"] = room_subject
         template_data["room_statuses"] = room_statuses
-        own_jid = jid.JID(room_jid_s)
-        own_jid = own_jid.change_resource(user_nick)
+        own_local_jid = jid.JID(room_jid_s)
+        own_local_jid = own_local_jid.change_resource(user_nick)
     else:
         room_subject = None
         chat_type = C.CHAT_ONE2ONE
-        own_jid = profile_jid
+        own_local_jid = profile_jid
     rdata["chat_type"] = chat_type
-    template_data["own_jid"] = own_jid
+    template_data["own_local_jid"] = own_local_jid
 
     history = await self.host.bridge_call(
         "history_get",
@@ -100,7 +100,7 @@
     self.expose_to_scripts(
         request,
         room_subject=room_subject,
-        own_jid=str(own_jid),
+        own_local_jid=str(own_local_jid),
         target_jid=target_jid,
         chat_type=chat_type,
     )
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/pages/login/logged/page_meta.py
--- a/libervia/web/pages/login/logged/page_meta.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/pages/login/logged/page_meta.py	Wed Dec 13 22:05:48 2023 +0100
@@ -6,7 +6,7 @@
 
 log = getLogger(__name__)
 
-"""SàT log-in page, with link to create an account"""
+"""Libervia Web log-in page, with link to create an account"""
 
 template = "login/logged.html"
 
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/pages/login/page_meta.py
--- a/libervia/web/pages/login/page_meta.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/pages/login/page_meta.py	Wed Dec 13 22:05:48 2023 +0100
@@ -10,7 +10,7 @@
 
 log = getLogger(__name__)
 
-"""SàT log-in page, with link to create an account"""
+"""Libervia Web log-in page, with link to create an account"""
 
 name = "login"
 access = C.PAGES_ACCESS_PUBLIC
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/server/constants.py
--- a/libervia/web/server/constants.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/server/constants.py	Wed Dec 13 22:05:48 2023 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# Libervia: a SàT frontend
-# Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org)
+# Libervia web frontend
+# Copyright (C) 2009-2023 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/server/pages.py
--- a/libervia/web/server/pages.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/server/pages.py	Wed Dec 13 22:05:48 2023 +0100
@@ -1415,6 +1415,8 @@
             profile=session_data.profile,
             tz_name=template_data["tz_name"]
         )
+        if session_data.jid is not None:
+            self.expose_to_scripts(request, own_jid=session_data.jid)
 
         uri = request.uri.decode()
         try:
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/server/restricted_bridge.py
--- a/libervia/web/server/restricted_bridge.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/server/restricted_bridge.py	Wed Dec 13 22:05:48 2023 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Libervia: a SàT frontend
+# Libervia Web Frontend
 # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
diff -r 93abef9a3548 -r 7941444c1671 libervia/web/server/session_iface.py
--- a/libervia/web/server/session_iface.py	Wed Dec 13 22:03:49 2023 +0100
+++ b/libervia/web/server/session_iface.py	Wed Dec 13 22:05:48 2023 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Libervia: a SàT frontend
+# Libervia Web Frontend
 # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify