Merge development into master: 1.2.1, Steam identity

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

.gitattributes

@@ -0,0 +1,23 @@
+# On a merge, .gitmodules keeps the answer this branch already has.
+#
+# master names the daemon at github.com because master is what a stranger
+# clones, and development names it at the Gitea instance where the work
+# happens. Without this, a merge that touched .gitmodules on both sides would
+# stop and ask which host is right - and the answer is always "the one the
+# branch being merged into already said".
+#
+# `merge=ours` needs a driver by that name, which is one line per clone and
+# not something a repository can carry for you:
+#
+#     git config merge.ours.driver true
+#
+# Without it git falls back to an ordinary merge, which conflicts rather than
+# doing the wrong thing quietly - so a clone that has not run it is no worse
+# off than before this file existed.
+#
+# The edge, because it is a real one: this keeps the *whole file*, not just the
+# URL. If development ever adds a second submodule, master takes none of that
+# entry while still taking the gitlink the merge brings with it - a submodule
+# with nothing in .gitmodules to say where it comes from. Adding a submodule is
+# therefore a thing to re-do by hand on master, and the only such thing.
+/.gitmodules merge=ours

CHANGELOG.md

@@ -17,6 +17,12 @@ Each section has two parts:
   that made it, including dependency updates
   (`node scripts/changelog-deps.mjs <previous tag>` lists those).
 
+## [1.2.1]
+
+### Fixes, patches and changes
+
+- Steam signs in as a desktop client of its own, with a machine id and a logon id that belong to the install, instead of as the Steam mobile app (a "phone" reporting a Linux desktop, with no machine id, which Steam raised an account alert about), and waits longer before reconnecting after Steam closes a connection. Sign in to Steam again from Accounts to take on the new identity; the old one stays in Steam's list of devices until you remove it there ([moho `fceec5d`](https://github.com/Moho-Chat/moho/commit/fceec5d), [nobilis `f3de870`](https://github.com/Moho-Chat/nobilis/commit/f3de870))
+
 ## [1.2.0]
 
 ### Major features

PKGBUILD

@@ -1,8 +1,7 @@
-# Maintainer: Salastil <[email protected]>
 pkgname=moho-git
 pkgver=r1.268751e
 pkgrel=1
-pkgdesc="Unified desktop chat client for IRC, Discord, Sneedchat and Matrix"
+pkgdesc="Unified desktop chat client for IRC, Discord, Matrix, Kick, Sneedchat and Steam"
 arch=('x86_64')
 url="https://github.com/Moho-Chat/moho"
 license=('GPL3')

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "moho",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "moho",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@electron-toolkit/preload": "^3.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moho",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Unified desktop chat client for IRC, Discord, Sneedchat and Matrix",
   "author": "Salastil <[email protected]>",
   "license": "GPL-3.0-or-later",

src/renderer/src/components/AccountsPanel.tsx

@@ -1415,9 +1415,10 @@ function SteamForm({ onDone }: { onDone: () => void }): JSX.Element {
     <div className="add-form">
       <p className="small muted">
         Sign in with your Steam account name — the one you type at the Steam login, not the
-        display name your friends see. moho signs in as the Steam mobile app's chat, so it runs
-        beside the Steam launcher without signing it out. Your password goes to Steam and is not
-        kept; moho keeps only the token Steam hands back.
+        display name your friends see. moho signs in as a desktop client of its own, the way other
+        third-party Steam clients do, and shows up in your Steam devices as "moho on" your
+        computer's name. Your password goes to Steam and is not kept; moho keeps only the token
+        Steam hands back.
       </p>
       <TorSwitch service="steam" on={useTor} onChange={setUseTor} />
       <div className="field-row">