Fix channel ACTION routing after self-message handling

Fix private messages splitting into two windows over WeeChat's IRC relay

.github/workflows/appimage-build.yml

@@ -35,7 +35,7 @@ jobs:
             libxkbcommon0 \
             libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
             liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
-            perl python3 python3-minimal python3-dev python3-cffi python3-sphinx mono-devel desktop-file-utils \
+            perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
             fonts-noto-color-emoji breeze-gtk-theme \
             patchelf file curl
 

.github/workflows/windows-build.yml

@@ -40,7 +40,6 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install cffi
           python -m pip install zstandard
-          python -m pip install sphinx
 
           $ProgressPreference = 'SilentlyContinue'
           function Download-WithRetry {

docs/build-docs.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import subprocess
-import sys
-
-
-def main():
-    if len(sys.argv) != 4:
-        raise SystemExit("usage: build-docs.py SOURCE_DIR OUTPUT_DIR STAMP_FILE")
-
-    source_dir = os.path.abspath(sys.argv[1])
-    output_dir = os.path.abspath(sys.argv[2])
-    stamp_file = os.path.abspath(sys.argv[3])
-    doctree_dir = output_dir + ".doctrees"
-
-    shutil.rmtree(output_dir, ignore_errors=True)
-    shutil.rmtree(doctree_dir, ignore_errors=True)
-    os.makedirs(output_dir, exist_ok=True)
-
-    subprocess.run(
-        [
-            sys.executable,
-            "-m",
-            "sphinx",
-            "-b",
-            "html",
-            "-d",
-            doctree_dir,
-            source_dir,
-            output_dir,
-        ],
-        check=True,
-    )
-
-    with open(stamp_file, "w", encoding="utf-8") as stamp:
-        stamp.write("built\n")
-
-
-if __name__ == "__main__":
-    main()

docs/install-docs.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import sys
-
-
-def main():
-    if len(sys.argv) != 4:
-        raise SystemExit("usage: install-docs.py STAMP_FILE SOURCE_DIR DATADIR")
-
-    _, source_dir, datadir = sys.argv[1:]
-    source_dir = os.path.abspath(source_dir)
-
-    if not os.path.isfile(sys.argv[1]):
-        raise SystemExit("documentation build did not produce its stamp file")
-    if not os.path.isfile(os.path.join(source_dir, "index.html")):
-        raise SystemExit("documentation build did not produce index.html")
-
-    if os.path.isabs(datadir):
-        destdir = os.environ.get("DESTDIR", "")
-        if destdir:
-            data_root = os.path.join(destdir, datadir.lstrip("/\\"))
-        else:
-            data_root = datadir
-    else:
-        data_root = os.path.join(os.environ["MESON_INSTALL_DESTDIR_PREFIX"], datadir)
-
-    destination = os.path.join(data_root, "doc", "zoitechat", "html")
-    shutil.rmtree(destination, ignore_errors=True)
-    os.makedirs(os.path.dirname(destination), exist_ok=True)
-    shutil.copytree(source_dir, destination)
-
-
-if __name__ == "__main__":
-    main()

flatpak/net.zoite.Zoitechat.json

@@ -54,7 +54,6 @@
       "buildsystem": "meson",
       "config-opts": [
         "-Ddbus-service-use-appid=true",
-        "-Dinstall-docs=false",
         "-Dwith-perl=perl",
         "-Dwith-python=python3",
         "-Dwith-lua=lua"

meson.build

@@ -35,9 +35,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
-config_h.set_quoted('ZOITECHAT_DOCDIR',
-  join_paths(get_option('prefix'), get_option('datadir'), 'doc', 'zoitechat', 'html')
-)
 config_h.set10('ENABLE_NLS', true)
 
 # Optional features
@@ -163,41 +160,6 @@ foreach ldflag : test_ldflags
 endforeach
 add_project_link_arguments(global_ldflags, language: 'c')
 
-if get_option('install-docs')
-  docs_python = find_program('python3', 'python')
-  docs_sphinx = run_command(docs_python, '-c', 'import sphinx', check: false)
-  if docs_sphinx.returncode() != 0
-    error('Sphinx is required to build the local HTML documentation. Install Sphinx or configure with -Dinstall-docs=false.')
-  endif
-
-  docs_source_dir = join_paths(meson.source_root(), 'docs')
-  docs_output_dir = join_paths(meson.build_root(), 'docs-html')
-  docs_build_script = join_paths(docs_source_dir, 'build-docs.py')
-  docs_install_script = join_paths(docs_source_dir, 'install-docs.py')
-
-  docs_target = custom_target(
-    'html-documentation',
-    output: 'html-documentation.stamp',
-    command: [
-      docs_python,
-      docs_build_script,
-      docs_source_dir,
-      docs_output_dir,
-      '@OUTPUT@',
-    ],
-    build_by_default: true,
-    build_always_stale: true,
-  )
-
-  meson.add_install_script(
-    docs_python,
-    docs_install_script,
-    docs_target,
-    docs_output_dir,
-    get_option('datadir'),
-  )
-endif
-
 subdir('src')
 if get_option('plugin')
   subdir('plugins')

meson_options.txt

@@ -33,9 +33,6 @@ option('install-appdata', type: 'boolean',
 option('install-plugin-metainfo', type: 'boolean', value: false,
   description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
 )
-option('install-docs', type: 'boolean', value: true,
-  description: 'Build and install the local HTML documentation'
-)
 
 # Plugins
 option('with-checksum', type: 'boolean',

packaging/fedora/zoitechat.spec

@@ -15,7 +15,6 @@ BuildRequires:  perl
 BuildRequires:  perl-devel
 BuildRequires:  python3
 BuildRequires:  python3-cffi
-BuildRequires:  python3-sphinx
 BuildRequires:  publicsuffix-list
 BuildRequires:  xwayland-run
 BuildRequires:  weston
@@ -88,7 +87,6 @@ xwfb-run -- /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_bui
 %{_datadir}/icons/hicolor/scalable/apps/net.zoite.Zoitechat.svg
 %{_datadir}/metainfo/net.zoite.Zoitechat.appdata.xml
 %{_datadir}/metainfo/net.zoite.Zoitechat*.metainfo.xml
-%{_datadir}/doc/zoitechat/html/
 %dir %{_libdir}/zoitechat
 %dir %{_libdir}/zoitechat/plugins
 %dir %{_libdir}/zoitechat/python

src/common/ctcp.c

@@ -126,7 +126,21 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 			goto generic;
 
-		inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
+		{
+			gboolean private_fromme = !serv->p_cmp (nick, serv->nick) && !is_channel (serv, to);
+
+			if (private_fromme)
+			{
+				session *target = find_dialog (serv, to);
+
+				if (target)
+					sess = target;
+				else if (serv->front_session)
+					sess = serv->front_session;
+			}
+
+			inbound_action (sess, to, nick, ip, msg + 7, private_fromme, tags_data->identified, tags_data);
+		}
 		return;
 	}
 

src/common/proto-irc.c

@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						{
 							if (ignore_check (word[1], IG_PRIV))
 								return;
-							if (serv->have_echo_message && !serv->p_cmp (nick, serv->nick))
+							if (!serv->p_cmp (nick, serv->nick))
 							{
 								session *target_sess = find_dialog (serv, to);
 

src/fe-gtk/menu.c

@@ -1740,50 +1740,9 @@ menu_ctcpguiopen (void)
 	editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help);
 }
 
-static char *
-menu_find_local_docs (void)
-{
-	char *path;
-
-#ifdef WIN32
-	char *base_path;
-
-	base_path = g_win32_get_package_installation_directory_of_module (NULL);
-	if (!base_path)
-		return NULL;
-
-	path = g_build_filename (base_path, "share", "doc", "zoitechat", "html", "index.html", NULL);
-	g_free (base_path);
-#else
-	const char *appdir;
-
-	appdir = g_getenv ("APPDIR");
-	if (appdir && *appdir)
-		path = g_build_filename (appdir, "usr", "share", "doc", "zoitechat", "html", "index.html", NULL);
-	else
-		path = g_build_filename (ZOITECHAT_DOCDIR, "index.html", NULL);
-#endif
-
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-		return path;
-
-	g_free (path);
-	return NULL;
-}
-
 static void
 menu_docs (GtkWidget *wid, gpointer none)
 {
-	char *path;
-
-	path = menu_find_local_docs ();
-	if (path)
-	{
-		fe_open_url (path);
-		g_free (path);
-		return;
-	}
-
 	fe_open_url ("https://docs.zoitechat.org/en/latest/");
 }
 

win32/copy/copy.vcxproj

@@ -30,8 +30,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="Build">
-    <Exec Command="&quot;$(Python3Path)\python.exe&quot; &quot;$(SolutionDir)..\docs\build-docs.py&quot; &quot;$(SolutionDir)..\docs&quot; &quot;$(ZoiteChatBuild)\$(ZoiteChatPlatform)\docs-html&quot; &quot;$(ZoiteChatBuild)\$(ZoiteChatPlatform)\html-documentation.stamp&quot;" />
-
     <ItemGroup>
       <None Include="$(DepsRoot)\bin\*atk-1.0-0.dll" />
       <None Include="$(DepsRoot)\bin\*cairo*.dll" />
@@ -84,7 +82,6 @@
       <GdkPixbufLoaderCache Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders.cache" />
 
       <FontConfig Include="$(DepsRoot)\etc\fonts\*" />
-      <Docs Include="$(ZoiteChatBuild)\$(ZoiteChatPlatform)\docs-html\**\*" />
       <Share Include="share\**\*" />
       <Locale Include="$(ZoiteChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />
       <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
@@ -100,7 +97,6 @@
     <Copy SourceFiles="@(GdkPixbufLoaderCache)" DestinationFiles="@(GdkPixbufLoaderCache->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(GSettingsSchemas)" DestinationFiles="@(GSettingsSchemas->'$(ZoiteChatRel)\share\glib-2.0\schemas\%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(ZoiteChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(Docs)" DestinationFiles="@(Docs->'$(ZoiteChatRel)\share\doc\zoitechat\html\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(ZoiteChatRel)\share\doc\zoitechat" />
     <Copy SourceFiles="$(WinSparklePath)\COPYING" DestinationFolder="$(ZoiteChatRel)\share\doc\WinSparkle" />
     <Copy SourceFiles="@(EnchantProviders)" DestinationFolder="$(ZoiteChatRel)\lib\enchant-2" />